Remove leftovers and workarounds where possible (#1931)

* Make tests rerun conditional

* Bump build and host dependencies in meta.yaml

* Unmuted tests where fixes are expected to be available

* Correct dpctl pinning

* Mute test with dpnp.linalg.svd() hanging on Windows

* Mute one more test relating to dpnp.linalg.svd()

* Mute test_svd_rank4 test relating to dpnp.linalg.svd()

* Mute test_svd_rank4_loop test relating to dpnp.linalg.svd()

Author: antonwolfy

.github/workflows/conda-package.yml

@@ -16,6 +16,7 @@ env:
   CHANNELS: '-c dppy/label/dev -c https://software.repos.intel.com/python/conda/ -c conda-forge --override-channels'
   CONDA_BUILD_VERSION: '24.5.1'
   CONDA_INDEX_VERSION: '0.5.0'
+  RERUN_TESTS_ON_FAILURE: 'false'
   RUN_TESTS_MAX_ATTEMPTS: 2
   TEST_ENV_NAME: 'test'
   TEST_SCOPE: >-
@@ -255,14 +256,14 @@ jobs:
           python -c "import dpnp, dpctl; dpctl.lsplatform()"
           python -c "import dpnp; print(dpnp.__version__)"
 
-      # TODO: run the whole scope once the issues on CPU are resolved
-      # - name: Run tests
-        # run: |
-        #   python -m pytest -q -ra --disable-warnings -vv ${{ env.TEST_SCOPE }}
-        # working-directory: ${{ env.tests-path }}
+      - name: Run tests
+        if: env.RERUN_TESTS_ON_FAILURE != 'true'
+        run: |
+          python -m pytest -q -ra --disable-warnings -vv ${{ env.TEST_SCOPE }}
+        working-directory: ${{ env.tests-path }}
 
-      # TODO: remove once 2024.2 release is published
       - name: Run tests
+        if: env.RERUN_TESTS_ON_FAILURE == 'true'
         id: run_tests_linux
         uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
         with:
@@ -411,14 +412,14 @@ jobs:
           python -c "import dpnp, dpctl; dpctl.lsplatform()"
           python -c "import dpnp; print(dpnp.__version__)"
 
-      # TODO: run the whole scope once the issues on CPU are resolved
-      # - name: Run tests
-      #   run: |
-      #     python -m pytest -q -ra --disable-warnings -vv ${{ env.TEST_SCOPE }}
-      #   working-directory: ${{ env.tests-path }}
+      - name: Run tests
+        if: env.RERUN_TESTS_ON_FAILURE != 'true'
+        run: |
+          python -m pytest -q -ra --disable-warnings -vv ${{ env.TEST_SCOPE }}
+        working-directory: ${{ env.tests-path }}
 
-      # TODO: remove once 2024.2 release is published
       - name: Run tests
+        if: env.RERUN_TESTS_ON_FAILURE == 'true'
         id: run_tests_win
         uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
         with:

conda-recipe/meta.yaml

@@ -1,8 +1,5 @@
-{% set required_compiler_and_mkl_version = "2024.0" %}
-{% set excluded_compiler_version1 = "2024.0.1" %}
-{% set excluded_compiler_version2 = "2024.0.2" %}
-{% set excluded_compiler_version3 = "2024.0.3" %}
-{% set required_dpctl_version = "0.17.0" %}
+{% set required_compiler_and_mkl_version = "2024.2" %}
+{% set required_dpctl_version = "0.18.0*" %}
 
 package:
     name: dpnp
@@ -27,8 +24,7 @@ requirements:
       - scikit-build
     build:
       - {{ compiler('cxx') }}
-      - {{ compiler('dpcpp') }} >={{ required_compiler_and_mkl_version }},!={{ excluded_compiler_version1 }},!={{ excluded_compiler_version2 }},!={{ excluded_compiler_version3 }} # [win]
-      - {{ compiler('dpcpp') }} >={{ required_compiler_and_mkl_version }},!={{ excluded_compiler_version1 }},!={{ excluded_compiler_version2 }} # [linux]
+      - {{ compiler('dpcpp') }} >={{ required_compiler_and_mkl_version }}
       - sysroot_linux-64 >=2.28 # [linux]
     run:
       - python

tests/test_linalg.py

@@ -1485,10 +1485,6 @@ def test_norm_error(self):
 
 
 class TestQr:
-    # TODO: New packages that fix issue CMPLRLLVM-53771 are only available in internal CI.
-    # Skip the tests on cpu until these packages are available for the external CI.
-    # Specifically dpcpp_linux-64>=2024.1.0
-    @pytest.mark.skipif(is_cpu_device(), reason="CMPLRLLVM-53771")
     @pytest.mark.parametrize("dtype", get_all_dtypes(no_bool=True))
     @pytest.mark.parametrize(
         "shape",
@@ -1574,7 +1570,6 @@ def test_qr_empty(self, dtype, shape, mode):
 
         assert_dtype_allclose(dpnp_r, np_r)
 
-    @pytest.mark.skipif(is_cpu_device(), reason="CMPLRLLVM-53771")
     @pytest.mark.parametrize(
         "mode",
         ["r", "raw", "complete", "reduced"],

tests/test_sycl_queue.py

@@ -1786,10 +1786,7 @@ def test_array_creation_from_dpctl(copy, device):
     valid_devices,
     ids=[device.filter_string for device in valid_devices],
 )
-# TODO need to delete no_bool=True when use dlpack > 0.7 version
-@pytest.mark.parametrize(
-    "arr_dtype", get_all_dtypes(no_float16=True, no_bool=True)
-)
+@pytest.mark.parametrize("arr_dtype", get_all_dtypes(no_float16=True))
 @pytest.mark.parametrize("shape", [tuple(), (2,), (3, 0, 1), (2, 2, 2)])
 def test_from_dlpack(arr_dtype, shape, device):
     X = dpnp.empty(shape=shape, dtype=arr_dtype, device=device)

tests/third_party/cupy/linalg_tests/test_decomposition.py

@@ -4,7 +4,7 @@
 import pytest
 
 import dpnp as cupy
-from tests.helper import has_support_aspect64, is_cpu_device
+from tests.helper import has_support_aspect64, is_cpu_device, is_win_platform
 from tests.third_party.cupy import testing
 from tests.third_party.cupy.testing import _condition
 
@@ -156,14 +156,6 @@ def test_decomposition(self, dtype):
 )
 @testing.fix_random()
 class TestSVD(unittest.TestCase):
-    # TODO: New packages that fix issue CMPLRLLVM-53771 are only available in internal CI.
-    # Skip the tests on cpu until these packages are available for the external CI.
-    # Specifically dpcpp_linux-64>=2024.1.0
-    @classmethod
-    def setUpClass(cls):
-        if is_cpu_device():
-            raise unittest.SkipTest("CMPLRLLVM-53771")
-
     def setUp(self):
         self.seed = testing.generate_seed()
 
@@ -287,6 +279,12 @@ def test_svd_rank2_empty_array_compute_uv_false(self, xp):
             array, full_matrices=self.full_matrices, compute_uv=False
         )
 
