diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index c2e1f6362a..97448c12df 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -123,6 +123,7 @@ jobs: matrix: python: [3.8, 3.9] numba: ["0.54"] + dpctl: ["0.11", "0.12"] integration_channels: [""] experimental: [false] artifact_name: [""] @@ -130,18 +131,21 @@ jobs: 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 diff --git a/conda-recipe/conda_build_config.yaml b/conda-recipe/conda_build_config.yaml index 3806dd73b1..b9dea1f4d8 100644 --- a/conda-recipe/conda_build_config.yaml +++ b/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 diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index a61dfb5330..f24b94c790 100644 --- a/conda-recipe/meta.yaml +++ b/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] diff --git a/environment.yml b/environment.yml index d3d83d7952..9987c910a6 100644 --- a/environment.yml +++ b/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.* diff --git a/numba_dppy/dpctl_iface/usm_shared_allocator_ext.c b/numba_dppy/dpctl_iface/usm_shared_allocator_ext.c index 33cf07048f..4d35195614 100644 --- a/numba_dppy/dpctl_iface/usm_shared_allocator_ext.c +++ b/numba_dppy/dpctl_iface/usm_shared_allocator_ext.c @@ -27,9 +27,20 @@ #include "assert.h" #include #include -#include -#include -#include + +#if defined __has_include +# if __has_include() +# include +# else +# include +# include +# include +# endif +#else +# include +# include +# include +#endif NRT_ExternalAllocator usmarray_allocator; NRT_external_malloc_func internal_allocator = NULL;