Skip to content

Commit 077a8d4

Browse files
authored
Merge branch 'master' into update_linalg_functions
2 parents 1bd7a8e + 0170ef6 commit 077a8d4

File tree

6 files changed

+25
-22
lines changed

6 files changed

+25
-22
lines changed

.github/workflows/build-sphinx.yml

Lines changed: 7 additions & 7 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
@@ -96,7 +96,7 @@ jobs:
9696
sudo apt-get install -y nvidia-cuda-toolkit clinfo
9797
9898
- name: Checkout repo
99-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
99+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
100100
with:
101101
fetch-depth: 0
102102

@@ -237,7 +237,7 @@ jobs:
237237
runs-on: ubuntu-latest
238238

239239
steps:
240-
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
240+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
241241
with:
242242
fetch-depth: 0
243243

.github/workflows/conda-package.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
access_token: ${{ github.token }}
9898

9999
- name: Checkout DPNP repo
100-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
100+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
101101
with:
102102
fetch-depth: 0
103103

@@ -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
@@ -516,7 +518,7 @@ jobs:
516518
run: mamba install anaconda-client
517519

518520
- name: Checkout repo
519-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
521+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
520522
with:
521523
repository: IntelPython/devops-tools
522524
fetch-depth: 0

.github/workflows/generate_coverage.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
access_token: ${{ github.token }}
3434

3535
- name: Checkout repo
36-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
36+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3737
with:
3838
fetch-depth: 0
3939

@@ -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: |

.github/workflows/openssf-scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
steps:
3535
- name: "Checkout code"
36-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
36+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3737
with:
3838
persist-credentials: false
3939

@@ -68,6 +68,6 @@ jobs:
6868

6969
# Upload the results to GitHub's code scanning dashboard.
7070
- name: "Upload to code-scanning"
71-
uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
71+
uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
7272
with:
7373
sarif_file: results.sarif

.github/workflows/pre-commit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626
pylint
2727
2828
- name: Checkout DPNP repo
29-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
29+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3030

3131
- name: Set up python
32-
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
32+
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
3333
with:
3434
python-version: '3.12'
3535

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)