Fix remarks, add _create_from_usm_ndarray func and move tests to test_sycl_queue

Author: vlad-perevezentsev

dpnp/dpnp_array.py

@@ -646,6 +646,16 @@ def flatten(self, order='C'):
 
         return new_arr
 
+    @staticmethod
+    def _create_from_usm_ndarray(usm_ary : dpt.usm_ndarray):
+        if not isinstance(usm_ary, dpt.usm_ndarray):
+            raise TypeError(
+                f"Expected dpctl.tensor.usm_ndarray, got {type(usm_ary)}"
+                )
+        res = dpnp_array.__new__(dpnp_array)
+        res._array_obj = usm_ary
+        return res
+
  # 'getfield',
  # 'imag',
 

dpnp/dpnp_iface.py

@@ -237,13 +237,13 @@ def from_dlpack(obj):
 
     Returns
     -------
-    array : dpnp_array
+    array : Returns a new dpnp array containing the data from another array
+        (obj) with the ``__dlpack__`` method on the same device as object.
 
     """
 
     usm_ary = dpt.from_dlpack(obj)
-    dpnp_ary = dpnp_array.__new__(dpnp_array)
-    dpnp_ary._array_obj = usm_ary
+    dpnp_ary = dpnp_array._create_from_usm_ndarray(usm_ary)
     return dpnp_ary
 
 

tests/helper.py

@@ -32,7 +32,7 @@ def get_all_dtypes(no_bool=False,
         dtypes.append(dpnp.complex64)
         if dev.has_aspect_fp64:
             dtypes.append(dpnp.complex128)
-    
+
     # add None value to validate a default dtype
     if not no_none:
         dtypes.append(None)

tests/test_dparray.py

@@ -23,39 +23,6 @@ def test_astype(arr, arr_dtype, res_dtype):
     assert_array_equal(expected, result)
 
 
-@pytest.mark.parametrize("arr_dtype", get_all_dtypes())
-@pytest.mark.parametrize("shape", [tuple(), (2,), (3, 0, 1), (2, 2, 2)])
-def test_from_dlpack(arr_dtype,shape):
-    X = dpnp.empty(shape=shape,dtype=arr_dtype)
-    Y = dpnp.from_dlpack(X)
-    assert_array_equal(X, Y)
-    assert X.__dlpack_device__() == Y.__dlpack_device__()
-    assert X.shape == Y.shape
-    assert X.dtype == Y.dtype or (
-        str(X.dtype) == "bool" and str(Y.dtype) == "uint8"
-    )
-    assert X.sycl_device == Y.sycl_device
-    assert X.usm_type == Y.usm_type
-    if Y.ndim:
-        V = Y[::-1]
-        W = dpnp.from_dlpack(V)
-        assert V.strides == W.strides
-
-@pytest.mark.parametrize("arr_dtype", get_all_dtypes())
-def test_from_dlpack_with_dpt(arr_dtype):
-    X = dpt.empty((64,),dtype=arr_dtype)
-    Y = dpnp.from_dlpack(X)
-    assert_array_equal(X, Y)
-    assert isinstance(Y, dpnp.dpnp_array.dpnp_array)
-    assert X.__dlpack_device__() == Y.__dlpack_device__()
-    assert X.shape == Y.shape
-    assert X.dtype == Y.dtype or (
-        str(X.dtype) == "bool" and str(Y.dtype) == "uint8"
-    )
-    assert X.sycl_device == Y.sycl_device
-    assert X.usm_type == Y.usm_type
-
-
 @pytest.mark.parametrize("arr_dtype", get_all_dtypes())
 @pytest.mark.parametrize("arr",
                          [[-2, -1, 0, 1, 2], [[-2, -1], [1, 2]], []],

tests/test_sycl_queue.py

@@ -1,9 +1,14 @@
 import pytest
+from .helper import get_all_dtypes
 
 import dpnp
 import dpctl
 import numpy
 
+from numpy.testing import (
+    assert_array_equal
+)
+
 
 list_of_backend_str = [
     "host",
@@ -155,7 +160,7 @@ def test_array_creation_like(func, kwargs, device_x, device_y):
 
     dpnp_kwargs = dict(kwargs)
     dpnp_kwargs['device'] = device_y
-    
+
     y = getattr(dpnp, func)(x, **dpnp_kwargs)
     numpy.testing.assert_array_equal(y_orig, y)
     assert_sycl_queue_equal(y.sycl_queue, x.to_device(device_y).sycl_queue)
@@ -637,7 +642,7 @@ def test_eig(device):
     dpnp_val_queue = dpnp_val.get_array().sycl_queue
     dpnp_vec_queue = dpnp_vec.get_array().sycl_queue
 
-    # compare queue and device    
+    # compare queue and device
     assert_sycl_queue_equal(dpnp_val_queue, expected_queue)
     assert_sycl_queue_equal(dpnp_vec_queue, expected_queue)
 
@@ -806,3 +811,37 @@ def test_array_copy(device, func, device_param, queue_param):
     result = dpnp.array(dpnp_data, **kwargs)
 
     assert_sycl_queue_equal(result.sycl_queue, dpnp_data.sycl_queue)
+
+
+@pytest.mark.parametrize("device",
+                         valid_devices,
+                         ids=[device.filter_string for device in valid_devices])
+#TODO need to delete no_bool=True when use dlpack > 0.7 version
+@pytest.mark.parametrize("arr_dtype", get_all_dtypes(no_float16=True, no_bool=True))
+@pytest.mark.parametrize("shape", [tuple(), (2,), (3, 0, 1), (2, 2, 2)])
+def test_from_dlpack(arr_dtype, shape, device):
+    X = dpnp.empty(shape=shape, dtype=arr_dtype, device=device)
+    Y = dpnp.from_dlpack(X)
+    assert_array_equal(X, Y)
+    assert X.__dlpack_device__() == Y.__dlpack_device__()
+    assert X.sycl_device == Y.sycl_device
+    assert X.usm_type == Y.usm_type
+    if Y.ndim:
+        V = Y[::-1]
+        W = dpnp.from_dlpack(V)
+        assert V.strides == W.strides
+
+
+@pytest.mark.parametrize("device",
+                         valid_devices,
+                         ids=[device.filter_string for device in valid_devices])
+#TODO need to delete no_bool=True when use dlpack > 0.7 version
+@pytest.mark.parametrize("arr_dtype", get_all_dtypes(no_float16=True, no_bool=True))
+def test_from_dlpack_with_dpt(arr_dtype, device):
+    X = dpctl.tensor.empty((64,), dtype=arr_dtype, device=device)
+    Y = dpnp.from_dlpack(X)
+    assert_array_equal(X, Y)
+    assert isinstance(Y, dpnp.dpnp_array.dpnp_array)
+    assert X.__dlpack_device__() == Y.__dlpack_device__()
+    assert X.sycl_device == Y.sycl_device
+    assert X.usm_type == Y.usm_type