Address remarks

Author: vlad-perevezentsev

dpnp/tests/test_linalg.py

@@ -21,11 +21,11 @@
     get_all_dtypes,
     get_float_complex_dtypes,
     get_integer_float_dtypes,
-    get_intel_mkl_version,
     has_support_aspect64,
     is_cpu_device,
     is_cuda_device,
     numpy_version,
+    requires_intel_mkl_version,
 )
 from .third_party.cupy import testing
 
@@ -333,7 +333,13 @@ def test_nan(self, p):
         # while OneMKL returns nans
         if is_cuda_device() and p in [-dpnp.inf, -1, 1, dpnp.inf, "fro"]:
             pytest.skip("Different behavior on CUDA")
-        elif p in [-dpnp.inf, -1, 1, dpnp.inf, "fro"]:
+        elif requires_intel_mkl_version("2025.2") and p in [
+            -dpnp.inf,
+            -1,
+            1,
+            dpnp.inf,
+            "fro",
+        ]:
             pytest.skip("SAT-7966")
         a = generate_random_numpy_array((2, 2, 2, 2))
         a[0, 0] = 0
@@ -1753,7 +1759,9 @@ def test_inv_singular_matrix(self, matrix):
         assert_raises(dpnp.linalg.LinAlgError, dpnp.linalg.inv, a_dp)
 
     # TODO: remove skipif when Intel MKL 2025.2 is released
-    @pytest.mark.skipif(get_intel_mkl_version() < "2025.2", reason="mkl<2025.2")
+    @pytest.mark.skipif(
+        not requires_intel_mkl_version("2025.2"), reason="mkl<2025.2"
+    )
     def test_inv_singular_matrix_3D(self):
         a_np = numpy.array(
             [[[1, 2], [3, 4]], [[1, 2], [1, 2]], [[1, 3], [3, 1]]]
@@ -2776,9 +2784,10 @@ def test_slogdet_strides(self):
         assert_allclose(logdet_result, logdet_expected)
 
     # TODO: remove skipif when Intel MKL 2025.2 is released
-    # Skip running on cpu because dpnp uses _getrf_batch only on cpu.
+    # Skip running on CPU because dpnp uses _getrf_batch only on CPU
+    # for dpnp.linalg.det/slogdet.
     @pytest.mark.skipif(
-        is_cpu_device() and get_intel_mkl_version() < "2025.2",
+        is_cpu_device() and not requires_intel_mkl_version("2025.2"),
         reason="mkl<2025.2",
     )
     @pytest.mark.parametrize(

dpnp/tests/third_party/cupy/linalg_tests/test_solve.py

@@ -6,8 +6,8 @@
 import dpnp as cupy
 from dpnp.tests.helper import (
     assert_dtype_allclose,
-    get_intel_mkl_version,
     has_support_aspect64,
+    requires_intel_mkl_version,
 )
 from dpnp.tests.third_party.cupy import testing
 from dpnp.tests.third_party.cupy.testing import _condition
@@ -215,7 +215,9 @@ def test_inv(self, dtype):
                 xp.linalg.inv(a)
 
     # TODO: remove skipif when Intel MKL 2025.2 is released
-    @pytest.mark.skipif(get_intel_mkl_version() < "2025.2", reason="mkl<2025.2")
+    @pytest.mark.skipif(
+        not requires_intel_mkl_version("2025.2"), reason="mkl<2025.2"
+    )
     @testing.for_dtypes("ifdFD")
     def test_batched_inv(self, dtype):
         for xp in (numpy, cupy):