Merge pull request #619 from IntelPython/improve_copy_utils_coverage

Author: oleksandr-pavlyk

dpctl/tensor/_copy_utils.py

@@ -194,9 +194,6 @@ def copy_same_shape(dst, src):
     sh_i, dst_st, dst_disp, src_st, src_disp = contract_iter2(
         dst.shape, dst.strides, src.strides
     )
-    # sh_i, dst_st, dst_disp, src_st, src_disp = (
-    #    dst.shape, dst.strides, 0, src.strides, 0
-    # )
     src_iface = src.__sycl_usm_array_interface__
     dst_iface = dst.__sycl_usm_array_interface__
     src_iface["shape"] = tuple()
@@ -250,6 +247,7 @@ def copy_from_usm_ndarray_to_usm_ndarray(dst, src):
         )
     else:
         src_same_shape = src
+        src_same_shape.shape = common_shape
 
     copy_same_shape(dst, src_same_shape)
 

dpctl/tensor/_reshape.py

@@ -66,7 +66,10 @@ def reshaped_strides(old_sh, old_sts, new_sh, order="C"):
         ]
     ]
     valid = all(
-        [check_st == old_st for check_st, old_st in zip(check_sts, old_sts)]
+        [
+            check_st == old_st or old_dim == 1
+            for check_st, old_st, old_dim in zip(check_sts, old_sts, old_sh)
+        ]
     )
     return new_sts if valid else None
 

dpctl/tensor/_usmarray.pyx

@@ -471,7 +471,6 @@ cdef class usm_ndarray:
                 PyMem_Free(self.shape_)
             if (self.strides_):
                 PyMem_Free(self.strides_)
-            print(contig_flag)
             self.flags_ = contig_flag
             self.nd_ = new_nd
             self.shape_ = shape_ptr

dpctl/tests/test_usm_ndarray_ctor.py

@@ -666,6 +666,25 @@ def test_setitem_scalar(dtype, usm_type):
     )
 
 
+def test_setitem_errors():
+    X = dpt.usm_ndarray((4,), dtype="u1")
+    Y = dpt.usm_ndarray((4, 2), dtype="u1")
+    with pytest.raises(ValueError):
+        X[:] = Y
+    with pytest.raises(ValueError):
+        X[:] = Y[:, 0:1]
+    X[:] = Y[None, :, 0]
+
+
+def test_setitem_different_dtypes():
+    X = dpt.from_numpy(np.ones(10, "f4"))
+    Y = dpt.from_numpy(np.zeros(10, "f4"))
+    Z = dpt.usm_ndarray((20,), "d")
+    Z[::2] = X
+    Z[1::2] = Y
+    assert np.allclose(dpt.asnumpy(Z), np.tile(np.array([1, 0], "d"), 10))
+
+
 def test_shape_setter():
     def cc_strides(sh):
         return np.empty(sh, dtype="u1").strides