Merge pull request #884 from IntelPython/tests-on-iris-xe

Tests on iris xe

Author: oleksandr-pavlyk

dpctl/tensor/_copy_utils.py

@@ -59,18 +59,19 @@ def _copy_to_numpy(ary):
 def _copy_from_numpy(np_ary, usm_type="device", sycl_queue=None):
     "Copies numpy array `np_ary` into a new usm_ndarray"
     # This may peform a copy to meet stated requirements
-    Xnp = np.require(np_ary, requirements=["A", "O", "C", "E"])
-    if sycl_queue:
-        ctor_kwargs = {"queue": sycl_queue}
+    Xnp = np.require(np_ary, requirements=["A", "E"])
+    alloc_q = normalize_queue_device(sycl_queue=sycl_queue, device=None)
+    dt = Xnp.dtype
+    if dt.char in "dD" and alloc_q.sycl_device.has_aspect_fp64 is False:
+        Xusm_dtype = (
+            np.dtype("float32") if dt.char == "d" else np.dtype("complex64")
+        )
     else:
-        ctor_kwargs = dict()
-    Xusm = dpt.usm_ndarray(
-        Xnp.shape,
-        dtype=Xnp.dtype,
-        buffer=usm_type,
-        buffer_ctor_kwargs=ctor_kwargs,
+        Xusm_dtype = dt
+    Xusm = dpt.empty(
+        Xnp.shape, dtype=Xusm_dtype, usm_type=usm_type, sycl_queue=sycl_queue
     )
-    Xusm.usm_data.copy_from_host(Xnp.reshape((-1)).view("u1"))
+    _copy_from_numpy_into(Xusm, Xnp)
     return Xusm
 
 

dpctl/tensor/_usmarray.pyx

@@ -937,7 +937,7 @@ cdef class usm_ndarray:
                 except Exception:
                     raise ValueError(
                         f"Input of type {type(val)} could not be "
-                        "converted to numpy.ndarray"
+                        "converted to usm_ndarray"
                     )
 
     def __sub__(first, other):

dpctl/tests/test_usm_ndarray_ctor.py

@@ -588,7 +588,10 @@ def test_pyx_capi_check_constants():
 )
 @pytest.mark.parametrize("usm_type", ["device", "shared", "host"])
 def test_tofrom_numpy(shape, dtype, usm_type):
-    q = dpctl.SyclQueue()
+    try:
+        q = dpctl.SyclQueue()
+    except dpctl.SyclQueueCreationError:
+        pytest.skip("Could nto create default SyclQueue")
     Xnp = np.zeros(shape, dtype=dtype)
     Xusm = dpt.from_numpy(Xnp, usm_type=usm_type, sycl_queue=q)
     Ynp = np.ones(shape, dtype=dtype)

dpctl/tests/test_usm_ndarray_manipulation.py

@@ -965,7 +965,6 @@ def test_stack_2arrays(data):
     Y = dpt.asarray(Ynp, sycl_queue=q)
 
     Znp = np.stack([Xnp, Ynp], axis=axis)
-    print(Znp.shape)
     Z = dpt.stack([X, Y], axis=axis)
 
     assert_array_equal(Znp, dpt.asnumpy(Z))

dpctl/tests/test_usm_ndarray_operators.py

@@ -49,7 +49,7 @@ def multiply(a, b):
 
 @pytest.mark.parametrize("namespace", [None, Dummy()])
 def test_fp_ops(namespace):
-    X = dpt.usm_ndarray(1, "d")
+    X = dpt.ones(1)
     X._set_namespace(namespace)
     assert X.__array_namespace__() is namespace
     X[0] = -2.5