Skip to content

Commit 1857d78

Browse files
authored
Implement a temporary workaround to avoid usage of 2025.0 components in GutHub actions (#2131)
* Pin DPC++ and OneMKL to stable 2024.2 version in meta.yaml * Limit DPC++, OneMKL and TBB versions for building docs and coverage run * Limit max compiler and MMKL versions for build * Step dpctl required version
1 parent 29239b6 commit 1857d78

File tree

4 files changed

+16
-13
lines changed

4 files changed

+16
-13
lines changed

.github/workflows/build-sphinx.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ jobs:
7676
7777
- name: Install Intel OneAPI
7878
run: |
79-
sudo apt-get install intel-oneapi-mkl \
80-
intel-oneapi-mkl-devel \
81-
intel-oneapi-tbb-devel \
82-
intel-oneapi-libdpstd-devel \
83-
intel-oneapi-compiler-dpcpp-cpp
79+
sudo apt-get install intel-oneapi-mkl-2024.2* \
80+
intel-oneapi-mkl-devel-2024.2* \
81+
intel-oneapi-tbb-devel-2021.13* \
82+
intel-oneapi-libdpstd-devel-2022.6* \
83+
intel-oneapi-compiler-dpcpp-cpp-2024.2*
8484
8585
# required by sphinxcontrib-spelling extension
8686
- name: Install enchant package

.github/workflows/conda-package.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,8 @@ jobs:
144144
145145
- name: Build conda package
146146
run: conda build --no-test --python ${{ matrix.python }} --numpy 2.0 ${{ env.CHANNELS }} conda-recipe
147+
env:
148+
MAX_BUILD_CMPL_MKL_VERSION: '2024.3a0'
147149

148150
- name: Upload artifact
149151
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3

.github/workflows/generate_coverage.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ jobs:
4949
- name: Install latest Intel OneAPI
5050
if: env.INSTALL_ONE_API == 'yes'
5151
run: |
52-
sudo apt-get install intel-oneapi-mkl \
53-
intel-oneapi-mkl-devel \
54-
intel-oneapi-tbb-devel \
55-
intel-oneapi-libdpstd-devel \
56-
intel-oneapi-compiler-dpcpp-cpp
52+
sudo apt-get install intel-oneapi-mkl-2024.2* \
53+
intel-oneapi-mkl-devel-2024.2* \
54+
intel-oneapi-tbb-devel-2021.13* \
55+
intel-oneapi-libdpstd-devel-2022.6* \
56+
intel-oneapi-compiler-dpcpp-cpp-2024.2*
5757
5858
- name: Install Lcov
5959
run: |

conda-recipe/meta.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
{% set max_compiler_and_mkl_version = environ.get("MAX_BUILD_CMPL_MKL_VERSION", "2026.0a0") %}
12
{% set required_compiler_and_mkl_version = "2024.2" %}
2-
{% set required_dpctl_version = "0.18.0*" %}
3+
{% set required_dpctl_version = "0.18.1" %}
34

45
package:
56
name: dpnp
@@ -17,14 +18,14 @@ requirements:
1718
- ninja
1819
- git
1920
- dpctl >={{ required_dpctl_version }}
20-
- mkl-devel-dpcpp >={{ required_compiler_and_mkl_version }}
21+
- mkl-devel-dpcpp >={{ required_compiler_and_mkl_version }},<{{ max_compiler_and_mkl_version }}
2122
- onedpl-devel
2223
- tbb-devel
2324
- wheel
2425
- scikit-build
2526
build:
2627
- {{ compiler('cxx') }}
27-
- {{ compiler('dpcpp') }} >={{ required_compiler_and_mkl_version }}
28+
- {{ compiler('dpcpp') }} >={{ required_compiler_and_mkl_version }},<{{ max_compiler_and_mkl_version }}
2829
- sysroot_linux-64 >=2.28 # [linux]
2930
run:
3031
- python

0 commit comments

Comments
 (0)