address new comments

Author: Vahid Tavanashad

dpnp/tests/test_histogram.py

@@ -46,9 +46,11 @@ class TestDigitize:
     )
     def test_digitize(self, x, bins, dtype, right):
         x = get_abs_array(x, dtype)
-        if numpy.issubdtype(dtype, numpy.unsignedinteger) and bins[0] == -4:
-            # bins should be monotonically increasing, cannot use get_abs_array
-            bins = numpy.array([0, 2, 4, 6, 8])
+        if numpy.issubdtype(dtype, numpy.unsignedinteger):
+            min_bin = bins.min()
+            if min_bin < 0:
+                # bins should be monotonically increasing, cannot use get_abs_array
+                bins -= min_bin
         bins = bins.astype(dtype)
         x_dp = dpnp.array(x)
         bins_dp = dpnp.array(bins)

dpnp/tests/test_indexing.py

@@ -137,10 +137,7 @@ def test_extract_diff_dtypes(self, a_dt, cond_dt):
 
     @pytest.mark.parametrize("a_dt", get_all_dtypes(no_none=True))
     def test_extract_list_cond(self, a_dt):
-        x = [-2, -1, 0, 1, 2, 3]
-        if numpy.issubdtype(a_dt, numpy.unsignedinteger):
-            x = numpy.abs(x)
-        a = numpy.array(x, dtype=a_dt)
+        a = get_abs_array([-2, -1, 0, 1, 2, 3], a_dt)
         cond = [1, -1, 2, 0, -2, 3]
         ia = dpnp.array(a)
 
@@ -393,10 +390,7 @@ def test_0d(self, val):
 
     @pytest.mark.parametrize("dtype", get_all_dtypes(no_none=True))
     def test_1d(self, dtype):
-        x = [1, 0, 2, -1, 0, 0, 8]
-        if numpy.issubdtype(dtype, numpy.unsignedinteger):
-            x = numpy.abs(x)
-        a = numpy.array(x, dtype=dtype)
+        a = get_abs_array([1, 0, 2, -1, 0, 0, 8], dtype)
         ia = dpnp.array(a)
 
         np_res = numpy.nonzero(a)

dpnp/tests/test_mathematical.py

@@ -32,6 +32,7 @@
     get_integer_dtypes,
     has_support_aspect16,
     has_support_aspect64,
+    numpy_version,
 )
 from .test_umath import (
     _get_numpy_arrays_1in_1out,
@@ -1408,7 +1409,7 @@ class TestLdexp:
     @pytest.mark.parametrize("exp_dt", get_integer_dtypes())
     def test_basic(self, mant_dt, exp_dt):
         if (
-            numpy.lib.NumpyVersion(numpy.__version__) < "2.0.0"
+            numpy_version() < "2.0.0"
             and exp_dt == numpy.int64
             and numpy.dtype("l") != numpy.int64
         ):
@@ -1421,9 +1422,7 @@ def test_basic(self, mant_dt, exp_dt):
         if dpnp.issubdtype(exp_dt, dpnp.uint64):
             assert_raises(ValueError, dpnp.ldexp, imant, iexp)
             assert_raises(TypeError, numpy.ldexp, mant, exp)
-        elif numpy.lib.NumpyVersion(
-            numpy.__version__
-        ) < "2.0.0" and dpnp.issubdtype(exp_dt, dpnp.uint32):
+        elif numpy_version() < "2.0.0" and dpnp.issubdtype(exp_dt, dpnp.uint32):
             # For this special case, NumPy < "2.0.0" raises an error on Windows
             result = dpnp.ldexp(imant, iexp)
             expected = numpy.ldexp(mant, exp.astype(numpy.int32))
@@ -2130,7 +2129,7 @@ def test_zeros(self, dt):
 
         result = dpnp.spacing(ia)
         expected = numpy.spacing(a)
-        if numpy.lib.NumpyVersion(numpy.__version__) < "2.0.0":
+        if numpy_version() < "2.0.0":
             assert_equal(result, expected)
         else:
             # numpy.spacing(-0.0) == numpy.spacing(0.0), i.e. NumPy returns
@@ -2193,7 +2192,7 @@ def test_complex(self, xp):
 
 class TestTrapezoid:
     def get_numpy_func(self):
-        if numpy.lib.NumpyVersion(numpy.__version__) < "2.0.0":
+        if numpy_version() < "2.0.0":
             # `trapz` is deprecated in NumPy 2.0
             return numpy.trapz
         return numpy.trapezoid
@@ -2753,10 +2752,7 @@ def test_out(self, func_params, dtype):
         # NumPy < 2.0.0 while output has the dtype of input for NumPy >= 2.0.0
         # (dpnp follows the latter behavior except for boolean dtype where it
         # returns int8)
-        if (
-            numpy.lib.NumpyVersion(numpy.__version__) < "2.0.0"
-            or dtype == numpy.bool
-        ):
+        if numpy_version() < "2.0.0" or dtype == numpy.bool:
             check_type = False
         else:
             check_type = True