Merge commit 'b97efdf' into gold/2021

Author: PokhodenkoSA

.flake8

@@ -24,6 +24,7 @@ per-file-ignores =
     dpctl/program/_program.pyx: E999, E225, E226, E227
     dpctl/tensor/_usmarray.pyx: E999, E225, E226, E227
     dpctl/tensor/numpy_usm_shared.py: F821
+    dpctl/tests/_cython_api.pyx: E999, E225, E227, E402
     examples/cython/sycl_buffer/_buffer_example.pyx: E999, E225, E402
     examples/cython/sycl_direct_linkage/_buffer_example.pyx: E999, E225, E402
     examples/cython/usm_memory/blackscholes.pyx: E999, E225, E226, E402

.github/workflows/generate-coverage.yaml

@@ -87,7 +87,7 @@ jobs:
           source /opt/intel/oneapi/setvars.sh
           python setup.py develop --coverage=True
           python -c "import dpctl; print(dpctl.__version__); dpctl.lsplatform()"
-          pytest -q -ra --disable-warnings --cov dpctl --cov-report term-missing --pyargs dpctl -vv
+          pytest -q -ra --disable-warnings --cov-config pyproject.toml --cov dpctl --cov-report term-missing --pyargs dpctl -vv
 
       - name: Install coverall dependencies
         shell: bash -l {0}

MANIFEST.in

