From ec63bd70ce00cdacecf4a9ea962f923474400b5d Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Wed, 27 Mar 2024 22:52:54 +0100 Subject: [PATCH 1/2] Remove temporary workaround in GH actions --- .github/workflows/build-sphinx.yml | 4 ++-- .github/workflows/generate_coverage.yaml | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-sphinx.yml b/.github/workflows/build-sphinx.yml index 8769c3160b6a..82b62d569ed7 100644 --- a/.github/workflows/build-sphinx.yml +++ b/.github/workflows/build-sphinx.yml @@ -107,8 +107,8 @@ jobs: - name: Install dpnp dependencies run: | - conda install numpy"<1.24" dpctl">=0.17.0dev0" 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 }} + conda install numpy"<1.24" dpctl mkl-devel-dpcpp onedpl-devel tbb-devel dpcpp_linux-64 \ + cmake cython pytest ninja scikit-build ${{ env.CHANNELS }} - name: Install cuPy dependencies run: conda install cupy cudatoolkit=10.0 diff --git a/.github/workflows/generate_coverage.yaml b/.github/workflows/generate_coverage.yaml index d93c6c235a53..2bfa89c0f0c2 100644 --- a/.github/workflows/generate_coverage.yaml +++ b/.github/workflows/generate_coverage.yaml @@ -48,10 +48,8 @@ jobs: - name: Install dpnp dependencies 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.17.0dev0" dpcpp_linux-64"=2023.2" sysroot_linux-64">=2.28" mkl-devel-dpcpp tbb-devel"=2021.10" \ - onedpl-devel ${{ env.CHANNELS }} + dpctl dpcpp_linux-64 mkl-devel-dpcpp tbb-devel onedpl-devel ${{ env.CHANNELS }} - name: Conda info run: | From 2de9b16b8e65b251cddd3a021fda56ef56441dbd Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Wed, 27 Mar 2024 23:03:43 +0100 Subject: [PATCH 2/2] Keep dpctl pinning --- .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 82b62d569ed7..e88a197b2f39 100644 --- a/.github/workflows/build-sphinx.yml +++ b/.github/workflows/build-sphinx.yml @@ -107,7 +107,7 @@ jobs: - name: Install dpnp dependencies run: | - conda install numpy"<1.24" dpctl mkl-devel-dpcpp onedpl-devel tbb-devel dpcpp_linux-64 \ + conda install numpy"<1.24" dpctl">=0.17.0dev0" mkl-devel-dpcpp onedpl-devel tbb-devel dpcpp_linux-64 \ cmake cython pytest ninja scikit-build ${{ env.CHANNELS }} - name: Install cuPy dependencies diff --git a/.github/workflows/generate_coverage.yaml b/.github/workflows/generate_coverage.yaml index 2bfa89c0f0c2..34a9215ca2e2 100644 --- a/.github/workflows/generate_coverage.yaml +++ b/.github/workflows/generate_coverage.yaml @@ -49,7 +49,7 @@ jobs: - name: Install dpnp dependencies run: | conda install cython llvm cmake">=3.21" scikit-build ninja pytest pytest-cov coverage[toml] \ - dpctl dpcpp_linux-64 mkl-devel-dpcpp tbb-devel onedpl-devel ${{ env.CHANNELS }} + dpctl">=0.17.0dev0" dpctl dpcpp_linux-64 mkl-devel-dpcpp tbb-devel onedpl-devel ${{ env.CHANNELS }} - name: Conda info run: |