Skip to content

Commit d400639

Browse files
authored
Merge branch 'master' into wa_sg_store_load
2 parents 54016c4 + 28d3348 commit d400639

File tree

3 files changed

+18
-3
lines changed

3 files changed

+18
-3
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 \
100+
conda install numpy"<1.24" dpctl">=0.15.1dev2" 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: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,22 @@ jobs:
5353
conda list
5454
5555
- name: Build dpnp with coverage
56+
id: build_coverage
57+
uses: nick-fields/[email protected]
58+
with:
59+
shell: bash
60+
timeout_minutes: 60
61+
max_attempts: 5
62+
retry_on: error
63+
command: |
64+
. $CONDA/etc/profile.d/conda.sh
65+
conda activate coverage
66+
git clean -fxd
67+
python scripts/gen_coverage.py --pytest-opts="--ignore tests/test_random.py"
68+
69+
- name: Total number of coverage attempts
5670
run: |
57-
python scripts/gen_coverage.py --pytest-opts="--ignore tests/test_random.py"
71+
echo "Total number of coverage attempts made: ${{ steps.build_coverage.outputs.total_attempts }}"
5872
5973
- name: Install coverall dependencies
6074
run: |

conda-recipe/meta.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{% set required_compiler_and_mkl_version = "2024.0" %}
2+
{% set max_compiler_version = "2024.0.1" %}
23
{% set required_dpctl_version = "0.15.1dev2" %}
34

45
package:
@@ -24,7 +25,7 @@ requirements:
2425
- scikit-build
2526
build:
2627
- {{ compiler('cxx') }}
27-
- {{ compiler('dpcpp') }} >={{ required_compiler_and_mkl_version }} # [not osx]
28+
- {{ compiler('dpcpp') }} >={{ required_compiler_and_mkl_version }},<{{ max_compiler_version }} # [not osx]
2829
- sysroot_linux-64 >=2.28 # [linux]
2930
run:
3031
- python

0 commit comments

Comments
 (0)