Skip to content

Commit e404fa6

Browse files
authored
Allow for newer version of DPC++ compiler (#1664)
* Allow for newer version of DPC++ compiler * Stepped dpctl versions in all yaml files
1 parent 8072622 commit e404fa6

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.github/workflows/build-sphinx.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
9898
- name: Install dpnp dependencies
9999
run: |
100-
conda install numpy"<1.24" dpctl">=0.15.1dev2" mkl-devel-dpcpp onedpl-devel tbb-devel dpcpp_linux-64"<2024.0.1" \
100+
conda install numpy"<1.24" dpctl">=0.15.1dev3" mkl-devel-dpcpp onedpl-devel tbb-devel dpcpp_linux-64"<2024.0.1" \
101101
cmake cython pytest ninja scikit-build sysroot_linux-64">=2.28" ${{ env.CHANNELS }}
102102
103103
- name: Install cuPy dependencies

.github/workflows/generate_coverage.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
run: |
4545
# use DPC++ compiler 2023.2 to work around an issue with crash
4646
conda install cython llvm cmake">=3.21" scikit-build ninja pytest pytest-cov coverage[toml] \
47-
dpctl">=0.15.1dev2" dpcpp_linux-64"=2023.2" sysroot_linux-64">=2.28" mkl-devel-dpcpp tbb-devel"=2021.10" \
47+
dpctl">=0.15.1dev3" dpcpp_linux-64"=2023.2" sysroot_linux-64">=2.28" mkl-devel-dpcpp tbb-devel"=2021.10" \
4848
onedpl-devel ${{ env.CHANNELS }}
4949
5050
- name: Conda info

conda-recipe/meta.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{% set required_compiler_and_mkl_version = "2024.0" %}
2-
{% set max_compiler_version = "2024.0.1" %}
3-
{% set required_dpctl_version = "0.15.1dev2" %}
2+
{% set excluded_compiler_version1 = "2024.0.1" %}
3+
{% set excluded_compiler_version2 = "2024.0.2" %}
4+
{% set required_dpctl_version = "0.15.1dev3" %}
45

56
package:
67
name: dpnp
@@ -25,7 +26,7 @@ requirements:
2526
- scikit-build
2627
build:
2728
- {{ compiler('cxx') }}
28-
- {{ compiler('dpcpp') }} >={{ required_compiler_and_mkl_version }},<{{ max_compiler_version }} # [not osx]
29+
- {{ compiler('dpcpp') }} >={{ required_compiler_and_mkl_version }},!={{ excluded_compiler_version1 }},!={{ excluded_compiler_version2 }} # [not osx]
2930
- sysroot_linux-64 >=2.28 # [linux]
3031
run:
3132
- python

0 commit comments

Comments
 (0)