@@ -14,3 +14,4 @@ include dpctl/memory/_memory_api.h
 include dpctl/tensor/_usmarray.h
 include dpctl/tensor/_usmarray_api.h
 include dpctl/tests/input_files/*
+include dpctl/tests/*.pyx

conda-recipe/meta.yaml

@@ -32,6 +32,7 @@ requirements:
 
 test:
     requires:
+        - cython
         - pytest
         - pytest-cov
 

dpctl/_sycl_context.pyx

@@ -63,6 +63,11 @@ cdef void _context_capsule_deleter(object o):
             o, "SyclContextRef"
         )
         DPCTLContext_Delete(CRef)
+    elif pycapsule.PyCapsule_IsValid(o, "used_SyclContextRef"):
+        CRef = <DPCTLSyclContextRef> pycapsule.PyCapsule_GetPointer(
+            o, "used_SyclContextRef"
+        )
+        DPCTLContext_Delete(CRef)
 
 
 cdef void _init_helper(_SyclContext context, DPCTLSyclContextRef CRef):

dpctl/_sycl_device.pyx

@@ -253,17 +253,8 @@ cdef class SyclDevice(_SyclDevice):
         cdef const char *filter_c_str = NULL
         cdef int ret = 0
 
-        if type(arg) is unicode:
-            string = bytes(<unicode>arg, "utf-8")
-            filter_c_str = string
-            DSRef = DPCTLFilterSelector_Create(filter_c_str)
-            ret = self._init_from_selector(DSRef)
-            if ret == -1:
-                raise ValueError(
-                    "Could not create a SyclDevice with the selector string"
-                )
-        elif isinstance(arg, unicode):
-            string = bytes(<unicode>unicode(arg), "utf-8")
+        if type(arg) is str:
+            string = bytes(<str>arg, "utf-8")
             filter_c_str = string
             DSRef = DPCTLFilterSelector_Create(filter_c_str)
             ret = self._init_from_selector(DSRef)

dpctl/_sycl_event.pyx

@@ -71,6 +71,11 @@ cdef void _event_capsule_deleter(object o):
             o, "SyclEventRef"
         )
         DPCTLEvent_Delete(ERef)
+    elif pycapsule.PyCapsule_IsValid(o, "used_SyclEventRef"):
+        ERef = <DPCTLSyclEventRef> pycapsule.PyCapsule_GetPointer(
+            o, "used_SyclEventRef"
+        )
+        DPCTLEvent_Delete(ERef)
 
 
 cdef void _init_helper(_SyclEvent event, DPCTLSyclEventRef ERef):
@@ -83,8 +88,10 @@ cdef class _SyclEvent:
     """
 
     def __dealloc__(self):
-        DPCTLEvent_Wait(self._event_ref)
-        DPCTLEvent_Delete(self._event_ref)
+        if (self._event_ref):
+            DPCTLEvent_Wait(self._event_ref)
+            DPCTLEvent_Delete(self._event_ref)
+        self._event_ref = NULL
         self.args = None
 
 
@@ -318,6 +325,7 @@ cdef class SyclEvent(_SyclEvent):
         DPCTLEventVector_Delete(EVRef)
         return events
 
+    @property
     def profiling_info_submit(self):
         """
         Returns the 64-bit time value in nanoseconds

dpctl/_sycl_queue.pxd

@@ -66,7 +66,7 @@ cdef public api class SyclQueue (_SyclQueue) [
     cdef  SyclQueue _create(DPCTLSyclQueueRef qref)
     @staticmethod
     cdef  SyclQueue _create_from_context_and_device(
-        SyclContext ctx, SyclDevice dev
+        SyclContext ctx, SyclDevice dev, int props=*
     )
     cdef cpp_bool equals(self, SyclQueue q)
     cpdef SyclContext get_sycl_context(self)

dpctl/_sycl_queue.pyx

@@ -160,6 +160,11 @@ cdef void _queue_capsule_deleter(object o):
             o, "SyclQueueRef"
         )
         DPCTLQueue_Delete(QRef)
+    elif pycapsule.PyCapsule_IsValid(o, "used_SyclQueueRef"):
+        QRef = <DPCTLSyclQueueRef> pycapsule.PyCapsule_GetPointer(
+            o, "used_SyclQueueRef"
+        )
+        DPCTLQueue_Delete(QRef)
 
 
 cdef class _SyclQueue:
@@ -284,18 +289,13 @@ cdef class SyclQueue(_SyclQueue):
             status = self._init_queue_default(props)
         elif len_args == 1:
             arg = args[0]
-            if type(arg) is unicode:
-                string = bytes(<unicode>arg, "utf-8")
+            if type(arg) is str:
+                string = bytes(<str>arg, "utf-8")
                 filter_c_str = string
                 status = self._init_queue_from_filter_string(
                     filter_c_str, props)
             elif type(arg) is _SyclQueue:
                 status = self._init_queue_from__SyclQueue(<_SyclQueue>arg)
-            elif isinstance(arg, unicode):
-                string = bytes(<unicode>unicode(arg), "utf-8")
-                filter_c_str = string
-                status = self._init_queue_from_filter_string(
-                    filter_c_str, props)
             elif isinstance(arg, SyclDevice):
                 status = self._init_queue_from_device(<SyclDevice>arg, props)
             elif pycapsule.PyCapsule_IsValid(arg, "SyclQueueRef"):
@@ -537,13 +537,24 @@ cdef class SyclQueue(_SyclQueue):
 
     @staticmethod
     cdef SyclQueue _create_from_context_and_device(
-        SyclContext ctx, SyclDevice dev
+        SyclContext ctx, SyclDevice dev, int props=0
     ):
+        """
+        Static factory method to create :class:`dpctl.SyclQueue` instance
+        from given :class:`dpctl.SyclContext`, :class:`dpctl.SyclDevice`
+        and optional integer `props` encoding the queue properties.
+        """
         cdef _SyclQueue ret = _SyclQueue.__new__(_SyclQueue)
         cdef DPCTLSyclContextRef cref = ctx.get_context_ref()
         cdef DPCTLSyclDeviceRef dref = dev.get_device_ref()
-        cdef DPCTLSyclQueueRef qref = DPCTLQueue_Create(cref, dref, NULL, 0)
+        cdef DPCTLSyclQueueRef qref = NULL
 
+        qref = DPCTLQueue_Create(
+            cref,
+            dref,
+            <error_handler_callback *>&default_async_error_handler,
+            props
+        )
         if qref is NULL:
             raise SyclQueueCreationError("Queue creation failed.")
         ret._queue_ref = qref
@@ -644,8 +655,12 @@ cdef class SyclQueue(_SyclQueue):
         else:
             return False
 
-    def get_sycl_backend(self):
-        """ Returns the Sycl backend associated with the queue.
+    @property
+    def backend(self):
+        """ Returns the backend_type enum value for this queue.
+
+        Returns:
+            backend_type: The backend for the queue.
         """
         cdef _backend_type BE = DPCTLQueue_GetBackend(self._queue_ref)
         if BE == _backend_type._OPENCL:
@@ -685,7 +700,7 @@ cdef class SyclQueue(_SyclQueue):
             The address of the ``DPCTLSyclQueueRef`` object used to create this
             :class:`dpctl.SyclQueue` cast to a ``size_t``.
         """
-        return int(<size_t>self._queue_ref)
+        return <size_t>self._queue_ref
 
     cpdef SyclEvent submit(
         self,
@@ -843,8 +858,8 @@ cdef class SyclQueue(_SyclQueue):
         else:
             raise TypeError("Parameter `mem` should have type _Memory")
 
-        if (count <=0 or count > self.nbytes):
-            count = self.nbytes
+        if (count <=0 or count > mem.nbytes):
+            count = mem.nbytes
 
         ERef = DPCTLQueue_Prefetch(self._queue_ref, ptr, count)
         if (ERef is NULL):
@@ -863,8 +878,8 @@ cdef class SyclQueue(_SyclQueue):
         else:
             raise TypeError("Parameter `mem` should have type _Memory")
 
-        if (count <=0 or count > self.nbytes):
-            count = self.nbytes
+        if (count <=0 or count > mem.nbytes):
+            count = mem.nbytes
 
         ERef = DPCTLQueue_MemAdvise(self._queue_ref, ptr, count, advice)
         if (ERef is NULL):
@@ -959,16 +974,6 @@ cdef class SyclQueue(_SyclQueue):
 
         return SyclEvent._create(ERef, [])
 
-    @property
-    def backend(self):
-        """Returns the backend_type enum value for the device
-        associated with this queue.
-
-        Returns:
-            backend_type: The backend for the device.
-        """
-        return self.sycl_device.backend
-
     @property
     def name(self):
         """Returns the device name for the device

dpctl/_sycl_queue_manager.pyx

@@ -78,7 +78,7 @@ cdef class _SyclQueueManager:
         Returns:
             backend_type: The SYCL backend for the currently selected queue.
         """
-        return self.get_current_queue().get_sycl_backend()
+        return self.get_current_queue().backend
 
     cpdef get_current_device_type(self):
         """
@@ -88,7 +88,7 @@ cdef class _SyclQueueManager:
             device_type: The SYCL device type for the currently selected queue.
             Possible values can be gpu, cpu, accelerator, or host.
         """
-        return self.get_current_queue().get_sycl_device().device_type
+        return self.get_current_queue().sycl_device.device_type
 
     cpdef SyclQueue get_current_queue(self):
         """