no-change-third-party

Author: vtavana

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

@@ -94,19 +94,20 @@ class TestElementwiseType(unittest.TestCase):
     @testing.for_int_dtypes(no_bool=True)
     @testing.numpy_cupy_array_equal(accept_error=OverflowError)
     def test_large_int_upper_1(self, xp, dtype):
-        a = xp.array([0], dtype=xp.int8)
+        a = xp.array([0], dtype=numpy.int8)
         b = xp.iinfo(dtype).max
         return a + b
 
     @testing.for_int_dtypes(no_bool=True)
     @testing.numpy_cupy_array_equal(accept_error=OverflowError)
     def test_large_int_upper_2(self, xp, dtype):
-        flag = dtype in [numpy.int16, numpy.int32, numpy.int64, numpy.longlong]
-        flag = numpy.issubdtype(dtype, numpy.unsignedinteger) or flag
-        if flag and numpy.lib.NumpyVersion(numpy.__version__) < "2.0.0":
+        if (
+            numpy.issubdtype(dtype, numpy.unsignedinteger)
+            and numpy.lib.NumpyVersion(numpy.__version__) < "2.0.0"
+        ):
             pytest.skip("numpy promotes dtype differently")
 
-        a = xp.array([1], dtype=xp.int8)
+        a = xp.array([1], dtype=numpy.int8)
         b = xp.iinfo(dtype).max - 1
         return a + b
 
@@ -149,26 +150,14 @@ def test_large_int_upper_4(self, xp, dtype):
     @testing.for_int_dtypes(no_bool=True)
     @testing.numpy_cupy_array_equal(accept_error=OverflowError)
     def test_large_int_lower_1(self, xp, dtype):
-        if (
-            dtype in [numpy.int16, numpy.int32, numpy.int64, numpy.longlong]
-            and numpy.lib.NumpyVersion(numpy.__version__) < "2.0.0"
-        ):
-            pytest.skip("numpy promotes dtype differently")
-
-        a = xp.array([0], dtype=xp.int8)
+        a = xp.array([0], dtype=numpy.int8)
         b = xp.iinfo(dtype).min
         return a + b
 
     @testing.for_int_dtypes(no_bool=True)
     @testing.numpy_cupy_array_equal(accept_error=OverflowError)
     def test_large_int_lower_2(self, xp, dtype):
-        if (
-            dtype in [numpy.int16, numpy.int32, numpy.int64, numpy.longlong]
-            and numpy.lib.NumpyVersion(numpy.__version__) < "2.0.0"
-        ):
-            pytest.skip("numpy promotes dtype differently")
-
-        a = xp.array([-1], dtype=xp.int8)
+        a = xp.array([-1], dtype=numpy.int8)
         b = xp.iinfo(dtype).min + 1
         return a + b
 

dpnp/tests/third_party/cupy/testing/_loops.py

@@ -1082,30 +1082,17 @@ def _get_int_bool_dtypes():
 
 _complex_dtypes = _get_supported_complex_dtypes()
 _regular_float_dtypes = _get_supported_float_dtypes()
-_float_dtypes = _get_float_dtypes()
-_signed_dtypes = _get_signed_dtypes()
-_unsigned_dtypes = _get_unsigned_dtypes()
-_int_dtypes = _get_int_dtypes()
-_int_bool_dtypes = _get_int_bool_dtypes()
+_float_dtypes = _regular_float_dtypes
+_signed_dtypes = ()
+_unsigned_dtypes = tuple(numpy.dtype(i).type for i in "BHILQ")
+_int_dtypes = _signed_dtypes + _unsigned_dtypes
+_int_bool_dtypes = _int_dtypes
 _regular_dtypes = _regular_float_dtypes + _int_bool_dtypes
 _dtypes = _float_dtypes + _int_bool_dtypes
 
 
 def _make_all_dtypes(no_float16, no_bool, no_complex):
-    if no_float16:
-        dtypes = _regular_float_dtypes
-    else:
-        dtypes = _float_dtypes
-
-    if no_bool:
-        dtypes += _int_dtypes
-    else:
-        dtypes += _int_bool_dtypes
-
-    if config.complex_types and not no_complex:
-        dtypes += _complex_dtypes
-
-    return dtypes
+    return (numpy.int64, numpy.int32) + _get_supported_float_dtypes()
 
 
 def for_all_dtypes(