Fix in usm_ndarray_types.py

Author: khaled

numba_dpex/core/types/usm_ndarray_type.py

@@ -12,6 +12,7 @@
 from numba.core.types.npytypes import Array
 from numba.np.numpy_support import from_dtype
 
+from numba_dpex.core.types.dpctl_types import DpctlSyclQueue
 from numba_dpex.utils import address_space
 
 
@@ -31,15 +32,10 @@ def __init__(
         aligned=True,
         addrspace=address_space.GLOBAL,
     ):
-        if not isinstance(device, str):
+        if queue is not None and device != "unknown":
             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:
-            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
@@ -48,18 +44,28 @@ def __init__(
         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 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