Skip to content

Commit 130b060

Browse files
ekomarovaekomarova
authored
Merge branch 'master' into impl/byte_bounds
2 parents a9ff9ba + 25d0ddd commit 130b060

File tree

13 files changed

+743
-79
lines changed

13 files changed

+743
-79
lines changed

‎.github/workflows/build-sphinx.yml

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ env:
1919

2020
defaults:
2121
run:
22-
shell: bash -l {0}
22+
shell: bash -el {0}
2323

2424
jobs:
2525
build-and-deploy:
@@ -36,7 +36,7 @@ jobs:
3636
pull-requests: write
3737

3838
env:
39-
python-ver: '3.9'
39+
python-ver: '3.12'
4040
CHANNELS: '-c dppy/label/dev -c intel -c conda-forge --override-channels'
4141
NO_INTEL_CHANNELS: '-c dppy/label/dev -c conda-forge --override-channels'
4242
# Install the latest oneAPI compiler to work around an issue
@@ -59,13 +59,13 @@ jobs:
5959
with:
6060
docker-images: false
6161

62-
- name: Install Intel repository
62+
- name: Add Intel repository
6363
run: |
64-
wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
65-
sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
66-
rm GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
67-
sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main"
68-
sudo apt-get update
64+
wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
65+
cat GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
66+
rm GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
67+
echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
68+
sudo apt update
6969
7070
- name: Update libstdc++-dev
7171
run: |
@@ -76,11 +76,13 @@ jobs:
7676
7777
- name: Install Intel OneAPI
7878
run: |
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*
79+
sudo apt install hwloc \
80+
intel-oneapi-mkl \
81+
intel-oneapi-umf \
82+
intel-oneapi-mkl-devel \
83+
intel-oneapi-tbb-devel \
84+
intel-oneapi-libdpstd-devel \
85+
intel-oneapi-compiler-dpcpp-cpp
8486
8587
# required by sphinxcontrib-spelling extension
8688
- name: Install enchant package
@@ -130,16 +132,16 @@ jobs:
130132
- name: Install dpnp dependencies
131133
if: env.INSTALL_ONE_API == 'yes'
132134
run: |
133-
mamba install numpy"<1.24" dpctl">=0.18.0dev0" cmake cython pytest ninja scikit-build ${{ env.NO_INTEL_CHANNELS }}
135+
mamba install numpy dpctl">=0.18.0dev0" cmake cython pytest ninja scikit-build ${{ env.NO_INTEL_CHANNELS }}
134136
135137
- name: Install dpnp dependencies
136138
if: env.INSTALL_ONE_API != 'yes'
137139
run: |
138-
mamba install numpy"<1.24" dpctl">=0.18.0dev0" mkl-devel-dpcpp onedpl-devel tbb-devel dpcpp_linux-64 \
140+
mamba install numpy dpctl">=0.18.0dev0" mkl-devel-dpcpp onedpl-devel tbb-devel dpcpp_linux-64 \
139141
cmake cython pytest ninja scikit-build ${{ env.CHANNELS }}
140142
141143
- name: Install cuPy dependencies
142-
run: mamba install cupy cudatoolkit=10.0
144+
run: mamba install cupy
143145

144146
- name: Conda info
145147
run: mamba info

‎.github/workflows/conda-package.yml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040

4141
defaults:
4242
run:
43-
shell: ${{ matrix.os == 'windows-2019' && 'cmd /C CALL {0}' || 'bash -l {0}' }}
43+
shell: ${{ matrix.os == 'windows-2019' && 'cmd /C CALL {0}' || 'bash -el {0}' }}
4444

4545
continue-on-error: true
4646

@@ -76,7 +76,7 @@ jobs:
7676
run: echo "MAMBA_NO_LOW_SPEED_LIMIT=1" >> $GITHUB_ENV
7777

7878
- name: Store conda paths as envs
79-
shell: bash -l {0}
79+
shell: bash -el {0}
8080
run: |
8181
echo "CONDA_BLD=$CONDA_PREFIX/conda-bld/${{ runner.os == 'Linux' && 'linux' || 'win' }}-64/" | tr "\\\\" '/' >> $GITHUB_ENV
8282
echo "WHEELS_OUTPUT_FOLDER=$GITHUB_WORKSPACE${{ runner.os == 'Linux' && '/' || '\\' }}" >> $GITHUB_ENV
@@ -99,7 +99,7 @@ jobs:
9999
- name: Build conda package
100100
run: conda build --no-test --python ${{ matrix.python }} --numpy 2.0 ${{ env.CHANNELS }} conda-recipe
101101
env:
102-
MAX_BUILD_CMPL_MKL_VERSION: '2024.3a0'
102+
MAX_BUILD_CMPL_MKL_VERSION: '2025.1a0'
103103

