Add changes from the latest version of third party tests

Author: antonwolfy

dpnp/tests/third_party/cupy/core_tests/test_dlpack.py

@@ -142,19 +142,21 @@ def test_conversion_device(self):
         testing.assert_array_equal(orig_array, out_array)
         assert orig_array.get_array()._pointer == out_array.get_array()._pointer
 
-    @pytest.mark.skip("no BufferError exception for bad device")
     def test_conversion_bad_device(self):
         arr = _gen_array("float32")
 
         # invalid device ID
         with pytest.raises(BufferError):
-            arr.__dlpack__(dl_device=(arr.__dlpack_device__()[0], 2**30))
+            arr.__dlpack__(
+                dl_device=(arr.__dlpack_device__()[0], 2**30),
+                max_version=(1, 0),
+            )
 
         # Simple, non-matching device:
         with pytest.raises(BufferError):
-            arr.__dlpack__(dl_device=(9, 0))
+            arr.__dlpack__(dl_device=(9, 0), max_version=(1, 0))
 
-    @pytest.mark.skip("not supported conversion to CPU")
+    @pytest.mark.skip("numpy doesn't support kDLOneAPI device type")
     def test_conversion_device_to_cpu(self):
         # NOTE: This defaults to the old unversioned, which is needed for
         #       NumPy 1.x support.

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

@@ -231,10 +231,7 @@ def test_copyto_where(self, xp, dtype):
         return dst
 
 
-@pytest.mark.skipif(
-    numpy.__version__ < "2",
-    reason="XXX: NP2.0: copyto is in flux in numpy 2.0.0rc2",
-)
+@testing.with_requires("numpy>=2.1")
 @pytest.mark.parametrize(
     "casting", ["no", "equiv", "safe", "same_kind", "unsafe"]
 )

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

@@ -122,7 +122,7 @@ def test_clip_max_none(self, xp, dtype):
         a = testing.shaped_arange((2, 3, 4), xp, dtype)
         return a.clip(3, None)
 
-    @testing.with_requires("numpy>=2.0")
+    @testing.with_requires("numpy>=2.1")
     @testing.for_all_dtypes(no_bool=True, no_complex=True)
     @testing.numpy_cupy_array_equal()
     def test_clip_min_max_none(self, xp, dtype):

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

@@ -51,18 +51,22 @@ def test_rint_negative(self):
         self.check_unary_negative("rint")
         self.check_unary_negative_complex("rint")
 
+    @testing.with_requires("numpy>=2.1")
     def test_floor(self):
         self.check_unary("floor")
         self.check_unary_complex_unsupported("floor")
 
+    @testing.with_requires("numpy>=2.1")
     def test_ceil(self):
         self.check_unary("ceil")
         self.check_unary_complex_unsupported("ceil")
 
+    @testing.with_requires("numpy>=2.1")
     def test_trunc(self):
         self.check_unary("trunc")
         self.check_unary_complex_unsupported("trunc")
 
+    @testing.with_requires("numpy>=2.1")
     def test_fix(self):
         self.check_unary("fix")
         self.check_unary_complex_unsupported("fix")

dpnp/tests/third_party/cupy/random_tests/test_generator.py

@@ -980,11 +980,6 @@ def test_randint_float1(self):
     def test_randint_float2(self):
         self.generate(6.7, size=(2, 3))
 
-    @pytest.mark.xfail(
-        numpy.__version__ < "2",
-        reason="XXX: np 2.0: comparisons with OOB "
-        "ints are broken in numpy < 2",
-    )
     def test_randint_int64_1(self):
         self.generate(2**34, 2**40, 3, dtype="q")
 

dpnp/tests/third_party/cupy/statistics_tests/test_meanvar.py

@@ -235,7 +235,7 @@ def test_external_mean_axis(self, xp, dtype):
     @testing.for_all_dtypes(no_complex=True)
     @testing.numpy_cupy_allclose(rtol=1e-06)
     def test_mean_all_float32_dtype(self, xp, dtype):
-        a = xp.full((2, 3, 4), 123456789, dtype=dtype)
+        a = testing.shaped_arange((2, 3, 4), xp, dtype=dtype)
         return xp.mean(a, dtype=numpy.float32)
 
     @testing.for_all_dtypes(no_complex=True)

dpnp/tests/third_party/cupy/statistics_tests/test_order.py

@@ -78,7 +78,7 @@ def test_quantile_unexpected_method(self, dtype):
 
 
 @pytest.mark.skip("dpnp.quantile() is not implemented yet")
-@testing.with_requires("numpy>=1.22.0rc1")
+@testing.with_requires("numpy>=2.0")
 @for_all_methods()
 class TestQuantileMethods: