Various fixes.

Author: Diptorup Deb

numba_dpex/core/datamodel/models.py

@@ -4,12 +4,12 @@
 
 from numba.core import datamodel, types
 from numba.core.datamodel.models import ArrayModel as DpnpNdArrayModel
-from numba.core.datamodel.models import OpaqueModel, PrimitiveModel, StructModel
+from numba.core.datamodel.models import PrimitiveModel, StructModel
 from numba.core.extending import register_model
 
 from numba_dpex.utils import address_space
 
-from ..types import Array, DpnpNdArray, SyclQueueType, USMNdArray
+from ..types import Array, DpctlSyclQueue, DpnpNdArray, USMNdArray
 
 
 class GenericPointerModel(PrimitiveModel):
@@ -57,13 +57,10 @@ def __init__(self, dmm, fe_type):
 class SyclQueueModel(StructModel):
     def __init__(self, dmm, fe_type):
         members = [
-            ("parent", types.CPointer),
-            ("queue_ref", types.PyObject),
-            ("context", types.PyObject),
-            ("device", types.PyObject),
+            ("parent", types.CPointer(types.voidptr)),
+            ("queue_ref", types.CPointer(types.voidptr)),
         ]
-        # super(StructModel, self).__init__(dmm, fe_type, members)
-        StructModel.__init__(self, dmm, fe_type, members)
+        super(SyclQueueModel, self).__init__(dmm, fe_type, members)
 
 
 def _init_data_model_manager():
@@ -95,10 +92,6 @@ def _init_data_model_manager():
 register_model(DpnpNdArray)(DpnpNdArrayModel)
 dpex_data_model_manager.register(DpnpNdArray, DpnpNdArrayModel)
 
-# Register the DpctlSyclQueue type with Numba's OpaqueModel
-# register_model(DpctlSyclQueue)(OpaqueModel)
-# dpex_data_model_manager.register(DpctlSyclQueue, OpaqueModel)
-
-# Register the DpctlSyclQueue type with Numba's OpaqueModel
-register_model(SyclQueueType)(SyclQueueModel)
-dpex_data_model_manager.register(SyclQueueType, SyclQueueModel)
+# Register the DpctlSyclQueue type
+register_model(DpctlSyclQueue)(SyclQueueModel)
+dpex_data_model_manager.register(DpctlSyclQueue, SyclQueueModel)

numba_dpex/core/runtime/_dpexrt_python.c

@@ -67,7 +67,6 @@ DPEXRT_sycl_usm_ndarray_to_python_acqref(arystruct_t *arystruct,
                                          int ndim,
                                          int writeable,
                                          PyArray_Descr *descr);
-static struct PySyclQueueObject *to_py_syclqobject(PyObject *obj);
 static int DPEXRT_sycl_queue_from_python(PyObject *obj,
                                          queuestruct_t *queue_struct);
 
@@ -649,21 +648,6 @@ static struct PyUSMArrayObject *PyUSMNdArray_ARRAYOBJ(PyObject *obj)
     return pyusmarrayobj;
 }
 
-static struct PySyclQueueObject *to_py_syclqobject(PyObject *obj)
-{
-    if (!obj)
-        return NULL;
-    if (!PyObject_TypeCheck(obj, &PySyclQueueType))
-        return NULL;
-
-    struct PySyclQueueObject *pysyclqobj = (struct PySyclQueueObject *)(obj);
-    // struct Py_SyclQueueObject py_syclqobj = pysyclqobj->__pyx_base;
-
-    // return &py_syclqobj;
-
-    return pysyclqobj;
-}
-
 /*!
  * @brief Returns the product of the elements in an array of a given
  * length.
@@ -809,38 +793,33 @@ static int DPEXRT_sycl_queue_from_python(PyObject *obj,
 {
 
     struct PySyclQueueObject *queue_obj = NULL;
-    // DPCTLSyclQueueRef queue_ref = NULL;
+    DPCTLSyclQueueRef queue_ref = NULL;
     PyGILState_STATE gstate;
 
     // Increment the ref count on obj to prevent CPython from garbage
     // collecting the array.
     Py_IncRef(obj);
 
+    // We are unconditionally casting obj to a struct PySyclQueueObject*. If
+    // the obj is not a struct PySyclQueueObject* then the SyclQueue_GetQueueRef
+    // will error out.
+    queue_obj = (struct PySyclQueueObject *)obj;
+
     DPEXRT_DEBUG(
         nrt_debug_print("DPEXRT-DEBUG: In DPEXRT_sycl_queue_from_python.\n"));
 
-    // Check if the PyObject obj has an _array_obj attribute that is of
-    // dpctl.tensor.usm_ndarray type.
-    if (!(queue_obj = to_py_syclqobject(obj))) {
+    if (!(queue_ref = SyclQueue_GetQueueRef(queue_obj))) {
         DPEXRT_DEBUG(nrt_debug_print(
-            "DPEXRT-ERROR: to_py_syclqobject() check failed %d\n", __FILE__,
-            __LINE__));
+            "DPEXRT-ERROR: SyclQueue_GetQueueRef returned NULL at "
+            "%s, line %d.\n",
+            __FILE__, __LINE__));
         goto error;
     }
 
-    // if (!(queue_ref = SyclQueue_GetQueueRef(queue_obj))) {
-    //     DPEXRT_DEBUG(nrt_debug_print(
-    //         "DPEXRT-ERROR: SyclQueue_GetQueueRef returned NULL at "
-    //         "%s, line %d.\n",
-    //         __FILE__, __LINE__));
-    //     goto error;
-    // }
-
     queue_struct->parent = obj;
-    // queue_struct->queue_ref = queue_ref;
-    queue_struct->queue_ref = (PyObject *)queue_obj->__pyx_base._queue_ref;
-    queue_struct->cotext = (PyObject *)queue_obj->__pyx_base._context;
-    queue_struct->device = (PyObject *)queue_obj->__pyx_base._device;
+    queue_struct->queue_ref = queue_ref;
+
+    return 0;
 
 error:
     // If the check failed then decrement the refcount and return an error

numba_dpex/core/runtime/_queuestruct.h

@@ -6,15 +6,12 @@
  * for the ArrayTemplate class).
  */
 
-#include "numpy/npy_common.h"
 #include <Python.h>
 
 typedef struct
 {
     PyObject *parent;
-    PyObject *queue_ref;
-    PyObject *cotext;
-    PyObject *device;
+    void *queue_ref;
 } queuestruct_t;
 
 #endif /* NUMBA_DPEX_QUEUESTRUCT_H_ */

numba_dpex/core/types/__init__.py

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 from .array_type import Array
-from .dpctl_types import SyclQueueType
+from .dpctl_types import DpctlSyclQueue
 from .dpnp_ndarray_type import DpnpNdArray
 from .numba_types_short_names import (
     b1,
@@ -32,7 +32,7 @@
 
 __all__ = [
     "Array",
-    "SyclQueueType",
+    "DpctlSyclQueue",
     "DpnpNdArray",
     "USMNdArray",
     "none",

numba_dpex/core/types/dpctl_types.py

@@ -5,20 +5,13 @@
 from dpctl import SyclQueue
 from numba import types
 from numba.core import cgutils
-from numba.extending import (
-    NativeValue,
-    as_numba_type,
-    box,
-    type_callable,
-    typeof_impl,
-    unbox,
-)
+from numba.extending import NativeValue, box, unbox
 
 from numba_dpex.core.exceptions import UnreachableError
 from numba_dpex.core.runtime import context as dpxrtc
 
 
-class SyclQueueType(types.Type):
+class DpctlSyclQueue(types.Type):
     """A Numba type to represent a dpctl.SyclQueue PyObject.
 
     For now, a dpctl.SyclQueue is represented as a Numba opaque type that allows
@@ -27,56 +20,10 @@ class SyclQueueType(types.Type):
     """
 
     def __init__(self):
-        super(SyclQueueType, self).__init__(name="SyclQueue")
+        super(DpctlSyclQueue, self).__init__(name="SyclQueue")
 
 
-# sycl_queue_type = SyclQueueType()
-
-
-# @typeof_impl.register(SyclQueue)
-# def typeof_index(val, c):
-#     return sycl_queue_type
-
-
-# as_numba_type.register(SyclQueue, sycl_queue_type)
-
-
-@type_callable(SyclQueue)
-def type_sycl_queue(context):
-    def typer(args):
-        if isinstance(args, types.Tuple):
-            if len(args) > 0:
-                if (
-                    isinstance(args[0], types.PyObject)
-                    and isinstance(args[1], types.StringLiteral)
-                    and isinstance(args[2], types.PyObject)
-                ):
-                    return SyclQueueType()
-            else:
-                return SyclQueueType()
-        elif isinstance(args, types.NoneType):
-            return SyclQueueType()
-        else:
-            raise ValueError("Couldn't do type inference for 'SycleQueue'.")
-
-    return typer
-
-
-# @lower_builtin(SyclQueue, types.PyObject, types.StringLiteral, types.PyObject)
-# def impl_interval(context, builder, sig, args):
-#     typ = sig.return_type
-#     if len(args) > 0:
-#         ctx, dev, property = args
-#         sycl_queue = cgutils.create_struct_proxy(typ)(context, builder)
-#         sycl_queue.ctx = ctx
-#         sycl_queue.dev = dev
-#         sycl_queue.property = property
-#     else:
-#         sycl_queue = cgutils.create_struct_proxy(typ)(context, builder)
-#     return sycl_queue._getvalue()
-
-
-@unbox(SyclQueueType)
+@unbox(DpctlSyclQueue)
 def unbox_sycl_queue(typ, obj, c):
     """
     Convert a SyclQueue object to a native structure.
@@ -89,7 +36,6 @@ def unbox_sycl_queue(typ, obj, c):
         errcode = dpexrtCtx.queuestruct_from_python(c.pyapi, obj, ptr)
     else:
         raise UnreachableError
-
     is_error = cgutils.is_not_null(c.builder, errcode)
     # Handle error
     with c.builder.if_then(is_error, likely=False):

numba_dpex/core/typing/typeof.py

@@ -11,7 +11,7 @@
 
 from numba_dpex.utils import address_space
 
-from ..types.dpctl_types import SyclQueueType
+from ..types.dpctl_types import DpctlSyclQueue
 from ..types.dpnp_ndarray_type import DpnpNdArray
 from ..types.usm_ndarray_type import USMNdArray
 
@@ -107,6 +107,4 @@ def typeof_dpctl_sycl_queue(val, c):
 
     Returns: A numba_dpex.core.types.dpctl_types.DpctlSyclQueue instance.
     """
-    # return sycl_queue_type
-    # return _typeof_helper(val, SyclQueueType)
-    return SyclQueueType()
+    return DpctlSyclQueue()