Update remaining manipulation tests

Author: antonwolfy

dpnp/tests/third_party/cupy/manipulation_tests/test_add_remove.py

@@ -314,8 +314,9 @@ def test_unique_equal_nan(self, xp, dtype, equal_nan):
                 [[2, xp.nan, 2], [xp.nan, 1, xp.nan], [xp.nan, 1, xp.nan]],
                 dtype=dtype,
             )
-        return xp.unique(a, axis=0, equal_nan=equal_nan)
+        return xp.unique(a, axis=1, equal_nan=equal_nan)
 
+    @pytest.mark.skip("unique_all() is not supported yet")
     @testing.with_requires("numpy>=2.0")
     @pytest.mark.parametrize(
         "attr", ["values", "indices", "inverse_indices", "counts"]
@@ -326,6 +327,7 @@ def test_unique_all(self, xp, dtype, attr):
         a = testing.shaped_random((100, 100), xp, dtype)
         return getattr(xp.unique_all(a), attr)
 
+    @pytest.mark.skip("unique_counts() is not supported yet")
     @testing.with_requires("numpy>=2.0")
     @pytest.mark.parametrize("attr", ["values", "counts"])
     @testing.for_all_dtypes(no_float16=True, no_bool=True, no_complex=True)
@@ -334,6 +336,7 @@ def test_unique_counts(self, xp, dtype, attr):
         a = testing.shaped_random((100, 100), xp, dtype)
         return getattr(xp.unique_counts(a), attr)
 
+    @pytest.mark.skip("unique_inverse() is not supported yet")
     @testing.with_requires("numpy>=2.0")
     @pytest.mark.parametrize("attr", ["values", "inverse_indices"])
     @testing.for_all_dtypes(no_float16=True, no_bool=True, no_complex=True)
@@ -342,6 +345,7 @@ def test_unique_inverse(self, xp, dtype, attr):
         a = testing.shaped_random((100, 100), xp, dtype)
         return getattr(xp.unique_inverse(a), attr)
 
+    @pytest.mark.skip("unique_values() is not supported yet")
     @testing.with_requires("numpy>=2.0")
     @testing.for_all_dtypes(no_float16=True, no_bool=True, no_complex=True)
     @testing.numpy_cupy_array_equal()

dpnp/tests/third_party/cupy/manipulation_tests/test_join.py

@@ -533,8 +533,7 @@ def test_row_stack(self, xp, dtype1, dtype2):
         a = testing.shaped_arange((4, 3), xp, dtype1)
         b = testing.shaped_arange((3,), xp, dtype2)
         c = testing.shaped_arange((2, 3), xp, dtype1)
-        with pytest.warns(DeprecationWarning):
-            return xp.row_stack((a, b, c))
+        return xp.row_stack((a, b, c))
 
     def test_row_stack_wrong_ndim1(self):
         a = cupy.zeros(())

dpnp/tests/third_party/cupy/manipulation_tests/test_rearrange.py

@@ -45,6 +45,7 @@ def test_roll_cupy_shift(self, xp, dtype):
 
 class TestRollTypeError(unittest.TestCase):
 
+    @pytest.mark.skip("castable string shift is not supported")
     @testing.with_requires("numpy>=2.1.2")
     def test_roll_invalid_shift_castable(self):
         for xp in (numpy, cupy):
@@ -56,7 +57,7 @@ def test_roll_invalid_shift_castable(self):
     def test_roll_invalid_shift(self):
         for xp in (numpy, cupy):
             x = testing.shaped_arange((5, 2), xp)
-            with pytest.raises(ValueError):
+            with pytest.raises((ValueError, TypeError)):
                 xp.roll(x, "a", axis=0)
 
     def test_roll_invalid_axis_type(self):

dpnp/tests/third_party/cupy/manipulation_tests/test_split.py

@@ -1,10 +1,10 @@
 import unittest
 
-import dpnp as cupy
 from dpnp.tests.third_party.cupy import testing
 
 
 class TestSplit(unittest.TestCase):
+
     @testing.numpy_cupy_array_equal()
     def test_array_split1(self, xp):
         a = testing.shaped_arange((3, 11), xp)

dpnp/tests/third_party/cupy/manipulation_tests/test_tiling.py

@@ -17,13 +17,15 @@
     {"repeats": [1, 2, 3], "axis": -2},
 )
 class TestRepeat(unittest.TestCase):
+
     @testing.numpy_cupy_array_equal()
     def test_array_repeat(self, xp):
         x = testing.shaped_arange((2, 3, 4), xp)
         return xp.repeat(x, self.repeats, self.axis)
 
 
 class TestRepeatRepeatsNdarray(unittest.TestCase):
+
     def test_func(self):
         a = testing.shaped_arange((2, 3, 4), cupy)
         repeats = cupy.array([2, 3], dtype=cupy.int32)
@@ -61,6 +63,7 @@ def test_array_repeat(self, xp):
     {"repeats": [1, 2, 3, 4], "axis": 0},
 )
 class TestRepeat1D(unittest.TestCase):
+
     @testing.numpy_cupy_array_equal()
     def test_array_repeat(self, xp):
         x = testing.shaped_arange((4,), xp)
@@ -89,6 +92,7 @@ def test_array_repeat(self, xp):
     {"repeats": 2, "axis": 3},
 )
 class TestRepeatFailure(unittest.TestCase):
+
     def test_repeat_failure(self):
         for xp in (numpy, cupy):
             x = testing.shaped_arange((2, 3, 4), xp)
@@ -105,6 +109,7 @@ def test_repeat_failure(self):
     {"reps": (2, 3, 4, 5)},
 )
 class TestTile(unittest.TestCase):
+
     @testing.numpy_cupy_array_equal()
     def test_array_tile(self, xp):
         x = testing.shaped_arange((2, 3, 4), xp)
@@ -116,6 +121,7 @@ def test_array_tile(self, xp):
     {"reps": (-1, -2)},
 )
 class TestTileFailure(unittest.TestCase):
+
     def test_tile_failure(self):
         for xp in (numpy, cupy):
             x = testing.shaped_arange((2, 3, 4), xp)

dpnp/tests/third_party/cupy/math_tests/test_arithmetic.py

@@ -266,7 +266,7 @@ def test_imag_complex(self, xp, dtype):
 
 class ArithmeticBinaryBase:
 
-    @testing.numpy_cupy_allclose(atol=1e-4, type_check=has_support_aspect64())
+    @testing.numpy_cupy_allclose(rtol=1e-4, type_check=has_support_aspect64())
     def check_binary(self, xp):
         arg1 = self.arg1
         arg2 = self.arg2