Align TestSolve with cupy tests

Author: vlad-perevezentsev

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

@@ -47,6 +47,7 @@ def check_x(self, a_shape, b_shape, xp, dtype):
         testing.assert_array_equal(b_copy, b)
         return result
 
+    @testing.with_requires("numpy>=2.0")
     def test_solve(self):
         self.check_x((4, 4), (4,))
         self.check_x((5, 5), (5, 2))
@@ -55,14 +56,9 @@ def test_solve(self):
         self.check_x((0, 0), (0,))
         self.check_x((0, 0), (0, 2))
         self.check_x((0, 2, 2), (0, 2, 3))
-        # In numpy 2.0 the broadcast ambiguity has been removed and now
-        # b is treaded as a single vector if and only if it is 1-dimensional;
-        # for other cases this signature must be followed
-        # (..., m, m), (..., m, n) -> (..., m, n)
-        # https://github.com/numpy/numpy/pull/25914
-        if numpy.lib.NumpyVersion(numpy.__version__) >= "2.0.0":
-            self.check_x((2, 3, 3), (3,))
-            self.check_x((2, 5, 3, 3), (3,))
+        # Allowed since numpy 2
+        self.check_x((2, 3, 3), (3,))
+        self.check_x((2, 5, 3, 3), (3,))
 
     def check_shape(self, a_shape, b_shape, error_types):
         for xp, error_type in error_types.items():
@@ -81,6 +77,7 @@ def test_solve_singular_empty(self, xp):
         # LinAlgError("Singular matrix") is not raised
         return xp.linalg.solve(a, b)
 
+    @testing.with_requires("numpy>=2.0")
     def test_invalid_shape(self):
         linalg_errors = {
             numpy: numpy.linalg.LinAlgError,
@@ -98,10 +95,9 @@ def test_invalid_shape(self):
         self.check_shape((3, 3), (0,), value_errors)
         self.check_shape((0, 3, 4), (3,), linalg_errors)
         # Not allowed since numpy 2.0
-        if numpy.lib.NumpyVersion(numpy.__version__) >= "2.0.0":
-            self.check_shape((0, 2, 2), (0, 2), value_errors)
-            self.check_shape((2, 4, 4), (2, 4), value_errors)
-            self.check_shape((2, 3, 2, 2), (2, 3, 2), value_errors)
+        self.check_shape((0, 2, 2), (0, 2), value_errors)
+        self.check_shape((2, 4, 4), (2, 4), value_errors)
+        self.check_shape((2, 3, 2, 2), (2, 3, 2), value_errors)
 
 
 @testing.parameterize(