Support dpctl 0.12

.github/workflows/conda-package.yml

@@ -123,25 +123,29 @@ jobs:
       matrix:
         python: [3.8, 3.9]
         numba: ["0.54"]
+        dpctl: ["0.11", "0.12"]
         integration_channels: [""]
         experimental: [false]
         artifact_name: [""]
         dependencies: [""]
         include:
           - python: "3.8"
             numba: 0.54
+            dpctl: "0.12"
             integration_channels: -c dppy/label/dev
             artifact_name: -c dppy_label_dev
             experimental: false  # current stable
             dependencies: ""
           - python: "3.8"
             numba: "0.55.0dev0=*_782"
+            dpctl: "0.12"
             integration_channels:
             artifact_name: ""
             experimental: false  # current stable
             dependencies: ""
           - python: "3.9"
             numba: "0.55.0dev0=*_778"
+            dpctl: "0.12"
             integration_channels: ""
             artifact_name: ""
             experimental: false  # current stable
@@ -188,7 +192,7 @@ jobs:
       - name: Install numba-dppy
         run: |
           CHANNELS="-c $GITHUB_WORKSPACE/channel ${{ env.CHANNELS }}"
-          conda install $PACKAGE_NAME pytest dpcpp_linux-64 python=${{ matrix.python }} numba=${{ matrix.numba }} ${{ matrix.dependencies }} $CHANNELS
+          conda install $PACKAGE_NAME pytest dpcpp_linux-64 python=${{ matrix.python }} numba=${{ matrix.numba }} dpctl=${{ matrix.dpctl }} ${{ matrix.dependencies }} $CHANNELS
           # Test installed packages
           conda list
       - name: Run tests

conda-recipe/conda_build_config.yaml

@@ -4,3 +4,6 @@ c_compiler_version:         # [linux]
 
 cxx_compiler_version:       # [linux]
   - 7                       # [linux and x86_64]
+
+dpctl:
+  - 0.11.0

conda-recipe/meta.yaml

@@ -19,13 +19,13 @@ requirements:
         - setuptools
         - cython
         - numba 0.54*|0.55*
-        - dpctl 0.11*
+        - dpctl {{ dpctl }}
         - dpnp 0.8*|0.9*           # [linux]
         - wheel
     run:
         - python
         - numba 0.54*|0.55*
-        - dpctl 0.11*
+        - dpctl 0.11*|0.12*
         - spirv-tools
         - llvm-spirv 11.*
         - dpnp 0.8*|0.9*           # [linux]

environment.yml

@@ -12,7 +12,7 @@ dependencies:
   - dpcpp_linux-64
   - cython
   - numba 0.55*
-  - dpctl 0.11*
+  - dpctl 0.12*
   - dpnp 0.9*
   - spirv-tools
   # - llvm-spirv 11.*

numba_dppy/dpctl_iface/usm_shared_allocator_ext.c

@@ -27,9 +27,20 @@
 #include "assert.h"
 #include <stdio.h>
 #include <stdbool.h>
-#include <dpctl_sycl_queue_interface.h>
-#include <dpctl_sycl_queue_manager.h>
-#include <dpctl_sycl_usm_interface.h>
+
+#if defined __has_include
+#  if __has_include(<dpctl_sycl_interface.h>)
+#    include <dpctl_sycl_interface.h>
+#  else
+#    include <dpctl_sycl_queue_interface.h>
+#    include <dpctl_sycl_queue_manager.h>
+#    include <dpctl_sycl_usm_interface.h>
+#  endif
+#else
+#  include <dpctl_sycl_queue_interface.h>
+#  include <dpctl_sycl_queue_manager.h>
+#  include <dpctl_sycl_usm_interface.h>
+#endif
 
 NRT_ExternalAllocator usmarray_allocator;
 NRT_external_malloc_func internal_allocator = NULL;