Merge tag '0.21.0dev0' into gold/2021

Author: Diptorup Deb

.github/CODEOWNERS

@@ -1,5 +1,5 @@
-*       @mingjie-intel @diptorupd
-
 *.yml   @mingjie-intel @diptorupd
-
 conda-recipe/*  @mingjie-intel @diptorupd
+numba_dpex/dpnp_iface @diptorupd @chudur-budur
+numba_dpex/core @diptorupd
+numba_dpex/core/passes/parfor_lowering_pass.py @mingjie-intel

environment/coverage.yml

@@ -1,19 +1,20 @@
 name: dev
 channels:
-  - defaults
   - dppy/label/dev
   - numba
   - intel
   - numba/label/dev
+  - pkgs/main
   - nodefaults
 dependencies:
   - python=3.9
+  - defaults:libffi
   - gxx_linux-64
   - dpcpp_linux-64
   - cython
   - numba 0.56*
-  - dpctl >=0.14*
-  - dpnp >=0.10.2
+  - dppy/label/dev:dpctl
+  - dppy/label/dev:dpnp
   - spirv-tools
   - dpcpp-llvm-spirv
   - packaging

numba_dpex/__init__.py

@@ -9,6 +9,8 @@
 import logging
 import os
 import platform as plt
+import re
+from typing import Tuple
 
 import dpctl
 import llvmlite.binding as ll
@@ -59,7 +61,22 @@ def load_dpctl_sycl_interface():
     Vectorize.target_registry.ondemand["dpex"] = lambda: DpexVectorize
 
 
-numba_version = tuple(map(int, numba.__version__.split(".")[:3]))
+def parse_sem_version(version_string: str) -> Tuple[int, int, int]:
+    """Parse sem version into tuple of three integers. If there is a suffix like
+    rc1, dev0 - it will be ignored."""
+    return tuple(
+        map(
+            int,
+            re.sub(
+                "([0-9]+\\.[0-9]+\\.[0-9]+).*",
+                "\\g<1>",
+                version_string,
+            ).split(".")[:3],
+        )
+    )
+
+
+numba_version = parse_sem_version(numba.__version__)
 if numba_version < (0, 56, 4):
     logging.warning(
         "numba_dpex needs numba 0.56.4, using "

numba_dpex/core/compiler.py

@@ -85,7 +85,7 @@ def compile_with_dpex(
             return_type=return_type,
             flags=flags,
             locals={},
-            pipeline_class=OffloadCompiler,
+            pipeline_class=KernelCompiler,
         )
     else:
         raise UnreachableError()

numba_dpex/core/datamodel/models.py

@@ -4,7 +4,7 @@
 
 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
@@ -54,6 +54,33 @@ def __init__(self, dmm, fe_type):
         super(ArrayModel, self).__init__(dmm, fe_type, members)
 
 
+class SyclQueueModel(StructModel):
+    """Represents the native data model for a dpctl.SyclQueue PyObject.
+
+    Numba-dpex uses a C struct as defined in
+    numba_dpex/core/runtime._queuestruct.h to store the required attributes for
+    a ``dpctl.SyclQueue`` Python object.
+
+        - ``queue_ref``: An opaque C pointer to an actual SYCL queue C++ object.
+        - ``parent``: A PyObject* that stores a reference back to the original
+                      ``dpctl.SyclQueue`` PyObject if the native struct is
+                      created by unboxing the PyObject.
+    """
+
+    def __init__(self, dmm, fe_type):
+        members = [
+            (
+                "parent",
+                types.CPointer(types.int8),
+            ),
+            (
+                "queue_ref",
+                types.CPointer(types.int8),
+            ),
+        ]
+        super(SyclQueueModel, self).__init__(dmm, fe_type, members)
+
+
 def _init_data_model_manager():
     dmm = datamodel.default_manager.copy()
     dmm.register(types.CPointer, GenericPointerModel)
@@ -83,6 +110,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
+register_model(DpctlSyclQueue)(SyclQueueModel)
+dpex_data_model_manager.register(DpctlSyclQueue, SyclQueueModel)

numba_dpex/core/descriptor.py

@@ -2,6 +2,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+from functools import cached_property
+
 from numba.core import typing, utils
 from numba.core.cpu import CPUTargetOptions
 from numba.core.descriptors import TargetDescriptor
@@ -21,12 +23,12 @@ class DpexKernelTarget(TargetDescriptor):
 
     options = CPUTargetOptions
 
-    @utils.cached_property
+    @cached_property
     def _toplevel_target_context(self):
         """Lazily-initialized top-level target context, for all threads."""
         return DpexKernelTargetContext(self.typing_context, self._target_name)
 
-    @utils.cached_property
+    @cached_property
     def _toplevel_typing_context(self):
         """Lazily-initialized top-level typing context, for all threads."""
         return DpexKernelTypingContext()
@@ -53,12 +55,12 @@ class DpexTarget(TargetDescriptor):
 
     options = CPUTargetOptions
 
-    @utils.cached_property
+    @cached_property
     def _toplevel_target_context(self):
         # Lazily-initialized top-level target context, for all threads
         return DpexTargetContext(self.typing_context, self._target_name)
 
-    @utils.cached_property
+    @cached_property
     def _toplevel_typing_context(self):
         # Lazily-initialized top-level typing context, for all threads
         return typing.Context()

numba_dpex/core/runtime/_dbg_printer.h

@@ -0,0 +1,40 @@
+// SPDX-FileCopyrightText: 2023 Intel Corporation
+//
+// SPDX-License-Identifier: Apache-2.0
+
+//===----------------------------------------------------------------------===//
+///
+/// \file
+/// A helper macro to print debug prints.
+///
+//===----------------------------------------------------------------------===//
+
+#pragma once
+
+/* Debugging facilities - enabled at compile-time */
+/* #undef NDEBUG */
+#if 0
+#include <stdio.h>
+#define DPEXRT_DEBUG(X)                                                        \
+    {                                                                          \
+        X;                                                                     \
+        fflush(stdout);                                                        \
+    }
+#else
+#define DPEXRT_DEBUG(X)                                                        \
+    if (0) {                                                                   \
+        X;                                                                     \
+    }
+#endif
+
+/*
+ * Debugging printf function used internally
+ */
+static inline void drt_debug_print(const char *fmt, ...)
+{
+    va_list args;
+
+    va_start(args, fmt);
+    vfprintf(stderr, fmt, args);
+    va_end(args);
+}