From 3b97b505d7af9ecf15e38534af7bff5c51c432af Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Tue, 23 Jan 2024 12:22:02 +0100 Subject: [PATCH 1/2] Allow for newer version of DPC++ compiler --- conda-recipe/meta.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index fac779e7b95c..2ff93e0a0a8d 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,6 +1,7 @@ {% set required_compiler_and_mkl_version = "2024.0" %} -{% set max_compiler_version = "2024.0.1" %} -{% set required_dpctl_version = "0.15.1dev2" %} +{% set excluded_compiler_version1 = "2024.0.1" %} +{% set excluded_compiler_version2 = "2024.0.2" %} +{% set required_dpctl_version = "0.15.1dev3" %} package: name: dpnp @@ -25,7 +26,7 @@ requirements: - scikit-build build: - {{ compiler('cxx') }} - - {{ compiler('dpcpp') }} >={{ required_compiler_and_mkl_version }},<{{ max_compiler_version }} # [not osx] + - {{ compiler('dpcpp') }} >={{ required_compiler_and_mkl_version }},!={{ excluded_compiler_version1 }},!={{ excluded_compiler_version2 }} # [not osx] - sysroot_linux-64 >=2.28 # [linux] run: - python From b67db2ef301f4ff457c2cb5bc87458d7c9e88e9a Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Tue, 23 Jan 2024 12:25:45 +0100 Subject: [PATCH 2/2] Stepped dpctl versions in all yaml files --- .github/workflows/build-sphinx.yml | 2 +- .github/workflows/generate_coverage.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-sphinx.yml b/.github/workflows/build-sphinx.yml index 623644a89a66..f814fabd9fd5 100644 --- a/.github/workflows/build-sphinx.yml +++ b/.github/workflows/build-sphinx.yml @@ -97,7 +97,7 @@ jobs: - name: Install dpnp dependencies run: | - conda install numpy"<1.24" dpctl">=0.15.1dev2" mkl-devel-dpcpp onedpl-devel tbb-devel dpcpp_linux-64"<2024.0.1" \ + conda install numpy"<1.24" dpctl">=0.15.1dev3" mkl-devel-dpcpp onedpl-devel tbb-devel dpcpp_linux-64"<2024.0.1" \ cmake cython pytest ninja scikit-build sysroot_linux-64">=2.28" ${{ env.CHANNELS }} - name: Install cuPy dependencies diff --git a/.github/workflows/generate_coverage.yaml b/.github/workflows/generate_coverage.yaml index a9e923957628..1c6d22644221 100644 --- a/.github/workflows/generate_coverage.yaml +++ b/.github/workflows/generate_coverage.yaml @@ -44,7 +44,7 @@ jobs: run: | # use DPC++ compiler 2023.2 to work around an issue with crash conda install cython llvm cmake">=3.21" scikit-build ninja pytest pytest-cov coverage[toml] \ - dpctl">=0.15.1dev2" dpcpp_linux-64"=2023.2" sysroot_linux-64">=2.28" mkl-devel-dpcpp tbb-devel"=2021.10" \ + dpctl">=0.15.1dev3" dpcpp_linux-64"=2023.2" sysroot_linux-64">=2.28" mkl-devel-dpcpp tbb-devel"=2021.10" \ onedpl-devel ${{ env.CHANNELS }} - name: Conda info