[release/2.7] Fix merge conflicts

Author: k-artem

test/distributed/_tools/test_sac_ilp.py

@@ -19,22 +19,13 @@
 )
 from torch.testing._internal.common_cuda import TEST_CUDA
 from torch.testing._internal.common_utils import (
-<<<<<<< HEAD
     MI300_ARCH,
+    NAVI4_ARCH,
     run_tests,
     skipIfRocmArch,
     skipIfTorchDynamo,
     TestCase,
 )
-=======
-    run_tests,
-    skipIfTorchDynamo,
-    TestCase,
-    skipIfRocmArch,
-    NAVI4_ARCH,
-)
-
->>>>>>> 4ca33638af ([release/2.6][SWDEV-523736] Skip&Fix some testcases for archs without SDPA or Navi4x (#2213))
 from torch.testing._internal.distributed._tensor.common_dtensor import (
     ModelArgs,
     Transformer,
@@ -146,11 +137,8 @@ def _collect_module_info_with_fake_tensor_mode(self) -> ModuleInfo:
 
     @skipIfTorchDynamo("https://github.com/pytorch/pytorch/issues/115653")
     @unittest.skipIf(not TEST_CUDA, "CUDA not available")
-<<<<<<< HEAD
     @skipIfRocmArch(MI300_ARCH)
-=======
     @skipIfRocmArch(NAVI4_ARCH)
->>>>>>> 4ca33638af ([release/2.6][SWDEV-523736] Skip&Fix some testcases for archs without SDPA or Navi4x (#2213))
     def test_sac_ilp_case1(self):
         """
         This is a case where the memory budget is either binding or too tight,

test/dynamo/test_activation_checkpointing.py

@@ -1285,12 +1285,8 @@ def fn(x, ys):
         self.assertEqual(ref, res)
 
     @requires_cuda
-<<<<<<< HEAD
-    def test_pattern_matcher(self, device):
-=======
     @unittest.skipIf(not PLATFORM_SUPPORTS_FLASH_ATTENTION, "Some archs don't support SDPA")
-    def test_pattern_matcher(self):
->>>>>>> 4ca33638af ([release/2.6][SWDEV-523736] Skip&Fix some testcases for archs without SDPA or Navi4x (#2213))
+    def test_pattern_matcher(self, device):
         # Check that the sdpa op is recomputed in the backward graph
         # tests percolate_tags
 

test/dynamo/test_repros.py

@@ -6336,31 +6336,6 @@ def fn(x):
         inp = torch.randn(3, 3)
         self.assertEqual(fn(inp), opt_fn(inp))
 
-<<<<<<< HEAD
-=======
-    @requires_cuda
-    @unittest.skipIf(not PLATFORM_SUPPORTS_FLASH_ATTENTION, "Some archs don't support SDPA")
-    def test_sdpa_dynamic_shapes(self):
-        def f(x, s0, s1, s2):
-            q = x.view(2, s0, s2, s0)
-            return torch._C._nn.scaled_dot_product_attention(
-                q, q, q, attn_mask=None, dropout_p=0.0, is_causal=True
-            )
-
-        x = torch.randn(2, 32, 4096, dtype=torch.bfloat16, device="cuda")
-        x_ref = x.clone().detach().requires_grad_()
-        s0 = 32
-        s1 = 64
-        s2 = 128
-
-        f_compiled = torch.compile(f, dynamic=True)
-
-        with torch._dynamo.config.patch(assume_static_by_default=False):
-            out_ref = f(x_ref, s0, s1, s2)
-            out = f_compiled(x, s0, s1, s2)
-            self.assertEqual(out_ref, out)
-
->>>>>>> 4ca33638af ([release/2.6][SWDEV-523736] Skip&Fix some testcases for archs without SDPA or Navi4x (#2213))
     def test_bitwise_op_guard(self):
         # attempt evaluating a guard with BitwiseFn_bitwise_[and/or]
         def fn(x):
@@ -6842,6 +6817,7 @@ def f(x):
         self.assertEqual(cnt.frame_count, 1)
 
     @requires_cuda
+    @unittest.skipIf(not PLATFORM_SUPPORTS_FLASH_ATTENTION, "Some archs don't support SDPA")
     def test_sdpa_dynamic_shapes(self, device):
         def f(x, s0, s1, s2):
             q = x.view(2, s0, s2, s0)

test/inductor/test_flex_decoding.py

@@ -3,13 +3,8 @@
 
 import functools
 from collections import namedtuple
-<<<<<<< HEAD
 from typing import Callable, Optional, Union
-from unittest import expectedFailure, skipUnless
-=======
-from typing import Callable, Optional, Tuple, Union
-from unittest import expectedFailure, skipUnless, skipIf
->>>>>>> 4ca33638af ([release/2.6][SWDEV-523736] Skip&Fix some testcases for archs without SDPA or Navi4x (#2213))
+from unittest import expectedFailure, skipIf, skipUnless
 from unittest.mock import patch
 
 import torch

test/inductor/test_mkldnn_pattern_matcher.py

@@ -28,7 +28,6 @@
     parametrize,
     skipIfNoXPU,
     skipIfRocm,
-    skipIfRocmArch,
     TEST_ACL,
     TEST_MKL,
     xfailIfACL,
@@ -1047,11 +1046,7 @@ def test_qconv2d_xpu(self):
     @skipIfNoDynamoSupport
     @skipIfNoONEDNNBF16
     @skipIfNoONEDNN
-<<<<<<< HEAD
-    @skipIfRocmArch(MI300_ARCH)
-=======
     @skipIfRocm
->>>>>>> 4ca33638af ([release/2.6][SWDEV-523736] Skip&Fix some testcases for archs without SDPA or Navi4x (#2213))
     def test_qconv2d_int8_mixed_bf16(self):
         r"""
         This testcase will quantize a single Conv2d module with int8_mixed_bf16 quantization.