Merge 52b8052 into 6cc2348

Author: antonwolfy

dpnp/dpnp_array.py

@@ -185,7 +185,12 @@ def __and__(self, other):
         """Return ``self&value``."""
         return dpnp.bitwise_and(self, other)
 
-    # '__array__',
+    def __array__(self, dtype=None, /, *, copy=None):
+        raise TypeError(
+            "Implicit conversion to a NumPy array is not allowed. "
+            "Please use `.asnumpy()` to construct a NumPy array explicitly."
+        )
+
     # '__array_finalize__',
     # '__array_function__',
     # '__array_interface__',

dpnp/dpnp_utils/dpnp_utils_pad.py

@@ -74,7 +74,12 @@ def _as_pairs(x, ndim, as_index=False):
             x = round(x)
         return ((x, x),) * ndim
 
-    x = numpy.array(x)
+    # explicitly cast input "x" to NumPy array
+    if dpnp.is_supported_array_type(x):
+        x = dpnp.asnumpy(x)
+    else:
+        x = numpy.array(x)
+
     if as_index:
         x = numpy.asarray(numpy.round(x), dtype=numpy.intp)
 

dpnp/tests/__init__.py

@@ -3,5 +3,6 @@
 from . import testing
 
 numpy.testing.assert_allclose = testing.assert_allclose
+numpy.testing.assert_almost_equal = testing.assert_almost_equal
 numpy.testing.assert_array_equal = testing.assert_array_equal
 numpy.testing.assert_equal = testing.assert_equal

dpnp/tests/helper.py

@@ -161,6 +161,20 @@ def get_all_dtypes(
     return dtypes
 
 
+def get_array(xp, a):
+    """
+    Cast input array `a` to a type supported by `xp` initerface.
+
+    Implicit conversion of either DPNP or DPCTL array to a NumPy array is not
+    allowed. Input array has to be explicitly casted with `asnumpy` function.
+
+    """
+
+    if xp is numpy and dpnp.is_supported_array_type(a):
+        return dpnp.asnumpy(a)
+    return a
+
+
 def generate_random_numpy_array(
     shape,
     dtype=None,

dpnp/tests/test_arraycreation.py

@@ -17,6 +17,7 @@
 from .helper import (
     assert_dtype_allclose,
     get_all_dtypes,
+    get_array,
 )
 from .third_party.cupy import testing
 
@@ -768,7 +769,7 @@ def test_space_numpy_dtype(func, start_dtype, stop_dtype):
     ],
 )
 def test_linspace_arrays(start, stop):
-    func = lambda xp: xp.linspace(start, stop, 10)
+    func = lambda xp: xp.linspace(get_array(xp, start), get_array(xp, stop), 10)
     assert func(numpy).shape == func(dpnp).shape
 
 

dpnp/tests/testing/__init__.py

@@ -1,5 +1,6 @@
 from .array import (
     assert_allclose,
+    assert_almost_equal,
     assert_array_equal,
     assert_equal,
 )

dpnp/tests/testing/array.py

@@ -29,6 +29,7 @@
 from dpnp.dpnp_utils import convert_item
 
 assert_allclose_orig = numpy.testing.assert_allclose
+assert_almost_equal_orig = numpy.testing.assert_almost_equal
 assert_array_equal_orig = numpy.testing.assert_array_equal
 assert_equal_orig = numpy.testing.assert_equal
 
@@ -44,6 +45,10 @@ def assert_allclose(result, expected, *args, **kwargs):
     _assert(assert_allclose_orig, result, expected, *args, **kwargs)
 
 
+def assert_almost_equal(result, expected, *args, **kwargs):
+    _assert(assert_almost_equal_orig, result, expected, *args, **kwargs)
+
+
 def assert_array_equal(result, expected, *args, **kwargs):
     _assert(assert_array_equal_orig, result, expected, *args, **kwargs)
 

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

@@ -691,7 +691,6 @@ def test_format(self, xp):
         return format(x, ".2f")
 
 
-@pytest.mark.skip("implicit conversation to numpy does not raise an exception")
 class TestNdarrayImplicitConversion(unittest.TestCase):
 
     def test_array(self):

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

@@ -129,7 +129,7 @@ class TestPermutationSoundness(unittest.TestCase):
 
     def setUp(self):
         a = cupy.random.permutation(self.num)
-        self.a = a
+        self.a = a.asnumpy()
 
     # Test soundness
 

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

@@ -89,15 +89,15 @@ def test_bound_float2(self):
     def test_goodness_of_fit(self):
         mx = 5
         trial = 100
-        vals = [random.randint(mx) for _ in range(trial)]
+        vals = [random.randint(mx).asnumpy() for _ in range(trial)]
         counts = numpy.histogram(vals, bins=numpy.arange(mx + 1))[0]
         expected = numpy.array([float(trial) / mx] * mx)
         assert _hypothesis.chi_square_test(counts, expected)
 
     @_condition.repeat(3, 10)
     def test_goodness_of_fit_2(self):
         mx = 5
-        vals = random.randint(mx, size=(5, 20))
+        vals = random.randint(mx, size=(5, 20)).asnumpy()
         counts = numpy.histogram(vals, bins=numpy.arange(mx + 1))[0]
         expected = numpy.array([float(vals.size) / mx] * mx)
         assert _hypothesis.chi_square_test(counts, expected)
@@ -191,15 +191,15 @@ def test_bound_2(self):
     def test_goodness_of_fit(self):
         mx = 5
         trial = 100
-        vals = [random.randint(0, mx) for _ in range(trial)]
+        vals = [random.randint(0, mx).asnumpy() for _ in range(trial)]
         counts = numpy.histogram(vals, bins=numpy.arange(mx + 1))[0]
         expected = numpy.array([float(trial) / mx] * mx)
         assert _hypothesis.chi_square_test(counts, expected)
 
     @_condition.repeat(3, 10)
     def test_goodness_of_fit_2(self):
         mx = 5
-        vals = random.randint(0, mx, (5, 20))
+        vals = random.randint(0, mx, (5, 20)).asnumpy()
         counts = numpy.histogram(vals, bins=numpy.arange(mx + 1))[0]
         expected = numpy.array([float(vals.size) / mx] * mx)
         assert _hypothesis.chi_square_test(counts, expected)