resolve conflicts and handle feedback

ROCm · Oct 11, 2023 · 220e423 · 220e423
1 parent e146046
commit 220e423
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/ocl/convolutionocl.cpp b/src/ocl/convolutionocl.cpp
@@ -397,8 +397,12 @@ void ConvolutionDescriptor::ValidateTensors(const ConvTensors& tensors) const
             // strides in NCHW order for some weird reason.
             g_stride_index = td.GetStrides().size() - 1;
         }
+        else
+        {
+            MIOPEN_THROW(miopenStatusInternalError, "Layout not supported for grouped convolution");
+        }
 
-        if(g_stride_index != 1)
+        if(g_stride_index != -1)
         {
             return (td.GetStrides()[g_stride_index] % this->group_count) != 0;
         }

diff --git a/test/gtest/conv_api_strided_tensors.cpp b/test/gtest/conv_api_strided_tensors.cpp
@@ -139,6 +139,9 @@ class ConvStridedTensors : public ::testing::Test
     std::vector<float> h_output;
 };
 
+/// \todo re-enable this test after NCDHW grouped convolution lands (PR 2429)
+/// \todo add cpu reference convolution for verification --amberhassaan
+#if 0
 TEST_F(ConvStridedTensors, ConvStridedTensorsNotImplemented)
 {
     auto device = Device(handle);
@@ -194,3 +197,4 @@ TEST_F(ConvStridedTensors, ConvStridedTensorsNotImplemented)
               miopenStatusSuccess);
     ASSERT_TRUE(device.Synchronize());
 }
+#endif