Removing skip conditions of test_conv_backend_cudnn tests on ROCm

rraminen · rraminen · commit bb6eb6ed88b8 · 2025-07-22T02:06:42.000Z
diff --git a/test/nn/test_convolution.py b/test/nn/test_convolution.py
@@ -2440,17 +2440,17 @@ def test_conv_transpose_with_output_size_and_no_batch_dim(self, device, N):
                 decorators=[onlyCUDA, disablecuDNN],
                 name="cuda_depthwise3d",
             ),
-            # === cudnn ===
+            # === cudnn or miopen ===
             subtest(
                 (
                     (2, 6, 7),
                     False,
                     False,
                     3,
                     torch.strided,
-                    torch._C._ConvBackend.Cudnn,
+                    torch._C._ConvBackend.Miopen if torch.version.hip else torch._C._ConvBackend.Cudnn,
                 ),
-                decorators=[onlyCUDA, skipCUDAIfNoCudnn, skipCUDAIfMiopen],
+                decorators=[onlyCUDA, skipCUDAIfNoCudnn],
                 name="cudnn1d",
             ),
             subtest(
@@ -2460,9 +2460,9 @@ def test_conv_transpose_with_output_size_and_no_batch_dim(self, device, N):
                     False,
                     3,
                     torch.strided,
-                    torch._C._ConvBackend.Cudnn,
+                    torch._C._ConvBackend.Miopen if torch.version.hip else torch._C._ConvBackend.Cudnn,
                 ),
-                decorators=[onlyCUDA, skipCUDAIfNoCudnn, skipCUDAIfMiopen],
+                decorators=[onlyCUDA, skipCUDAIfNoCudnn],
                 name="cudnn2d",
             ),
             subtest(
@@ -2472,9 +2472,9 @@ def test_conv_transpose_with_output_size_and_no_batch_dim(self, device, N):
                     False,
                     3,
                     torch.strided,
-                    torch._C._ConvBackend.Cudnn,
+                    torch._C._ConvBackend.Miopen if torch.version.hip else torch._C._ConvBackend.Cudnn,
                 ),
-                decorators=[onlyCUDA, skipCUDAIfNoCudnn, skipCUDAIfMiopen],
+                decorators=[onlyCUDA, skipCUDAIfNoCudnn],
                 name="cudnn3d",
             ),
             subtest(
@@ -2484,9 +2484,9 @@ def test_conv_transpose_with_output_size_and_no_batch_dim(self, device, N):
                     False,
                     3,
                     torch.strided,
-                    torch._C._ConvBackend.CudnnTranspose,
+                    torch._C._ConvBackend.MiopenTranspose if torch.version.hip else torch._C._ConvBackend.CudnnTranspose,
                 ),
-                decorators=[onlyCUDA, skipCUDAIfNoCudnn, skipCUDAIfMiopen],
+                decorators=[onlyCUDA, skipCUDAIfNoCudnn],
                 name="cudnn1d_transposed",
             ),
             subtest(
@@ -2496,75 +2496,15 @@ def test_conv_transpose_with_output_size_and_no_batch_dim(self, device, N):
                     False,
                     3,
                     torch.strided,
-                    torch._C._ConvBackend.CudnnTranspose,
+                    torch._C._ConvBackend.MiopenTranspose if torch.version.hip else torch._C._ConvBackend.CudnnTranspose,
                 ),
-                decorators=[onlyCUDA, skipCUDAIfNoCudnn, skipCUDAIfMiopen],
+                decorators=[onlyCUDA, skipCUDAIfNoCudnn],
                 name="cudnn2d_transposed",
             ),
             # FIXME: RuntimeError: CUDA out of memory.
             # subtest(((2, 6, 7, 8, 9), True, False, 3, torch.strided, torch._C._ConvBackend.CudnnTranspose),
             #         decorators=[onlyCUDA, skipCUDAIfNoCudnn, skipCUDAIfMiopen], name='cudnn3d_transposed'),
             # === miopen ===
-            subtest(
-                (
-                    (2, 6, 7),
-                    False,
-                    False,
-                    3,
-                    torch.strided,
-                    torch._C._ConvBackend.Miopen,
-                ),
-                decorators=[onlyCUDA, skipCUDAIfNoMiopen],
-                name="miopen1d",
-            ),
-            subtest(
-                (
-                    (2, 6, 7, 8),
-                    False,
-                    False,
-                    3,
-                    torch.strided,
-                    torch._C._ConvBackend.Miopen,
-                ),
-                decorators=[onlyCUDA, skipCUDAIfNoMiopen],
-                name="miopen2d",
-            ),
-            subtest(
-                (
-                    (2, 6, 7, 8, 9),
-                    False,
-                    False,
-                    3,
-                    torch.strided,
-                    torch._C._ConvBackend.Miopen,
-                ),
-                decorators=[onlyCUDA, skipCUDAIfNoMiopen],
-                name="miopen3d",
-            ),
-            subtest(
-                (
-                    (2, 6, 7),
-                    True,
-                    False,
-                    3,
-                    torch.strided,
-                    torch._C._ConvBackend.MiopenTranspose,
-                ),
-                decorators=[onlyCUDA, skipCUDAIfNoMiopen],
-                name="miopen1d_transposed",
-            ),
-            subtest(
-                (
-                    (2, 6, 7, 8),
-                    True,
-                    False,
-                    3,
-                    torch.strided,
-                    torch._C._ConvBackend.MiopenTranspose,
-                ),
-                decorators=[onlyCUDA, skipCUDAIfNoMiopen],
-                name="miopen2d_transposed",
-            ),
             subtest(
                 (
                     (2, 6, 7, 8, 9),
