#409 Fixed conflicts in 0327 version

Merged
Erpim merged 8 commits from dev0327 into master 2 months ago
frelam reviewed 2 months ago
msadapter/pytorch/nn/functional.py
@@ -321,2 +312,2 @@
out = ms.ops.interpolate(input, scales=None, sizes=_size,
coordinate_transformation_mode=trans_mode, mode=mode)
out = ms.ops.interpolate(input, scale_factor=None, size=_size,
align_corners=align_corners, mode=mode)
frelam commented 2 months ago

对齐一下

对齐一下
liuzhuoran2333 commented 2 months ago

fixed

fixed
frelam reviewed 2 months ago
msadapter/pytorch/nn/functional.py
@@ -1365,2 +1336,2 @@
out = ms.ops.interpolate(input, scales=None, sizes=_size,
coordinate_transformation_mode=trans_mode, mode=mode)
out = ms.ops.interpolate(input, scale_factor=None, size=_size,
align_corners=align_corners, mode=mode)
frelam commented 2 months ago

同上,对齐

同上,对齐
liuzhuoran2333 commented 2 months ago

fixed

fixed
frelam reviewed 2 months ago
msadapter/pytorch/nn/functional.py
@@ -1502,2 +1472,3 @@
padding = (padding[0], padding[0])
else:
padding = (padding[0], padding[0], padding[1], padding[1])
padding = (padding[0], padding[1])
frelam commented 2 months ago

这个else分支可以直接删除掉。 因为入参本来就是(padding[0], padding[1])的形式

这个else分支可以直接删除掉。 因为入参本来就是(padding[0], padding[1])的形式
frelam reviewed 2 months ago
msadapter/pytorch/nn/functional.py
@@ -2227,3 +2197,4 @@
padding = (padding, padding, padding)
elif isinstance(padding, tuple):
if len(padding)==1:
padding = (padding[0], padding[0], padding[0], padding[0], padding[0], padding[0])
frelam commented 2 months ago

这里也要修改成padding = (padding[0], padding[0], padding[0])

这里也要修改成padding = (padding[0], padding[0], padding[0])
liuzhuoran2333 commented 2 months ago

fixed

fixed
frelam reviewed 2 months ago
msadapter/pytorch/nn/functional.py
@@ -2229,3 +2200,3 @@
padding = (padding[0], padding[0], padding[0], padding[0], padding[0], padding[0])
else:
padding = (padding[0], padding[0], padding[1], padding[1], padding[2], padding[2])
padding = (padding[0], padding[1], padding[2])
frelam commented 2 months ago

同上, 这个else分支也可以去掉

同上, 这个else分支也可以去掉
liuzhuoran2333 commented 2 months ago

fixed

fixed
frelam reviewed 2 months ago
msadapter/pytorch/nn/functional.py
@@ -1807,3 +1777,3 @@
if isinstance(padding, tuple):
if len(padding) == 3:
_padding = (padding[0], padding[0], padding[1], padding[1], padding[2], padding[2])
_padding = (padding[0], padding[1], padding[2])
frelam commented 2 months ago

avg_pool3d的padding不用改

avg_pool3d的padding不用改
liuzhuoran2333 changed title from [WIP]Fixed conflicts in 0327 version to Fixed conflicts in 0327 version 2 months ago
Erpim merged commit 61661b736b into master 2 months ago
The pull request has been merged as 61661b736b.
Sign in to join this conversation.
No reviewers
No Label
No Milestone
No Assignees
3 Participants
Notifications
Due Date

No due date set.

Dependencies

This pull request currently doesn't have any dependencies.

Loading…
There is no content yet.