Enabling sycl_queue for USMNdArray in dpnp overloads

numba_dpex/core/types/dpctl_types.py

@@ -19,9 +19,14 @@ class DpctlSyclQueue(types.Type):
     Numba.
     """
 
-    def __init__(self):
+    def __init__(self, sycl_queue):
+        self._sycl_queue = sycl_queue
         super(DpctlSyclQueue, self).__init__(name="DpctlSyclQueue")
 
+    @property
+    def sycl_queue(self):
+        return self._sycl_queue
+
     @property
     def box_type(self):
         return SyclQueue

numba_dpex/core/types/usm_ndarray_type.py

@@ -7,8 +7,8 @@
 
 import dpctl
 import dpctl.tensor
+from numba import types
 from numba.core.typeconv import Conversion
-from numba.core.typeinfer import CallConstraint
 from numba.core.types.npytypes import Array
 from numba.np.numpy_support import from_dtype
 
@@ -24,42 +24,44 @@ def __init__(
         layout="C",
         dtype=None,
         usm_type="device",
-        device="unknown",
+        device=None,
         queue=None,
         readonly=False,
         name=None,
         aligned=True,
         addrspace=address_space.GLOBAL,
     ):
-        if not isinstance(device, str):
-            raise TypeError(
-                "The device keyword arg should be a str object specifying "
-                "a SYCL filter selector"
-            )
-
-        if not isinstance(queue, dpctl.SyclQueue) and queue is not None:
+        if queue and not isinstance(queue, types.misc.Omitted) and device:
             raise TypeError(
-                "The queue keyword arg should be a dpctl.SyclQueue object or None"
+                "numba_dpex.core.types.usm_ndarray_type.USMNdArray.__init__(): "
+                "`device` and `sycl_queue` are exclusive keywords, i.e. use one or other."
             )
 
         self.usm_type = usm_type
         self.addrspace = addrspace
 
-        if device == "unknown":
-            device = None
-
-        if queue is not None and device is not None:
-            raise TypeError(
-                "'queue' and 'device' keywords can not be both specified"
-            )
-
-        if queue is not None:
+        if queue and not isinstance(queue, types.misc.Omitted):
+            if not isinstance(queue, dpctl.SyclQueue):
+                raise TypeError(
+                    "numba_dpex.core.types.usm_ndarray_type.USMNdArray.__init__(): "
+                    "The queue keyword arg should be a dpctl.SyclQueue object or None."
+                )
             self.queue = queue
         else:
             if device is None:
-                device = dpctl.SyclDevice()
-
-            self.queue = dpctl.get_device_cached_queue(device)
+                sycl_device = dpctl.SyclDevice()
+            else:
+                if not isinstance(device, str):
+                    raise TypeError(
+                        "numba_dpex.core.types.usm_ndarray_type.USMNdArray.__init__(): "
+                        "The device keyword arg should be a str object specifying "
+                        "a SYCL filter selector."
+                    )
+                sycl_device = dpctl.SyclDevice(device)
+
+            self.queue = dpctl._sycl_queue_manager.get_device_cached_queue(
+                sycl_device
+            )
 
         self.device = self.queue.sycl_device.filter_string
 

numba_dpex/core/typing/typeof.py

@@ -103,4 +103,4 @@ def typeof_dpctl_sycl_queue(val, c):
 
     Returns: A numba_dpex.core.types.dpctl_types.DpctlSyclQueue instance.
     """
-    return DpctlSyclQueue()
+    return DpctlSyclQueue(val)