Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix nn functional conv2d bug #7892

Merged
merged 57 commits into from
Apr 2, 2022
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
e6e6973
fix reduce_sum scalar check bug
BBuf Mar 22, 2022
a0abdd5
Merge branch 'master' of github.com:Oneflow-Inc/oneflow
BBuf Mar 23, 2022
00522df
Merge branch 'master' of github.com:Oneflow-Inc/oneflow
BBuf Mar 23, 2022
68e0e08
Merge branch 'master' of github.com:Oneflow-Inc/oneflow
BBuf Mar 24, 2022
3d0572b
fix bug
BBuf Mar 24, 2022
bc8f2fd
fix bug
BBuf Mar 24, 2022
0e8d32a
revert
BBuf Mar 24, 2022
9d68a2f
revert
BBuf Mar 24, 2022
0cce7da
auto format by CI
oneflow-ci-bot Mar 24, 2022
31ac967
fix commnet
BBuf Mar 24, 2022
f157fd4
fix conflict
BBuf Mar 24, 2022
b20f043
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 25, 2022
7a9b2e2
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 25, 2022
99cb226
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 25, 2022
1dd7e62
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 25, 2022
0197149
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 26, 2022
cdb3723
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 26, 2022
4dfc5d9
auto format by CI
oneflow-ci-bot Mar 26, 2022
0eeb3fd
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 26, 2022
17acecb
Merge branch 'master' into fix_nn_functional_conv2d_bug
BBuf Mar 26, 2022
0bb9632
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 27, 2022
4ee28c1
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 27, 2022
876520b
Merge branch 'master' into fix_nn_functional_conv2d_bug
BBuf Mar 27, 2022
8cf4884
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 27, 2022
285f951
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 27, 2022
bd0a0ed
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 28, 2022
f23a719
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 28, 2022
4f2d9ed
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 28, 2022
c14ad73
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 28, 2022
d4b6027
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 29, 2022
18e7c57
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 29, 2022
4bfd2c1
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 29, 2022
fc49b65
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 29, 2022
8304e6f
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 29, 2022
e0b59ee
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 29, 2022
45b4535
Merge branch 'master' into fix_nn_functional_conv2d_bug
BBuf Mar 30, 2022
c793e5a
fix clang check error
BBuf Mar 30, 2022
3b1f00b
Merge branch 'master' into fix_nn_functional_conv2d_bug
BBuf Mar 30, 2022
7f5df6b
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 30, 2022
abd3250
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 30, 2022
c459d30
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 30, 2022
12e20ce
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 30, 2022
0a77283
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 31, 2022
423cb54
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 31, 2022
45373f0
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 31, 2022
b4902eb
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 31, 2022
569f434
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 31, 2022
48a43a9
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 31, 2022
4a67850
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Mar 31, 2022
77c07ff
Merge branch 'master' into fix_nn_functional_conv2d_bug
BBuf Apr 1, 2022
73efee9
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Apr 1, 2022
1b7f833
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Apr 1, 2022
d29505a
Merge branch 'master' into fix_nn_functional_conv2d_bug
BBuf Apr 2, 2022
b599ae4
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Apr 2, 2022
d919759
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Apr 2, 2022
a3b0ae2
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Apr 2, 2022
7c043d5
Merge branch 'master' into fix_nn_functional_conv2d_bug
mergify[bot] Apr 2, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions oneflow/core/functional/functional_api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -696,23 +696,23 @@

- name: "conv1d"
signature:
"Tensor (Tensor x, Tensor weight, Tensor bias=None, Int32List[1] stride,
Int32List[1] padding, Int32List[1] dilation, Int32 groups=1,
String channel_pos) => Conv1d"
"Tensor (Tensor x, Tensor weight, Tensor bias=None, Int32List[1] stride={1},
Int32List[1] padding={0}, Int32List[1] dilation={1}, Int32 groups=1,
String channel_pos=\"channels_first\") => Conv1d"
bind_python: True

- name: "conv2d"
signature:
"Tensor (Tensor x, Tensor weight, Tensor bias=None, Int32List[2] stride,
Int32List[2] padding, Int32List[2] dilation, Int32 groups=1,
String channel_pos) => Conv2d"
"Tensor (Tensor x, Tensor weight, Tensor bias=None, Int32List[2] stride={1},
Int32List[2] padding={0}, Int32List[2] dilation={1}, Int32 groups=1,
String channel_pos=\"channels_first\") => Conv2d"
bind_python: True

- name: "conv3d"
signature:
"Tensor (Tensor x, Tensor weight, Tensor bias=None, Int32List[3] stride,
Int32List[3] padding, Int32List[3] dilation, Int32 groups=1,
String channel_pos) => Conv3d"
"Tensor (Tensor x, Tensor weight, Tensor bias=None, Int32List[3] stride={1},
Int32List[3] padding={0}, Int32List[3] dilation={1}, Int32 groups=1,
String channel_pos=\"channels_first\") => Conv3d"
bind_python: True

- name: "fake_quantization"
Expand Down
8 changes: 8 additions & 0 deletions python/oneflow/test/modules/test_conv1d.py
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,14 @@ def test_conv1d(test_case):
for arg in GenArgList(arg_dict):
arg[0](test_case, *arg[1:])

@autotest(n=3)
def test_nn_functional_conv1d(test_case):
device = random_device()
img = torch.ones((1,3,224), requires_grad=True).to(device)
kernel = torch.ones((3,1,3), requires_grad=True).to(device)
y = torch.nn.functional.conv1d(img, kernel, groups=3)
return y

@autotest()
def test_conv1d_with_random_data(test_case):
channels = random(1, 6)
Expand Down
8 changes: 8 additions & 0 deletions python/oneflow/test/modules/test_conv2d.py
Original file line number Diff line number Diff line change
Expand Up @@ -1581,6 +1581,14 @@ def test_conv2d_default_init(test_case):
)
)

@autotest(n=3)
def test_nn_functional_conv2d(test_case):
Flowingsun007 marked this conversation as resolved.
Show resolved Hide resolved
device = random_device()
img = torch.ones((1,3,224,224), requires_grad=True).to(device)
kernel = torch.ones((3,1,3,3), requires_grad=True).to(device)
y = torch.nn.functional.conv2d(img, kernel, groups=3)
return y

def test_conv2d(test_case):
arg_dict = OrderedDict()
arg_dict["device"] = ["cuda", "cpu"]
Expand Down
8 changes: 8 additions & 0 deletions python/oneflow/test/modules/test_conv3d.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@

@flow.unittest.skip_unless_1n1d()
class TestConv3DModule(flow.unittest.TestCase):
@autotest(n=3)
def test_nn_functional_conv3d(test_case):
device = random_device()
img = torch.ones((1, 3, 224, 224, 224), requires_grad=True).to(device)
kernel = torch.ones((6, 3, 3, 3, 3), requires_grad=True).to(device)
y = torch.nn.functional.conv3d(img, kernel)
return y

@autotest(n=10)
def test_conv3d_with_random_data(test_case):
channels = random(1, 6)
Expand Down