Transitioned two more files from unittest to pytests

It appears that unittest-based tests did not participate
in the coverage collection data.

Author: oleksandr-pavlyk

dpctl/tests/test_sycl_kernel_submit.py

@@ -18,9 +18,9 @@
 """
 
 import ctypes
-import unittest
 
 import numpy as np
+import pytest
 
 import dpctl
 import dpctl.memory as dpctl_mem
@@ -29,49 +29,44 @@
 from ._helper import has_gpu
 
 
-@unittest.skipUnless(has_gpu(), "No OpenCL GPU queues available")
-class Test1DKernelSubmit(unittest.TestCase):
-    def test_create_program_from_source(self):
-        oclSrc = "                                                             \
-        kernel void axpy(global int* a, global int* b, global int* c, int d) { \
-            size_t index = get_global_id(0);                                   \
-            c[index] = d*a[index] + b[index];                                  \
-        }"
-        q = dpctl.SyclQueue("opencl:gpu", property="enable_profiling")
-        prog = dpctl_prog.create_program_from_source(q, oclSrc)
-        axpyKernel = prog.get_sycl_kernel("axpy")
+@pytest.mark.skipif(not has_gpu(), reason="No OpenCL GPU queues available")
+def test_create_program_from_source():
+    oclSrc = "                                                             \
+    kernel void axpy(global int* a, global int* b, global int* c, int d) { \
+        size_t index = get_global_id(0);                                   \
+        c[index] = d*a[index] + b[index];                                  \
+    }"
+    q = dpctl.SyclQueue("opencl:gpu", property="enable_profiling")
+    prog = dpctl_prog.create_program_from_source(q, oclSrc)
+    axpyKernel = prog.get_sycl_kernel("axpy")
 
-        n_elems = 1024 * 512
-        bufBytes = n_elems * np.dtype("i").itemsize
-        abuf = dpctl_mem.MemoryUSMShared(bufBytes, queue=q)
-        bbuf = dpctl_mem.MemoryUSMShared(bufBytes, queue=q)
-        cbuf = dpctl_mem.MemoryUSMShared(bufBytes, queue=q)
-        a = np.ndarray((n_elems,), buffer=abuf, dtype="i")
-        b = np.ndarray((n_elems,), buffer=bbuf, dtype="i")
-        c = np.ndarray((n_elems,), buffer=cbuf, dtype="i")
-        a[:] = np.arange(n_elems)
-        b[:] = np.arange(n_elems, 0, -1)
-        c[:] = 0
-        d = 2
-        args = []
+    n_elems = 1024 * 512
+    bufBytes = n_elems * np.dtype("i").itemsize
+    abuf = dpctl_mem.MemoryUSMShared(bufBytes, queue=q)
+    bbuf = dpctl_mem.MemoryUSMShared(bufBytes, queue=q)
+    cbuf = dpctl_mem.MemoryUSMShared(bufBytes, queue=q)
+    a = np.ndarray((n_elems,), buffer=abuf, dtype="i")
+    b = np.ndarray((n_elems,), buffer=bbuf, dtype="i")
+    c = np.ndarray((n_elems,), buffer=cbuf, dtype="i")
+    a[:] = np.arange(n_elems)
+    b[:] = np.arange(n_elems, 0, -1)
+    c[:] = 0
+    d = 2
+    args = []
 
-        args.append(a.base)
-        args.append(b.base)
-        args.append(c.base)
-        args.append(ctypes.c_int(d))
+    args.append(a.base)
+    args.append(b.base)
+    args.append(c.base)
+    args.append(ctypes.c_int(d))
 
-        r = [
-            n_elems,
-        ]
+    r = [
+        n_elems,
+    ]
 
-        timer = dpctl.SyclTimer()
-        with timer(q):
-            q.submit(axpyKernel, args, r)
-            ref_c = a * d + b
-        host_dt, device_dt = timer.dt
-        self.assertTrue(host_dt > device_dt)
-        self.assertTrue(np.allclose(c, ref_c))
-
-
-if __name__ == "__main__":
-    unittest.main()
+    timer = dpctl.SyclTimer()
+    with timer(q):
+        q.submit(axpyKernel, args, r)
+        ref_c = a * d + b
+    host_dt, device_dt = timer.dt
+    assert host_dt > device_dt
+    assert np.allclose(c, ref_c)

dpctl/tests/test_sycl_queue_memcpy.py

@@ -17,60 +17,51 @@
 """Defines unit test cases for the SyclQueue.memcpy.
 """
 
-import unittest
+import pytest
 
 import dpctl
 import dpctl.memory
 
 from ._helper import has_sycl_platforms
 
 
-class TestQueueMemcpy(unittest.TestCase):
-    def _create_memory(self):
-        nbytes = 1024
-        mobj = dpctl.memory.MemoryUSMShared(nbytes)
-        return mobj
+def _create_memory():
+    nbytes = 1024
+    mobj = dpctl.memory.MemoryUSMShared(nbytes)
+    return mobj
 
-    @unittest.skipUnless(
-        has_sycl_platforms(), "No SYCL devices except the default host device."
-    )
-    def test_memcpy_copy_usm_to_usm(self):
-        mobj1 = self._create_memory()
-        mobj2 = self._create_memory()
-        q = dpctl.get_current_queue()
 
-        mv1 = memoryview(mobj1)
-        mv2 = memoryview(mobj2)
+@pytest.mark.skipif(
+    not has_sycl_platforms(),
+    reason="No SYCL devices except the default host device.",
+)
+def test_memcpy_copy_usm_to_usm():
+    mobj1 = _create_memory()
+    mobj2 = _create_memory()
+    q = dpctl.SyclQueue()
 
-        mv1[:3] = b"123"
+    mv1 = memoryview(mobj1)
+    mv2 = memoryview(mobj2)
 
-        q.memcpy(mobj2, mobj1, 3)
+    mv1[:3] = b"123"
 
-        self.assertEqual(mv2[:3], b"123")
+    q.memcpy(mobj2, mobj1, 3)
 
-    @unittest.skipUnless(
-        has_sycl_platforms(), "No SYCL devices except the default host device."
-    )
-    def test_memcpy_type_error(self):
-        mobj = self._create_memory()
-        q = mobj._queue
+    assert mv2[:3], b"123"
 
-        with self.assertRaises(TypeError) as cm:
-            q.memcpy(None, mobj, 3)
 
-        self.assertEqual(type(cm.exception), TypeError)
-        self.assertEqual(
-            str(cm.exception), "Parameter `dest` should have type _Memory."
-        )
+# @pytest.mark.skipif(
+#    not has_sycl_platforms(),
+#    reason="No SYCL devices except the default host device."
+# )
+def test_memcpy_type_error():
+    mobj = _create_memory()
+    q = mobj._queue
 
-        with self.assertRaises(TypeError) as cm:
-            q.memcpy(mobj, None, 3)
+    with pytest.raises(TypeError) as cm:
+        q.memcpy(None, mobj, 3)
+    assert "`dest`" in str(cm.value)
 
-        self.assertEqual(type(cm.exception), TypeError)
-        self.assertEqual(
-            str(cm.exception), "Parameter `src` should have type _Memory."
-        )
-
-
-if __name__ == "__main__":
-    unittest.main()
+    with pytest.raises(TypeError) as cm:
+        q.memcpy(mobj, None, 3)
+    assert "`src`" in str(cm.value)