From 220e42323756426fdbddb4eb7ad76e340c69e355 Mon Sep 17 00:00:00 2001
From: "M. Amber Hassaan" <amber_474@yahoo.com>
Date: Wed, 11 Oct 2023 20:09:37 +0000
Subject: [PATCH] resolve conflicts and handle feedback

---
 src/ocl/convolutionocl.cpp              | 6 +++++-
 test/gtest/conv_api_strided_tensors.cpp | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/ocl/convolutionocl.cpp b/src/ocl/convolutionocl.cpp
index bc60fc17f4..d66186577c 100644
--- 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
index 9a2876b3f0..04d56ec908 100644
--- 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