Exposed SyclQueue staticmethod to construct from context & dev.

Used the constructor in processing of sycl_usm_array_interface.
Added test to check that it works.

Author: oleksandr-pavlyk

dpctl/_backend.pxd

@@ -210,6 +210,9 @@ cdef extern from "dppl_sycl_queue_manager.h":
                               DPPLSyclDeviceType DeviceTy,
                               size_t DNum
                           )
+    cdef DPPLSyclQueueRef DPPLQueueMgr_GetQueueFromContextAndDevice(
+        DPPLSyclContextRef CRef,
+        DPPLSyclDeviceRef DRef)
 
 
 cdef extern from "dppl_sycl_usm_interface.h":

dpctl/_memory.pyx

@@ -94,6 +94,7 @@ cdef class _BufferData:
         cdef _BufferData buf
         cdef Py_ssize_t arr_data_ptr
         cdef SyclDevice dev
+        cdef SyclContext ctx
 
         if ary_version != 1:
             _throw_sycl_usm_ary_iface()
@@ -128,8 +129,9 @@ cdef class _BufferData:
             # 
             # cdef SyclQueue new_queue = SyclQueue._create_from_dev_context(dev, <SyclContext> ary_syclobj)
             # buf.queue = new_queue
-            dev = Memory.get_pointer_device(buf.p, <SyclContext> ary_syclobj)
-            buf.queue = get_current_queue()
+            ctx = <SyclContext> ary_syclobj
+            dev = Memory.get_pointer_device(buf.p, ctx)
+            buf.queue = SyclQueue._create_from_context_and_device(ctx, dev)
 
         return buf
 

dpctl/_sycl_core.pxd

@@ -128,6 +128,8 @@ cdef class SyclQueue:
 
     @staticmethod
     cdef  SyclQueue _create (DPPLSyclQueueRef qref)
+    @staticmethod
+    cdef  SyclQueue _create_from_context_and_device (SyclContext ctx, SyclDevice dev)
     cpdef bool equals (self, SyclQueue q)
     cpdef SyclContext get_sycl_context (self)
     cpdef SyclDevice get_sycl_device (self)

dpctl/_sycl_core.pyx

@@ -373,6 +373,21 @@ cdef class SyclQueue:
         ret._queue_ref = qref
         return ret
 
+    @staticmethod
+    cdef SyclQueue _create_from_context_and_device(SyclContext ctx, SyclDevice dev):
+        cdef SyclQueue ret = SyclQueue.__new__(SyclQueue)
+        cdef DPPLSyclContextRef cref = ctx.get_context_ref()
+        cdef DPPLSyclDeviceRef dref = dev.get_device_ref()
+        cdef DPPLSyclQueueRef qref = DPPLQueueMgr_GetQueueFromContextAndDevice(
+            cref, dref)
+
+        if qref is NULL:
+            raise SyclQueueCreationError("Queue creation failed.")
+        ret._queue_ref = qref
+        ret._context = ctx
+        ret._device = dev
+        return ret
+    
     def __dealloc__ (self):
         DPPLQueue_Delete(self._queue_ref)
 

dpctl/tests/test_sycl_usm.py

@@ -24,8 +24,21 @@
 
 import unittest
 import dpctl
-from dpctl._memory import MemoryUSMShared, MemoryUSMHost, MemoryUSMDevice
-
+from dpctl import MemoryUSMShared, MemoryUSMHost, MemoryUSMDevice
+import dpctl._memory
+import numpy as np
+
+class Dummy(MemoryUSMShared):
+    """
+    Class that exposes `__sycl_usm_array_interface__` with 
+    SYCL context for sycl object, instead of Sycl queue.
+    """
+    @property
+    def __sycl_usm_array_interface(self):
+        iface = super().__sycl_usm_array_interface__
+        iface['syclob'] = iface['syclobj'].get_sycl_context()
+        return iface
+               
 
 class TestMemory(unittest.TestCase):
     @unittest.skipUnless(
@@ -187,6 +200,18 @@ def test_create_with_only_size(self):
         self.assertEqual(m.nbytes, 1024)
         self.assertEqual(m.get_usm_type(), self.usm_type)
 
+    @unittest.skipUnless(
+        dpctl.has_sycl_platforms(), "No SYCL Devices except the default host device."
+    )
+    def test_sycl_usm_array_interface(self):
+        m = self.MemoryUSMClass(256)
+        m2 = Dummy(m.nbytes)
+        hb = np.random.randint(0, 256, size=256, dtype="|u1")
+        m2.copy_from_host(hb)
+        # test that USM array interface works with SyclContext as 'syclobj'
+        m.copy_from_device(m2)
+        self.assertTrue(np.array_equal(m.copy_to_host(), hb))
+
 
 class TestMemoryUSMShared(TestMemoryUSMBase, unittest.TestCase):
     """ Tests for MemoryUSMShared """