Merge 40cdd49 into c06e457

Author: antonwolfy

tests/test_usm_type.py

@@ -787,6 +787,9 @@ def test_clip(usm_type):
 )
 def test_solve(matrix, vector, usm_type_matrix, usm_type_vector):
     x = dp.array(matrix, usm_type=usm_type_matrix)
+    if x.ndim > 2 and x.device.sycl_device.is_cpu:
+        pytest.skip("SAT-6842: reported hanging in public CI")
+
     y = dp.array(vector, usm_type=usm_type_vector)
     z = dp.linalg.solve(x, y)
 

tests/third_party/cupy/linalg_tests/test_solve.py

@@ -8,6 +8,7 @@
     assert_dtype_allclose,
     has_support_aspect64,
     is_cpu_device,
+    is_win_platform,
 )
 from tests.third_party.cupy import testing
 from tests.third_party.cupy.testing import _condition
@@ -35,6 +36,9 @@ class TestSolve(unittest.TestCase):
     @testing.numpy_cupy_allclose(
         atol=1e-3, contiguous_check=False, type_check=has_support_aspect64()
     )
+    @pytest.mark.skipif(
+        is_cpu_device() and is_win_platform(), reason="SAT-6842"
+    )
     def check_x(self, a_shape, b_shape, xp, dtype):
         a = testing.shaped_random(a_shape, xp, dtype=dtype, seed=0, scale=20)
         b = testing.shaped_random(b_shape, xp, dtype=dtype, seed=1)