Cherry-picked commit with merge conflict

Author: dnikolaev-amd

test/jit/test_freezing.py

@@ -15,9 +15,14 @@
 from torch.testing._internal.common_quantization import skipIfNoFBGEMM
 from torch.testing._internal.common_quantized import override_quantized_engine
 from torch.testing._internal.common_utils import (
+<<<<<<< HEAD
     raise_on_run_directly,
+=======
+    NAVI_ARCH,
+>>>>>>> 3b9e558b7c ([release/2.6] skip convolution tests on Navi (#2055))
     set_default_dtype,
     skipCUDAMemoryLeakCheckIf,
+    skipIfRocmArch,
     skipIfTorchDynamo,
     TEST_WITH_ROCM,
 )
@@ -2967,6 +2972,7 @@ def test_conv_to_mkldnn_no_mkldnn(self):
             self.assertEqual(frozen(inp), mod(inp))
 
     @unittest.skipIf(not (TEST_CUDNN or TEST_WITH_ROCM), "requires CUDNN")
+    @skipIfRocmArch(NAVI_ARCH)  # not supported by MIOPEN on NAVI
     def test_freeze_conv_relu_fusion(self):
         with set_default_dtype(torch.float):
             conv_bias = [True, False]
@@ -3029,6 +3035,7 @@ def forward(self, x):
                 self.assertEqual(mod_eager(inp), frozen_mod(inp))
 
     @unittest.skipIf(not (TEST_CUDNN or TEST_WITH_ROCM), "requires CUDNN")
+    @skipIfRocmArch(NAVI_ARCH)  # not supported by MIOPEN on NAVI
     def test_freeze_conv_relu_fusion_not_forward(self):
         with set_default_dtype(torch.float):
 

test/nn/test_convolution.py

@@ -48,10 +48,12 @@
     gradgradcheck,
     instantiate_parametrized_tests,
     MACOS_VERSION,
+    NAVI_ARCH,
     parametrize as parametrize_test,
     run_tests,
     set_default_dtype,
     skipIfNotMiopenSuggestNHWC,
+    skipIfRocmArch,
     skipIfRocmVersionLessThan,
     subtest,
     TEST_SCIPY,
@@ -3883,6 +3885,7 @@ def test_conv2d_no_grad(self, device, dtype):
 
     @onlyCUDA
     @skipCUDAIfNoCudnn
+    @skipIfRocmArch(NAVI_ARCH) # not supported by MIOPEN on NAVI
     @dtypes(torch.float, torch.float16)
     @precisionOverride({torch.half: 0.002, torch.float: 1e-4})
     def test_cudnn_convolution_relu(self, device, dtype):

torch/testing/_internal/common_utils.py

@@ -105,6 +105,7 @@
 
 MI300_ARCH = ("gfx940", "gfx941", "gfx942")
 NAVI_ARCH = ("gfx1030", "gfx1100", "gfx1101", "gfx1200", "gfx1201")
+<<<<<<< HEAD
 NAVI3_ARCH = ("gfx1100", "gfx1101")
 NAVI4_ARCH = ("gfx1200", "gfx1201")
 
@@ -115,6 +116,9 @@ def is_navi3_arch():
         if gfx_arch in NAVI3_ARCH:
             return True
     return False
+=======
+NAVI4_ARCH = ("gfx1200", "gfx1201")
+>>>>>>> 3b9e558b7c ([release/2.6] skip convolution tests on Navi (#2055))
 
 def freeze_rng_state(*args, **kwargs):
     return torch.testing._utils.freeze_rng_state(*args, **kwargs)
@@ -1926,11 +1930,19 @@ def wrapper(*args, **kwargs):
         return dec_fn(func)
     return dec_fn
 
+<<<<<<< HEAD
 def skipIfRocmArch(arch: tuple[str, ...]):
     def dec_fn(fn):
         @wraps(fn)
         def wrap_fn(self, *args, **kwargs):
             if TEST_WITH_ROCM:
+=======
+def skipIfRocmArch(arch: Tuple[str, ...]):
+    def dec_fn(fn):
+        @wraps(fn)
+        def wrap_fn(self, *args, **kwargs):
+            if TEST_WITH_ROCM:  # noqa: F821
+>>>>>>> 3b9e558b7c ([release/2.6] skip convolution tests on Navi (#2055))
                 prop = torch.cuda.get_device_properties(0)
                 if prop.gcnArchName.split(":")[0] in arch:
                     reason = f"skipIfRocm: test skipped on {arch}"