More tests to restore coverage of _usmarray.pyx to previous levels

Author: oleksandr-pavlyk

dpctl/tensor/_usmarray.pyx

@@ -60,7 +60,6 @@ def _dispatch_binary_elementwise(ary, name, other):
         mod = ary.__array_namespace__()
     except AttributeError:
         return NotImplemented
-    mod = ary.__array_namespace__()
     if mod is None and "dpnp" in sys.modules:
         fn = getattr(sys.modules["dpnp"], name)
         if callable(fn):

dpctl/tests/test_usm_ndarray_ctor.py

@@ -94,11 +94,12 @@ def test_dtypes_invalid(dtype):
         dpt.usm_ndarray((1,), dtype=dtype)
 
 
-def test_properties():
+@pytest.mark.parametrize("dt", ["d", "c16"])
+def test_properties(dt):
     """
     Test that properties execute
     """
-    X = dpt.usm_ndarray((3, 4, 5), dtype="c16")
+    X = dpt.usm_ndarray((3, 4, 5), dtype=dt)
     assert isinstance(X.sycl_queue, dpctl.SyclQueue)
     assert isinstance(X.sycl_device, dpctl.SyclDevice)
     assert isinstance(X.sycl_context, dpctl.SyclContext)
@@ -113,6 +114,7 @@ def test_properties():
     assert isinstance(X.size, numbers.Integral)
     assert isinstance(X.nbytes, numbers.Integral)
     assert isinstance(X.ndim, numbers.Integral)
+    assert isinstance(X._pointer, numbers.Integral)
 
 
 @pytest.mark.parametrize("func", [bool, float, int, complex])
@@ -145,6 +147,14 @@ def test_copy_scalar_invalid_shape(func, shape):
         func(X)
 
 
+def test_index_noninteger():
+    import operator
+
+    X = dpt.usm_ndarray(1, "d")
+    with pytest.raises(IndexError):
+        operator.index(X)
+
+
 @pytest.mark.parametrize(
     "ind",
     [
@@ -708,6 +718,13 @@ def relaxed_strides_equal(st1, st2, sh):
     X.shape = sh_f
     assert relaxed_strides_equal(X.strides, cc_strides(sh_f), sh_f)
 
+    X = dpt.usm_ndarray(sh_s, dtype="d")
+    with pytest.raises(TypeError):
+        X.shape = "abcbe"
+    X = dpt.usm_ndarray((4, 4), dtype="d")[::2, ::2]
+    with pytest.raises(AttributeError):
+        X.shape = (4,)
+
 
 def test_len():
     X = dpt.usm_ndarray(1, "i4")
@@ -749,3 +766,12 @@ def test_astype():
     assert np.allclose(dpt.to_numpy(Y), np.full((5, 5), 7, dtype="f2"))
     Y = dpt.astype(X, "i4", order="K", copy=False)
     assert Y.usm_data is X.usm_data
+
+
+def test_ctor_invalid():
+    m = dpm.MemoryUSMShared(12)
+    with pytest.raises(ValueError):
+        dpt.usm_ndarray((4,), dtype="i4", buffer=m)
+    m = dpm.MemoryUSMShared(64)
+    with pytest.raises(ValueError):
+        dpt.usm_ndarray((4,), dtype="u1", buffer=m, strides={"not": "valid"})

dpctl/tests/test_usm_ndarray_operators.py

@@ -21,14 +21,33 @@
 
 
 class Dummy:
-    def __getattr__(self, name):
-        def first_arg(*args, **kwargs):
-            return args[0]
+    @staticmethod
+    def __abs__(a):
+        return a
 
-        return first_arg
+    @staticmethod
+    def __add__(a, b):
+        if isinstance(a, dpt.usm_ndarray):
+            return a
+        else:
+            return b
 
+    @staticmethod
+    def __sub__(a, b):
+        if isinstance(a, dpt.usm_ndarray):
+            return a
+        else:
+            return b
 
-@pytest.mark.parametrize("namespace", [None, Dummy])
+    @staticmethod
+    def __mul__(a, b):
+        if isinstance(a, dpt.usm_ndarray):
+            return a
+        else:
+            return b
+
+
+@pytest.mark.parametrize("namespace", [None, Dummy()])
 def test_fp_ops(namespace):
     X = dpt.usm_ndarray(1, "d")
     X._set_namespace(namespace)