[BugFix]: Convert tuple to int (#7880)

* DEBUG: Convert tuple to int * Add test cases for test_conv2d_hwcn() * CI pass
apache · Apr 25, 2021 · f92d7fc · f92d7fc
1 parent ed16f07
commit f92d7fc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/python/tvm/topi/testing/conv2d_hwcn_python.py b/python/tvm/topi/testing/conv2d_hwcn_python.py
@@ -73,5 +73,5 @@ def conv2d_hwcn_python(a_np, w_np, stride, padding):
                 else:
                     apad = at[n, c]
                 out = scipy.signal.convolve2d(apad, np.rot90(np.rot90(wt[f, c])), mode="valid")
-                bt[n, f] += out[::stride, ::stride]
+                bt[n, f] += out[::stride_h, ::stride_w]
     return bt.transpose((2, 3, 1, 0))
diff --git a/tests/python/topi/python/test_topi_conv2d_hwcn.py b/tests/python/topi/python/test_topi_conv2d_hwcn.py
@@ -95,16 +95,25 @@ def check_target(target):
 
 @tvm.testing.requires_gpu
 def test_conv2d_hwcn():
-    verify_conv2d_hwcn(1, 256, 32, 256, 3, 1, "SAME")
+    verify_conv2d_hwcn(1, 256, 32, 128, 3, 1, "SAME")
     verify_conv2d_hwcn(1, 256, 32, 256, 3, 1, "SAME")
     verify_conv2d_hwcn(4, 128, 16, 128, 5, 2, "SAME")
     verify_conv2d_hwcn(4, 128, 16, 256, 5, 2, "SAME")
-    verify_conv2d_hwcn(1, 256, 32, 256, 3, 1, "VALID")
+    verify_conv2d_hwcn(1, 256, 32, 128, 3, 1, "VALID")
     verify_conv2d_hwcn(1, 256, 32, 256, 3, 1, "VALID")
     verify_conv2d_hwcn(4, 128, 16, 128, 5, 2, "VALID")
     verify_conv2d_hwcn(4, 128, 16, 256, 5, 2, "VALID")
     # dilation = 2
     verify_conv2d_hwcn(1, 256, 32, 256, 3, 1, "SAME", dilation=2)
+    # Pass stride as tuple
+    verify_conv2d_hwcn(1, 256, 32, 128, 3, (1, 1), "SAME")
+    verify_conv2d_hwcn(1, 256, 32, 256, 3, (1, 1), "SAME")
+    verify_conv2d_hwcn(4, 128, 16, 128, 5, (2, 2), "SAME")
+    verify_conv2d_hwcn(4, 128, 16, 256, 5, (2, 2), "SAME")
+    verify_conv2d_hwcn(1, 256, 32, 128, 3, (1, 1), "VALID")
+    verify_conv2d_hwcn(1, 256, 32, 256, 3, (1, 1), "VALID")
+    verify_conv2d_hwcn(4, 128, 16, 128, 5, (2, 2), "VALID")
+    verify_conv2d_hwcn(4, 128, 16, 256, 5, (2, 2), "VALID")
 
 
 if __name__ == "__main__":