+    # The issue was expected to be resolved once CMPLRLLVM-53771 is available,
+    # which has to be included in DPC++ 2024.1.0, but problem still exists
+    # on Windows
+    @pytest.mark.skipif(
+        is_cpu_device() and is_win_platform(), reason="SAT-7145"
+    )
     @_condition.repeat(3, 10)
     def test_svd_rank3(self):
         self.check_usv((2, 3, 4))
@@ -296,6 +294,9 @@ def test_svd_rank3(self):
         self.check_usv((2, 4, 3))
         self.check_usv((2, 32, 32))
 
+    @pytest.mark.skipif(
+        is_cpu_device() and is_win_platform(), reason="SAT-7145"
+    )
     @_condition.repeat(3, 10)
     def test_svd_rank3_loop(self):
         # This tests the loop-based batched gesvd on CUDA (_gesvd_batched)
@@ -343,6 +344,9 @@ def test_svd_rank3_empty_array_compute_uv_false2(self, xp):
             array, full_matrices=self.full_matrices, compute_uv=False
         )
 
+    @pytest.mark.skipif(
+        is_cpu_device() and is_win_platform(), reason="SAT-7145"
+    )
     @_condition.repeat(3, 10)
     def test_svd_rank4(self):
         self.check_usv((2, 2, 3, 4))
@@ -352,6 +356,9 @@ def test_svd_rank4(self):
         self.check_usv((2, 2, 4, 3))
         self.check_usv((2, 2, 32, 32))
 
+    @pytest.mark.skipif(
+        is_cpu_device() and is_win_platform(), reason="SAT-7145"
+    )
     @_condition.repeat(3, 10)
     def test_svd_rank4_loop(self):
         # This tests the loop-based batched gesvd on CUDA (_gesvd_batched)
@@ -410,26 +417,20 @@ def _check_result(self, result_cpu, result_gpu):
             assert result_cpu.dtype == result_gpu.dtype
             testing.assert_allclose(result_cpu, result_gpu, atol=1e-4)
 
-    # TODO: New packages that fix issue CMPLRLLVM-53771 are only available in internal CI.
-    # Skip the tests on cpu until these packages are available for the external CI.
-    # Specifically dpcpp_linux-64>=2024.1.0
-    @pytest.mark.skipif(is_cpu_device(), reason="CMPLRLLVM-53771")
     @testing.fix_random()
     @_condition.repeat(3, 10)
     def test_mode(self):
         self.check_mode(numpy.random.randn(2, 4), mode=self.mode)
         self.check_mode(numpy.random.randn(3, 3), mode=self.mode)
         self.check_mode(numpy.random.randn(5, 4), mode=self.mode)
 
-    @pytest.mark.skipif(is_cpu_device(), reason="CMPLRLLVM-53771")
     @testing.with_requires("numpy>=1.22")
     @testing.fix_random()
     def test_mode_rank3(self):
         self.check_mode(numpy.random.randn(3, 2, 4), mode=self.mode)
         self.check_mode(numpy.random.randn(4, 3, 3), mode=self.mode)
         self.check_mode(numpy.random.randn(2, 5, 4), mode=self.mode)
 
-    @pytest.mark.skipif(is_cpu_device(), reason="CMPLRLLVM-53771")
     @testing.with_requires("numpy>=1.22")
     @testing.fix_random()
     def test_mode_rank4(self):