104104
- name: Upload artifact
105105
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
@@ -122,7 +122,7 @@ jobs:
122122

123123
defaults:
124124
run:
125-
shell: bash -l {0}
125+
shell: bash -el {0}
126126

127127
strategy:
128128
matrix:
@@ -318,7 +318,7 @@ jobs:
318318
@echo on
319319
set "SCRIPT=${{ env.VER_SCRIPT1 }} ${{ env.VER_SCRIPT2 }}"
320320
FOR /F "tokens=* USEBACKQ" %%F IN (`python -c "%SCRIPT%"`) DO (
321-
SET PACKAGE_VERSION=%%F
321+
set PACKAGE_VERSION=%%F
322322
)
323323
echo PACKAGE_VERSION: %PACKAGE_VERSION%
324324
(echo PACKAGE_VERSION=%PACKAGE_VERSION%) >> %GITHUB_ENV%
@@ -357,7 +357,11 @@ jobs:
357357
shell: pwsh
358358
run: |
359359
$script_path="$env:CONDA_PREFIX\Scripts\set-intel-ocl-icd-registry.ps1"
360-
&$script_path
360+
if (Test-Path $script_path) {
361+
&$script_path
362+
} else {
363+
Write-Warning "File $script_path was NOT found!"
364+
}
361365
# Check the variable assisting OpenCL CPU driver to find TBB DLLs which are not located where it expects them by default
362366
$cl_cfg="$env:CONDA_PREFIX\Library\lib\cl.cfg"
363367
Get-Content -Tail 5 -Path $cl_cfg
@@ -401,7 +405,7 @@ jobs:
401405

402406
defaults:
403407
run:
404-
shell: bash -l {0}
408+
shell: bash -el {0}
405409

406410
continue-on-error: true
407411

@@ -450,11 +454,15 @@ jobs:
450454

451455
cleanup_packages:
452456
name: Clean up anaconda packages
457+
453458
needs: [upload]
459+
454460
runs-on: 'ubuntu-latest'
461+
455462
defaults:
456463
run:
457464
shell: bash -el {0}
465+
458466
steps:
459467
- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
460468
with:

‎.github/workflows/generate_coverage.yaml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
defaults:
1919
run:
20-
shell: bash -l {0}
20+
shell: bash -el {0}
2121

2222
env:
2323
python-ver: '3.12'
@@ -40,20 +40,22 @@ jobs:
4040
- name: Add Intel repository
4141
if: env.INSTALL_ONE_API == 'yes'
4242
run: |
43-
wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
44-
sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
45-
rm GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
46-
sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main"
47-
sudo apt-get update
43+
wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
44+
cat GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
45+
rm GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
46+
echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
47+
sudo apt update
4848
4949
- name: Install latest Intel OneAPI
5050
if: env.INSTALL_ONE_API == 'yes'
5151
run: |
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*
52+
sudo apt install hwloc \
53+
intel-oneapi-mkl \
54+
intel-oneapi-umf \
55+
intel-oneapi-mkl-devel \
56+
intel-oneapi-tbb-devel \
57+
intel-oneapi-libdpstd-devel \
58+
intel-oneapi-compiler-dpcpp-cpp
5759
5860
- name: Install Lcov
5961
run: |
@@ -109,7 +111,7 @@ jobs:
109111
conda activate coverage
110112
[ -f /opt/intel/oneapi/setvars.sh ] && source /opt/intel/oneapi/setvars.sh
111113
git clean -fxd
112-
python scripts/gen_coverage.py --pytest-opts="--ignore tests/test_random.py" --verbose
114+
python scripts/gen_coverage.py --verbose
113115
114116
- name: Total number of coverage attempts
115117
run: |

‎.github/workflows/openssf-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
71+
uses: github/codeql-action/upload-sarif@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
7272
with:
7373
sarif_file: results.sarif

‎conda-recipe/meta.yaml

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

55
package:
66
name: dpnp

0 commit comments

Comments
 (0)