use clang-format on in test files (pytorch#184)

Summary: Pull Request resolved: pytorch#184 As title Reviewed By: jianyuh Differential Revision: D18471780 fbshipit-source-id: 26e390f0c89d66dd3f5309ef430f78c79cbb244e
clin99 · Nov 13, 2019 · 4e8cee1 · 4e8cee1
1 parent e27d9b5
commit 4e8cee1
Show file tree

Hide file tree

Showing 4 changed files with 177 additions and 173 deletions.
diff --git a/test/GConvTest.cc b/test/GConvTest.cc
@@ -74,91 +74,91 @@ template <int SPATIAL_DIM>
 static typename std::enable_if<SPATIAL_DIM == 3, vector<conv_param_t<3>>>::type
 GetShapes_() {
   // clang-format off
-    vector<conv_param_t<3>> shapes = {
-        // MB, IC, OC, {IT, IH, IW}, G, {KT, KH, KW},
-        // {stride_t, stride_h, stride_w}, {pad_p, pad_t, pad_l,
-        //                                  pad_n, pad_b, pad_r}
-        conv_param_t<3>(1, 16, 16, {5, 5, 5}, 8, {3, 3, 3},
-            {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
-        conv_param_t<3>(1, 16, 16, {5, 5, 5}, 4, {3, 3, 3},
-            {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
-        conv_param_t<3>(1, 16, 16, {5, 5, 5}, 2, {3, 3, 3},
-            {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
-        conv_param_t<3>(1, 16, 16, {5, 5, 5}, 1, {3, 3, 3},
-            {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
-        conv_param_t<3>(1, 16, 16, {5, 5, 5}, 8, {3, 3, 3},
-            {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
-        conv_param_t<3>(1, 16, 16, {5, 5, 5}, 4, {3, 3, 3},
-            {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
-        conv_param_t<3>(1, 16, 16, {5, 5, 5}, 2, {3, 3, 3},
-            {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
-        conv_param_t<3>(1, 16, 16, {5, 5, 5}, 1, {3, 3, 3},
-            {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
-
-        conv_param_t<3>(1, 16, 16, {4, 4, 4}, 8, {3, 3, 3},
-            {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
-        conv_param_t<3>(1, 16, 16, {4, 4, 4}, 4, {3, 3, 3},
-            {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
-        conv_param_t<3>(1, 16, 16, {4, 4, 4}, 2, {3, 3, 3},
-            {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
-        conv_param_t<3>(1, 16, 16, {4, 4, 4}, 1, {3, 3, 3},
-            {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
-        conv_param_t<3>(1, 16, 16, {6, 6, 6}, 8, {3, 3, 3},
-            {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
-        conv_param_t<3>(1, 16, 16, {6, 6, 6}, 4, {3, 3, 3},
-            {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
-        conv_param_t<3>(1, 16, 16, {6, 6, 6}, 2, {3, 3, 3},
-            {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
-        conv_param_t<3>(1, 16, 16, {6, 6, 6}, 1, {3, 3, 3},
-            {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
-
-        // batch size > 1
-        conv_param_t<3>(2, 16, 16, {4, 4, 4}, 8, {3, 3, 3},
-            {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
-        conv_param_t<3>(2, 16, 16, {4, 4, 4}, 4, {3, 3, 3},
-            {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
-        conv_param_t<3>(2, 16, 16, {4, 4, 4}, 2, {3, 3, 3},
-            {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
-        conv_param_t<3>(2, 16, 16, {4, 4, 4}, 1, {3, 3, 3},
-            {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
-        conv_param_t<3>(2, 16, 16, {6, 6, 6}, 8, {3, 3, 3},
-            {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
-        conv_param_t<3>(2, 16, 16, {6, 6, 6}, 4, {3, 3, 3},
-            {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
-        conv_param_t<3>(2, 16, 16, {6, 6, 6}, 2, {3, 3, 3},
-            {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
-        conv_param_t<3>(2, 16, 16, {6, 6, 6}, 1, {3, 3, 3},
-            {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
-
-        conv_param_t<3>(1, 16, 16, {1, 4, 4}, 8, {3, 3, 3},
-            {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
-        conv_param_t<3>(1, 16, 16, {1, 4, 4}, 4, {3, 3, 3},
-            {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
-        conv_param_t<3>(1, 16, 16, {1, 4, 4}, 2, {3, 3, 3},
-            {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
-        conv_param_t<3>(1, 16, 16, {1, 4, 4}, 1, {3, 3, 3},
-            {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
-        conv_param_t<3>(1, 16, 16, {1, 6, 6}, 8, {3, 3, 3},
-            {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
-        conv_param_t<3>(1, 16, 16, {1, 6, 6}, 4, {3, 3, 3},
-            {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
-        conv_param_t<3>(1, 16, 16, {1, 6, 6}, 2, {3, 3, 3},
-            {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
-        conv_param_t<3>(1, 16, 16, {1, 6, 6}, 1, {3, 3, 3},
-            {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
-
-        // unequal stride
-        conv_param_t<3>(1, 16, 16, {1, 6, 6}, 8, {3, 3, 3},
-            {1, 2, 2}, {1, 1, 1, 1, 1, 1}),
-        conv_param_t<3>(1, 16, 16, {1, 6, 6}, 4, {3, 3, 3},
-            {1, 2, 2}, {1, 1, 1, 1, 1, 1}),
-        conv_param_t<3>(1, 16, 16, {1, 6, 6}, 2, {3, 3, 3},
-            {1, 2, 2}, {1, 1, 1, 1, 1, 1}),
-        conv_param_t<3>(1, 16, 16, {1, 6, 6}, 1, {3, 3, 3},
-            {1, 2, 2}, {1, 1, 1, 1, 1, 1}),
-      };
-    return shapes;
-    // clang-format off
+  vector<conv_param_t<3>> shapes = {
+    // MB, IC, OC, {IT, IH, IW}, G, {KT, KH, KW},
+    // {stride_t, stride_h, stride_w}, {pad_p, pad_t, pad_l,
+    //                                  pad_n, pad_b, pad_r}
+    conv_param_t<3>(1, 16, 16, {5, 5, 5}, 8, {3, 3, 3},
+        {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
+    conv_param_t<3>(1, 16, 16, {5, 5, 5}, 4, {3, 3, 3},
+        {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
+    conv_param_t<3>(1, 16, 16, {5, 5, 5}, 2, {3, 3, 3},
+        {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
+    conv_param_t<3>(1, 16, 16, {5, 5, 5}, 1, {3, 3, 3},
+        {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
+    conv_param_t<3>(1, 16, 16, {5, 5, 5}, 8, {3, 3, 3},
+        {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
+    conv_param_t<3>(1, 16, 16, {5, 5, 5}, 4, {3, 3, 3},
+        {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
+    conv_param_t<3>(1, 16, 16, {5, 5, 5}, 2, {3, 3, 3},
+        {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
+    conv_param_t<3>(1, 16, 16, {5, 5, 5}, 1, {3, 3, 3},
+        {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
+
+    conv_param_t<3>(1, 16, 16, {4, 4, 4}, 8, {3, 3, 3},
+        {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
+    conv_param_t<3>(1, 16, 16, {4, 4, 4}, 4, {3, 3, 3},
+        {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
+    conv_param_t<3>(1, 16, 16, {4, 4, 4}, 2, {3, 3, 3},
+        {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
+    conv_param_t<3>(1, 16, 16, {4, 4, 4}, 1, {3, 3, 3},
+        {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
+    conv_param_t<3>(1, 16, 16, {6, 6, 6}, 8, {3, 3, 3},
+        {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
+    conv_param_t<3>(1, 16, 16, {6, 6, 6}, 4, {3, 3, 3},
+        {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
+    conv_param_t<3>(1, 16, 16, {6, 6, 6}, 2, {3, 3, 3},
+        {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
+    conv_param_t<3>(1, 16, 16, {6, 6, 6}, 1, {3, 3, 3},
+        {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
+
+    // batch size > 1
+    conv_param_t<3>(2, 16, 16, {4, 4, 4}, 8, {3, 3, 3},
+        {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
+    conv_param_t<3>(2, 16, 16, {4, 4, 4}, 4, {3, 3, 3},
+        {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
+    conv_param_t<3>(2, 16, 16, {4, 4, 4}, 2, {3, 3, 3},
+        {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
+    conv_param_t<3>(2, 16, 16, {4, 4, 4}, 1, {3, 3, 3},
+        {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
+    conv_param_t<3>(2, 16, 16, {6, 6, 6}, 8, {3, 3, 3},
+        {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
+    conv_param_t<3>(2, 16, 16, {6, 6, 6}, 4, {3, 3, 3},
+        {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
+    conv_param_t<3>(2, 16, 16, {6, 6, 6}, 2, {3, 3, 3},
+        {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
+    conv_param_t<3>(2, 16, 16, {6, 6, 6}, 1, {3, 3, 3},
+        {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
+
+    conv_param_t<3>(1, 16, 16, {1, 4, 4}, 8, {3, 3, 3},
+        {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
+    conv_param_t<3>(1, 16, 16, {1, 4, 4}, 4, {3, 3, 3},
+        {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
+    conv_param_t<3>(1, 16, 16, {1, 4, 4}, 2, {3, 3, 3},
+        {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
+    conv_param_t<3>(1, 16, 16, {1, 4, 4}, 1, {3, 3, 3},
+        {1, 1, 1}, {1, 1, 1, 1, 1, 1}),
+    conv_param_t<3>(1, 16, 16, {1, 6, 6}, 8, {3, 3, 3},
+        {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
+    conv_param_t<3>(1, 16, 16, {1, 6, 6}, 4, {3, 3, 3},
+        {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
+    conv_param_t<3>(1, 16, 16, {1, 6, 6}, 2, {3, 3, 3},
+        {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
+    conv_param_t<3>(1, 16, 16, {1, 6, 6}, 1, {3, 3, 3},
+        {2, 2, 2}, {1, 1, 1, 1, 1, 1}),
+
+    // unequal stride
+    conv_param_t<3>(1, 16, 16, {1, 6, 6}, 8, {3, 3, 3},
+        {1, 2, 2}, {1, 1, 1, 1, 1, 1}),
+    conv_param_t<3>(1, 16, 16, {1, 6, 6}, 4, {3, 3, 3},
+        {1, 2, 2}, {1, 1, 1, 1, 1, 1}),
+    conv_param_t<3>(1, 16, 16, {1, 6, 6}, 2, {3, 3, 3},
+        {1, 2, 2}, {1, 1, 1, 1, 1, 1}),
+    conv_param_t<3>(1, 16, 16, {1, 6, 6}, 1, {3, 3, 3},
+        {1, 2, 2}, {1, 1, 1, 1, 1, 1}),
+  };
+  return shapes;
+  // clang-format off
 }
 
 /**

diff --git a/test/Im2ColFusedRequantizeTest.cc b/test/Im2ColFusedRequantizeTest.cc
@@ -40,20 +40,22 @@ INSTANTIATE_TEST_CASE_P(
         ::testing::ValuesIn(qGranularityVals),
         ::testing::Bool()));
 
+// clang-format off
 // From Faster-RCNN with ShuffleNet
 static vector<conv_param_t<>> shapes = {
-    // MB, IC, OC, IH, IW, G, KH, KW, stride_h, stride_w, pad_h, pad_w
-    conv_param_t<>(1, 32, 32, {14, 14}, 1, {3, 3}, {1, 1}, {0, 0, 0, 0}),
-    conv_param_t<>(1, 32, 32, {14, 14}, 1, {3, 3}, {1, 1}, {1, 1, 1, 1}),
-    conv_param_t<>(2, 32, 32, {14, 14}, 1, {3, 3}, {1, 1}, {0, 0, 0, 0}),
-    conv_param_t<>(2, 32, 32, {28, 14}, 1, {3, 3}, {1, 1}, {1, 1, 0, 0}),
-    conv_param_t<>(1, 32, 16, {12, 14}, 4, {3, 3}, {1, 1}, {0, 0, 0, 0}),
-    conv_param_t<>(2, 32, 16, {16, 14}, 4, {3, 3}, {1, 1}, {0, 0, 0, 0}),
-    conv_param_t<>(1, 544, 544, {14, 14}, 1, {3, 3}, {2, 2}, {1, 1, 1, 1}),
-    conv_param_t<>(1, 8, 8, {4, 4}, 1, {3, 3}, {1, 1}, {1, 1, 0, 0}),
-    // first layer of resnet50
-    conv_param_t<>(1, 3, 64, {224, 224}, 1, {7, 7}, {2, 2}, {3, 3, 3, 3}),
+  // MB, IC, OC, IH, IW, G, KH, KW, stride_h, stride_w, pad_h, pad_w
+  conv_param_t<>(1, 32, 32, {14, 14}, 1, {3, 3}, {1, 1}, {0, 0, 0, 0}),
+  conv_param_t<>(1, 32, 32, {14, 14}, 1, {3, 3}, {1, 1}, {1, 1, 1, 1}),
+  conv_param_t<>(2, 32, 32, {14, 14}, 1, {3, 3}, {1, 1}, {0, 0, 0, 0}),
+  conv_param_t<>(2, 32, 32, {28, 14}, 1, {3, 3}, {1, 1}, {1, 1, 0, 0}),
+  conv_param_t<>(1, 32, 16, {12, 14}, 4, {3, 3}, {1, 1}, {0, 0, 0, 0}),
+  conv_param_t<>(2, 32, 16, {16, 14}, 4, {3, 3}, {1, 1}, {0, 0, 0, 0}),
+  conv_param_t<>(1, 544, 544, {14, 14}, 1, {3, 3}, {2, 2}, {1, 1, 1, 1}),
+  conv_param_t<>(1, 8, 8, {4, 4}, 1, {3, 3}, {1, 1}, {1, 1, 0, 0}),
+  // first layer of resnet50
+  conv_param_t<>(1, 3, 64, {224, 224}, 1, {7, 7}, {2, 2}, {3, 3, 3, 3}),
 };
+// clang-format on
 
 template <typename ACC_T, QuantizationGranularity Q_GRAN>
 static void Im2colTest(bool b_symmetric) {

diff --git a/test/PackedRequantizeTest.cc b/test/PackedRequantizeTest.cc
@@ -70,32 +70,34 @@ INSTANTIATE_TEST_CASE_P(
  */
 static vector<vector<int>> GetShapes_() {
   // NMT
+  // clang-format off
   vector<vector<int>> shapes = {
-      // {M,    N,    K}
-      {1, 128, 512},
-      {1, 1024, 256},
-      {1, 2048, 512},
-      {1, 2048, 513},
-      {1, 2048, 514},
-
-      {6, 512, 512},
-      {6, 2048, 512},
-      {6, 256, 1024},
-      {6, 1024, 256},
-      {6, 2048, 256},
-      {6, 2048, 257},
-      {6, 2048, 258},
-
-      {102, 1024, 512},
-      {102, 2323, 256},
-      {102, 512, 256},
-      {102, 512, 257},
-      {102, 512, 258},
-
-      {1024, 512, 258},
-
-      {120, 4, 288},
+    // {M,    N,    K}
+    {1, 128, 512},
+    {1, 1024, 256},
+    {1, 2048, 512},
+    {1, 2048, 513},
+    {1, 2048, 514},
+
+    {6, 512, 512},
+    {6, 2048, 512},
+    {6, 256, 1024},
+    {6, 1024, 256},
+    {6, 2048, 256},
+    {6, 2048, 257},
+    {6, 2048, 258},
+
+    {102, 1024, 512},
+    {102, 2323, 256},
+    {102, 512, 256},
+    {102, 512, 257},
+    {102, 512, 258},
+
+    {1024, 512, 258},
+
+    {120, 4, 288},
   };
+  // clang-format on
   return shapes;
 }
 
@@ -832,10 +834,10 @@ TEST_P(fbgemmPackUnpackAcc32Test, TestPackUnpack) {
         for (int i = 0; i < k; i++) {
           for (int j = 0; j < n_adjusted; j++) {
             EXPECT_EQ(Bint8.data()[i * n + j], unpack_buf.data()[i * n + j])
-              << "Pack/Unpack results differ at index (" << i << ", " << j
-              << ", Reference: " << static_cast<int>(Bint8.data()[i * n + j])
-              << ", Pack-Unpacked: "
-              << static_cast<int>(unpack_buf.data()[i * n + j]);
+                << "Pack/Unpack results differ at index (" << i << ", " << j
+                << ", Reference: " << static_cast<int>(Bint8.data()[i * n + j])
+                << ", Pack-Unpacked: "
+                << static_cast<int>(unpack_buf.data()[i * n + j]);
           }
         }
       }

diff --git a/test/UniConvTest.cc b/test/UniConvTest.cc
@@ -28,55 +28,55 @@ vector<QuantizationGranularity> qGranularityVals{
 // clang-format off
 static vector<conv_param_t<>> GetShapes_() {
   vector<conv_param_t<>> shapes = {
-      // MB, IC, OC, {IH, IW}, G, {KH, KW}, {stride_h, stride_w}, {pad_t, pad_l,
-      // pad_b, pad_r}, {dilation_h, dilation_w}
-      // Regular
-      conv_param_t<>(1, 16, 16, {10, 30}, 1, {3, 3}, {1, 1}, {1, 1, 1, 1}),
-      conv_param_t<>(1, 32, 32, {10, 30}, 1, {3, 3}, {1, 1}, {1, 1, 1, 1}),
-      conv_param_t<>(1, 16, 32, {30, 10}, 1, {3, 3}, {1, 1}, {1, 1, 1, 1}),
-      conv_param_t<>(1, 32, 16, {10, 30}, 1, {3, 3}, {1, 1}, {1, 1, 1, 1}),
-      conv_param_t<>(1, 32, 16, {10, 30}, 1, {3, 3}, {1, 1}, {0, 0, 0, 0}),
-      conv_param_t<>(1, 32, 16, {10, 30}, 1, {3, 3}, {1, 1}, {0, 0, 0, 0}, {2, 2}),
-      conv_param_t<>(1, 32, 16, {10, 30}, 1, {3, 3}, {1, 1}, {1, 1, 1, 1}, {2, 2}),
-      conv_param_t<>(1, 32, 16, {10, 30}, 1, {3, 3}, {1, 1}, {1, 1, 1, 1}, {3, 3}),
-      conv_param_t<>(1, 32, 16, {10, 30}, 1, {3, 3}, {2, 2}, {1, 1, 1, 1}),
-      conv_param_t<>(1, 32, 16, {10, 30}, 1, {3, 3}, {2, 2}, {1, 1, 1, 1}, {2, 2}),
-      conv_param_t<>(1, 32, 16, {10, 30}, 1, {3, 3}, {2, 2}, {1, 1, 1, 1}, {2, 1}),
-      conv_param_t<>(1, 32, 16, {10, 30}, 1, {3, 3}, {2, 2}, {1, 1, 1, 1}, {1, 2}),
-      conv_param_t<>(1, 32, 16, {10, 30}, 1, {3, 3}, {1, 1}, {2, 1, 2, 1}),
-      conv_param_t<>(1, 32, 16, {10, 30}, 1, {3, 3}, {1, 1}, {1, 2, 1, 2}),
-      conv_param_t<>(1, 32, 16, {10, 30}, 1, {3, 3}, {1, 2}, {1, 1, 1, 1}),
-      conv_param_t<>(1, 32, 16, {10, 30}, 1, {3, 3}, {2, 1}, {1, 1, 1, 1}),
-      conv_param_t<>(1, 16, 16, {10, 30}, 1, {3, 5}, {1, 1}, {1, 1, 1, 1}),
-      conv_param_t<>(1, 16, 16, {10, 30}, 1, {5, 3}, {1, 1}, {1, 1, 1, 1}),
-      conv_param_t<>(1, 16, 16, {10, 30}, 1, {5, 3}, {1, 1}, {1, 1, 1, 1}, {2, 2}),
-      // groupwise
-      conv_param_t<>(1, 32, 32, {10, 30}, 8, {3, 3}, {1, 1}, {1, 1, 1, 1}),
-      conv_param_t<>(1, 32, 16, {10, 30}, 8, {3, 3}, {1, 1}, {1, 1, 1, 1}),
-      conv_param_t<>(1, 16, 32, {10, 30}, 8, {3, 3}, {2, 2}, {1, 1, 1, 1}),
-      conv_param_t<>(1, 32, 32, {10, 30}, 8, {3, 3}, {2, 2}, {2, 1, 2, 1}),
-      conv_param_t<>(1, 32, 32, {10, 30}, 8, {3, 3}, {1, 2}, {2, 1, 2, 1}),
-      conv_param_t<>(1, 32, 32, {10, 30}, 8, {3, 3}, {2, 1}, {2, 1, 2, 1}),
-      conv_param_t<>(1, 32, 32, {10, 30}, 8, {3, 5}, {1, 1}, {1, 1, 1, 1}),
-      conv_param_t<>(1, 32, 32, {10, 30}, 8, {5, 3}, {1, 1}, {1, 1, 1, 1}),
-      conv_param_t<>(1, 32, 32, {10, 30}, 8, {5, 3}, {1, 1}, {1, 1, 1, 1}, {2, 2}),
-      // DW
-      conv_param_t<>(1, 32, 32, {10, 30}, 32, {3, 3}, {1, 1}, {1, 1, 1, 1}),
-      conv_param_t<>(1, 32, 32, {10, 30}, 32, {3, 3}, {2, 2}, {1, 1, 1, 1}),
-      conv_param_t<>(1, 32, 32, {10, 30}, 32, {3, 3}, {1, 1}, {1, 2, 1, 2}),
-      conv_param_t<>(1, 32, 32, {10, 30}, 32, {3, 3}, {2, 1}, {1, 1, 1, 1}),
-      conv_param_t<>(1, 32, 32, {10, 30}, 32, {3, 3}, {1, 2}, {1, 1, 1, 1}),
-      conv_param_t<>(1, 32, 32, {10, 30}, 32, {3, 5}, {1, 1}, {1, 1, 1, 1}),
-      conv_param_t<>(1, 32, 32, {10, 30}, 32, {5, 3}, {1, 1}, {1, 1, 1, 1}),
-      conv_param_t<>(1, 32, 32, {10, 30}, 32, {5, 5}, {1, 1}, {1, 1, 1, 1}),
-      conv_param_t<>(1, 32, 32, {10, 30}, 32, {5, 3}, {1, 1}, {1, 1, 1, 1}, {2, 2}),
-      // Pointwise
-      conv_param_t<>(1, 32, 32, {10, 30}, 1, {1, 1}, {1, 1}, {0, 0, 0, 0}),
-      conv_param_t<>(1, 16, 32, {10, 30}, 1, {1, 1}, {1, 1}, {0, 0, 0, 0}),
-      conv_param_t<>(1, 32, 16, {10, 30}, 1, {1, 1}, {1, 1}, {0, 0, 0, 0}),
-      conv_param_t<>(1, 32, 16, {10, 30}, 1, {1, 1}, {2, 2}, {0, 0, 0, 0}),
-      conv_param_t<>(1, 32, 16, {10, 30}, 1, {1, 1}, {1, 2}, {0, 0, 0, 0}),
-      conv_param_t<>(1, 32, 16, {10, 30}, 1, {1, 1}, {2, 1}, {0, 0, 0, 0}),
+    // MB, IC, OC, {IH, IW}, G, {KH, KW}, {stride_h, stride_w}, {pad_t, pad_l,
+    // pad_b, pad_r}, {dilation_h, dilation_w}
+    // Regular
+    conv_param_t<>(1, 16, 16, {10, 30}, 1, {3, 3}, {1, 1}, {1, 1, 1, 1}),
+    conv_param_t<>(1, 32, 32, {10, 30}, 1, {3, 3}, {1, 1}, {1, 1, 1, 1}),
+    conv_param_t<>(1, 16, 32, {30, 10}, 1, {3, 3}, {1, 1}, {1, 1, 1, 1}),
+    conv_param_t<>(1, 32, 16, {10, 30}, 1, {3, 3}, {1, 1}, {1, 1, 1, 1}),
+    conv_param_t<>(1, 32, 16, {10, 30}, 1, {3, 3}, {1, 1}, {0, 0, 0, 0}),
+    conv_param_t<>(1, 32, 16, {10, 30}, 1, {3, 3}, {1, 1}, {0, 0, 0, 0}, {2, 2}),
+    conv_param_t<>(1, 32, 16, {10, 30}, 1, {3, 3}, {1, 1}, {1, 1, 1, 1}, {2, 2}),
+    conv_param_t<>(1, 32, 16, {10, 30}, 1, {3, 3}, {1, 1}, {1, 1, 1, 1}, {3, 3}),
+    conv_param_t<>(1, 32, 16, {10, 30}, 1, {3, 3}, {2, 2}, {1, 1, 1, 1}),
+    conv_param_t<>(1, 32, 16, {10, 30}, 1, {3, 3}, {2, 2}, {1, 1, 1, 1}, {2, 2}),
+    conv_param_t<>(1, 32, 16, {10, 30}, 1, {3, 3}, {2, 2}, {1, 1, 1, 1}, {2, 1}),
+    conv_param_t<>(1, 32, 16, {10, 30}, 1, {3, 3}, {2, 2}, {1, 1, 1, 1}, {1, 2}),
+    conv_param_t<>(1, 32, 16, {10, 30}, 1, {3, 3}, {1, 1}, {2, 1, 2, 1}),
+    conv_param_t<>(1, 32, 16, {10, 30}, 1, {3, 3}, {1, 1}, {1, 2, 1, 2}),
+    conv_param_t<>(1, 32, 16, {10, 30}, 1, {3, 3}, {1, 2}, {1, 1, 1, 1}),
+    conv_param_t<>(1, 32, 16, {10, 30}, 1, {3, 3}, {2, 1}, {1, 1, 1, 1}),
+    conv_param_t<>(1, 16, 16, {10, 30}, 1, {3, 5}, {1, 1}, {1, 1, 1, 1}),
+    conv_param_t<>(1, 16, 16, {10, 30}, 1, {5, 3}, {1, 1}, {1, 1, 1, 1}),
+    conv_param_t<>(1, 16, 16, {10, 30}, 1, {5, 3}, {1, 1}, {1, 1, 1, 1}, {2, 2}),
+    // groupwise
+    conv_param_t<>(1, 32, 32, {10, 30}, 8, {3, 3}, {1, 1}, {1, 1, 1, 1}),
+    conv_param_t<>(1, 32, 16, {10, 30}, 8, {3, 3}, {1, 1}, {1, 1, 1, 1}),
+    conv_param_t<>(1, 16, 32, {10, 30}, 8, {3, 3}, {2, 2}, {1, 1, 1, 1}),
+    conv_param_t<>(1, 32, 32, {10, 30}, 8, {3, 3}, {2, 2}, {2, 1, 2, 1}),
+    conv_param_t<>(1, 32, 32, {10, 30}, 8, {3, 3}, {1, 2}, {2, 1, 2, 1}),
+    conv_param_t<>(1, 32, 32, {10, 30}, 8, {3, 3}, {2, 1}, {2, 1, 2, 1}),
+    conv_param_t<>(1, 32, 32, {10, 30}, 8, {3, 5}, {1, 1}, {1, 1, 1, 1}),
+    conv_param_t<>(1, 32, 32, {10, 30}, 8, {5, 3}, {1, 1}, {1, 1, 1, 1}),
+    conv_param_t<>(1, 32, 32, {10, 30}, 8, {5, 3}, {1, 1}, {1, 1, 1, 1}, {2, 2}),
+    // DW
+    conv_param_t<>(1, 32, 32, {10, 30}, 32, {3, 3}, {1, 1}, {1, 1, 1, 1}),
+    conv_param_t<>(1, 32, 32, {10, 30}, 32, {3, 3}, {2, 2}, {1, 1, 1, 1}),
+    conv_param_t<>(1, 32, 32, {10, 30}, 32, {3, 3}, {1, 1}, {1, 2, 1, 2}),
+    conv_param_t<>(1, 32, 32, {10, 30}, 32, {3, 3}, {2, 1}, {1, 1, 1, 1}),
+    conv_param_t<>(1, 32, 32, {10, 30}, 32, {3, 3}, {1, 2}, {1, 1, 1, 1}),
+    conv_param_t<>(1, 32, 32, {10, 30}, 32, {3, 5}, {1, 1}, {1, 1, 1, 1}),
+    conv_param_t<>(1, 32, 32, {10, 30}, 32, {5, 3}, {1, 1}, {1, 1, 1, 1}),
+    conv_param_t<>(1, 32, 32, {10, 30}, 32, {5, 5}, {1, 1}, {1, 1, 1, 1}),
+    conv_param_t<>(1, 32, 32, {10, 30}, 32, {5, 3}, {1, 1}, {1, 1, 1, 1}, {2, 2}),
+    // Pointwise
+    conv_param_t<>(1, 32, 32, {10, 30}, 1, {1, 1}, {1, 1}, {0, 0, 0, 0}),
+    conv_param_t<>(1, 16, 32, {10, 30}, 1, {1, 1}, {1, 1}, {0, 0, 0, 0}),
+    conv_param_t<>(1, 32, 16, {10, 30}, 1, {1, 1}, {1, 1}, {0, 0, 0, 0}),
+    conv_param_t<>(1, 32, 16, {10, 30}, 1, {1, 1}, {2, 2}, {0, 0, 0, 0}),
+    conv_param_t<>(1, 32, 16, {10, 30}, 1, {1, 1}, {1, 2}, {0, 0, 0, 0}),
+    conv_param_t<>(1, 32, 16, {10, 30}, 1, {1, 1}, {2, 1}, {0, 0, 0, 0}),
   };
   return shapes;
 }