Skip to content

Commit 773b177

Browse files
Merge master into tests_cuda
2 parents 26275a7 + ce3ef5e commit 773b177

33 files changed

+1420
-2930
lines changed

.github/workflows/build-sphinx.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
build-and-deploy:
2626
name: Build and Deploy Docs
2727

28-
runs-on: ubuntu-latest
28+
runs-on: ubuntu-22.04
2929

3030
permissions:
3131
# Needed to cancel any previous runs that are not completed for a given workflow
@@ -89,7 +89,6 @@ jobs:
8989
run: |
9090
sudo apt-get install enchant-2
9191

92-
# https://github.com/marketplace/actions/checkout
9392
- name: Install nvidia-cuda support drivers
9493
run: |
9594
sudo add-apt-repository ppa:graphics-drivers/ppa
@@ -102,8 +101,20 @@ jobs:
102101
with:
103102
fetch-depth: 0
104103

105-
# https://github.com/marketplace/actions/setup-miniconda
106104
- name: Setup miniconda
105+
id: setup_miniconda
106+
continue-on-error: true
107+
uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
108+
with:
109+
miniforge-version: latest
110+
use-mamba: 'true'
111+
channels: conda-forge
112+
conda-remove-defaults: 'true'
113+
python-version: ${{ env.python-ver }}
114+
activate-environment: 'docs'
115+
116+
- name: ReSetup miniconda
117+
if: steps.setup_miniconda.outcome == 'failure'
107118
uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
108119
with:
109120
miniforge-version: latest

.github/workflows/check-mkl-interfaces.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ env:
2828

2929
jobs:
3030
test_by_tag:
31-
name: Run on ['${{ matrix.os }}', python='${{ matrix.python }}'] with oneMKL tag
31+
name: Run tests with oneMKL tag
3232

3333
strategy:
3434
matrix:
@@ -121,7 +121,7 @@ jobs:
121121
SYCL_CACHE_PERSISTENT: 1
122122

123123
test_by_branch:
124-
name: Run on ['${{ matrix.os }}', python='${{ matrix.python }}'] with oneMKL develop branch
124+
name: Run tests with oneMKL develop branch
125125

126126
strategy:
127127
matrix:

.github/workflows/conda-package.yml

Lines changed: 53 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@ env:
2525

2626
jobs:
2727
build:
28-
name: Build ['${{ matrix.os }}', python='${{ matrix.python }}']
28+
name: Build
2929

3030
strategy:
31+
fail-fast: false
3132
matrix:
3233
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
3334
os: [ubuntu-22.04, windows-2019]
@@ -42,8 +43,6 @@ jobs:
4243
run:
4344
shell: ${{ matrix.os == 'windows-2019' && 'cmd /C CALL {0}' || 'bash -el {0}' }}
4445

45-
continue-on-error: true
46-
4746
steps:
4847
- name: Cancel Previous Runs
4948
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
@@ -56,6 +55,8 @@ jobs:
5655
fetch-depth: 0
5756

5857
- name: Setup miniconda
58+
id: setup_miniconda
59+
continue-on-error: true
5960
uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
6061
with:
6162
miniforge-version: latest
@@ -65,9 +66,16 @@ jobs:
6566
python-version: ${{ env.CONDA_BUILD_INDEX_ENV_PY_VER}}
6667
activate-environment: 'build'
6768

68-
# Sometimes `mamba install ...` fails due to slow download speed rate, so disable the check in mamba
69-
- name: Disable speed limit check in mamba
70-
run: echo "MAMBA_NO_LOW_SPEED_LIMIT=1" >> $GITHUB_ENV
69+
- name: ReSetup miniconda
70+
if: steps.setup_miniconda.outcome == 'failure'
71+
uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
72+
with:
73+
miniforge-version: latest
74+
use-mamba: 'true'
75+
channels: conda-forge
76+
conda-remove-defaults: 'true'
77+
python-version: ${{ env.CONDA_BUILD_INDEX_ENV_PY_VER}}
78+
activate-environment: 'build'
7179

7280
- name: Store conda paths as envs
7381
shell: bash -el {0}
@@ -76,6 +84,12 @@ jobs:
7684
echo "WHEELS_OUTPUT_FOLDER=$GITHUB_WORKSPACE${{ runner.os == 'Linux' && '/' || '\\' }}" >> $GITHUB_ENV
7785

7886
- name: Install conda-build
87+
id: install_conda_build
88+
continue-on-error: true
89+
run: mamba install conda-build=${{ env.CONDA_BUILD_VERSION}}
90+
91+
- name: ReInstall conda-build
92+
if: steps.install_conda_build.outcome == 'failure'
7993
run: mamba install conda-build=${{ env.CONDA_BUILD_VERSION}}
8094

8195
- name: Build conda package
@@ -84,33 +98,33 @@ jobs:
8498
MAX_BUILD_CMPL_MKL_VERSION: '2025.1a0'
8599

86100
- name: Upload artifact
87-
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
101+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
88102
with:
89103
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
90104
path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.tar.bz2
91105

92106
- name: Upload wheels artifact
93-
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
107+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
94108
with:
95109
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python }}
96110
path: ${{ env.WHEELS_OUTPUT_FOLDER }}${{ env.PACKAGE_NAME }}-*.whl
97111

98112
test_linux:
99-
name: Test ['ubuntu-latest', python='${{ matrix.python }}']
113+
name: Test
100114

101115
needs: build
102116

103-
runs-on: ubuntu-latest
117+
runs-on: ${{ matrix.os }}
104118

105119
defaults:
106120
run:
107121
shell: bash -el {0}
108122

109123
strategy:
124+
fail-fast: false
110125
matrix:
111126
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
112-
113-
continue-on-error: true
127+
os: [ubuntu-latest]
114128

115129
env:
116130
channel-path: '${{ github.workspace }}/channel/'
@@ -131,6 +145,19 @@ jobs:
131145
tar -xvf ${{ env.pkg-path-in-channel }}/${{ env.PACKAGE_NAME }}-*.tar.bz2 -C ${{ env.extracted-pkg-path }}
132146

133147
- name: Setup miniconda
148+
id: setup_miniconda
149+
continue-on-error: true
150+
uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
151+
with:
152+
miniforge-version: latest
153+
use-mamba: 'true'
154+
channels: conda-forge
155+
conda-remove-defaults: 'true'
156+
python-version: ${{ env.CONDA_BUILD_INDEX_ENV_PY_VER}}
157+
activate-environment: ${{ env.TEST_ENV_NAME }}
158+
159+
- name: ReSetup miniconda
160+
if: steps.setup_miniconda.outcome == 'failure'
134161
uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
135162
with:
136163
miniforge-version: latest
@@ -164,11 +191,19 @@ jobs:
164191
run: mamba remove conda-index
165192

166193
- name: Install dpnp
194+
id: install_dpnp
195+
continue-on-error: true
196+
run: |
197+
mamba install ${{ env.PACKAGE_NAME }}=${{ env.PACKAGE_VERSION }} pytest python=${{ matrix.python }} ${{ env.TEST_CHANNELS }}
198+
env:
199+
TEST_CHANNELS: '-c ${{ env.channel-path }} ${{ env.CHANNELS }}'
200+
201+
- name: ReInstall dpnp
202+
if: steps.install_dpnp.outcome == 'failure'
167203
run: |
168204
mamba install ${{ env.PACKAGE_NAME }}=${{ env.PACKAGE_VERSION }} pytest python=${{ matrix.python }} ${{ env.TEST_CHANNELS }}
169205
env:
170206
TEST_CHANNELS: '-c ${{ env.channel-path }} ${{ env.CHANNELS }}'
171-
MAMBA_NO_LOW_SPEED_LIMIT: 1
172207

173208
- name: List installed packages
174209
run: mamba list
@@ -199,21 +234,21 @@ jobs:
199234
python -m pytest -ra --pyargs ${{ env.PACKAGE_NAME }}.tests
200235

201236
test_windows:
202-
name: Test ['windows-2019', python='${{ matrix.python }}']
237+
name: Test
203238

204239
needs: build
205240

206-
runs-on: windows-2019
241+
runs-on: ${{ matrix.os }}
207242

208243
defaults:
209244
run:
210245
shell: cmd /C CALL {0}
211246

212247
strategy:
248+
fail-fast: false
213249
matrix:
214250
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
215-
216-
continue-on-error: true
251+
os: [windows-2019]
217252

218253
env:
219254
channel-path: '${{ github.workspace }}\channel\'
@@ -335,7 +370,7 @@ jobs:
335370
python -m pytest -ra --pyargs ${{ env.PACKAGE_NAME }}.tests
336371

337372
upload:
338-
name: Upload ['${{ matrix.os }}', python='${{ matrix.python }}']
373+
name: Upload
339374

340375
needs: [test_linux, test_windows]
341376

.github/workflows/cron-run-tests.yaml

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@ env:
1515
PACKAGE_NAME: dpnp
1616
CHANNELS: '-c dppy/label/dev -c https://software.repos.intel.com/python/conda/ -c conda-forge --override-channels'
1717
TEST_ENV_NAME: test
18-
RERUN_TESTS_ON_FAILURE: 'true'
1918
RUN_TESTS_MAX_ATTEMPTS: 2
2019

2120
jobs:
2221
test:
23-
name: Test ['${{ matrix.runner }}', python='${{ matrix.python }}']
22+
name: Test
23+
24+
# disable scheduled workflow to be run in forks
25+
if: github.event.repository.fork == false
2426

2527
runs-on: ${{ matrix.runner }}
2628

@@ -33,12 +35,11 @@ jobs:
3335
actions: write
3436

3537
strategy:
38+
fail-fast: false
3639
matrix:
3740
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
3841
runner: [ubuntu-22.04, ubuntu-24.04, windows-2019]
3942

40-
continue-on-error: false
41-
4243
steps:
4344
- name: Cancel Previous Runs
4445
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
@@ -57,6 +58,19 @@ jobs:
5758
echo "Latest tag is ${{ steps.find_latest_tag.outputs.tag }}"
5859

5960
- name: Setup miniconda
61+
id: setup_miniconda
62+
continue-on-error: true
63+
uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
64+
with:
65+
miniforge-version: latest
66+
use-mamba: 'true'
67+
channels: conda-forge
68+
conda-remove-defaults: 'true'
69+
python-version: ${{ matrix.python }}
70+
activate-environment: ${{ env.TEST_ENV_NAME }}
71+
72+
- name: ReSetup miniconda
73+
if: steps.setup_miniconda.outcome == 'failure'
6074
uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
6175
with:
6276
miniforge-version: latest
@@ -67,10 +81,15 @@ jobs:
6781
activate-environment: ${{ env.TEST_ENV_NAME }}
6882

6983
- name: Install dpnp
84+
id: install_dpnp
85+
continue-on-error: true
86+
run: |
87+
mamba install ${{ env.PACKAGE_NAME }}=${{ steps.find_latest_tag.outputs.tag }} pytest ${{ env.CHANNELS }}
88+
89+
- name: ReInstall dpnp
90+
if: steps.install_dpnp.outcome == 'failure'
7091
run: |
7192
mamba install ${{ env.PACKAGE_NAME }}=${{ steps.find_latest_tag.outputs.tag }} pytest ${{ env.CHANNELS }}
72-
env:
73-
MAMBA_NO_LOW_SPEED_LIMIT: 1
7493

7594
- name: List installed packages
7695
run: mamba list
@@ -95,14 +114,15 @@ jobs:
95114
python -c "import dpnp; print(dpnp.__version__)"
96115

97116
- name: Run tests
98-
if: env.RERUN_TESTS_ON_FAILURE != 'true'
117+
id: run_tests
118+
continue-on-error: true
99119
run: |
100120
python -m pytest -ra --pyargs ${{ env.PACKAGE_NAME }}.tests
101121
env:
102122
SYCL_CACHE_PERSISTENT: 1
103123

104124
- name: ReRun tests on Linux
105-
if: env.RERUN_TESTS_ON_FAILURE == 'true' && matrix.runner != 'windows-2019'
125+
if: steps.run_tests.outcome == 'failure' && matrix.runner != 'windows-2019'
106126
id: run_tests_linux
107127
uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
108128
with:
@@ -119,7 +139,7 @@ jobs:
119139
SYCL_CACHE_PERSISTENT: 1
120140

121141
- name: ReRun tests on Windows
122-
if: env.RERUN_TESTS_ON_FAILURE == 'true' && matrix.runner == 'windows-2019'
142+
if: steps.run_tests.outcome == 'failure' && matrix.runner == 'windows-2019'
123143
id: run_tests_win
124144
uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
125145
with:

.github/workflows/generate_coverage.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,19 @@ jobs:
6262
sudo apt-get install lcov
6363

6464
- name: Setup miniconda
65+
id: setup_miniconda
66+
continue-on-error: true
67+
uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
68+
with:
69+
miniforge-version: latest
70+
use-mamba: 'true'
71+
channels: conda-forge
72+
conda-remove-defaults: 'true'
73+
python-version: ${{ env.python-ver }}
74+
activate-environment: 'coverage'
75+
76+
- name: ReSetup miniconda
77+
if: steps.setup_miniconda.outcome == 'failure'
6578
uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
6679
with:
6780
miniforge-version: latest

.github/workflows/openssf-scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@ jobs:
6060
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
6161
# format to the repository Actions tab.
6262
- name: "Upload artifact"
63-
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
63+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
6464
with:
6565
name: SARIF file
6666
path: results.sarif
6767
retention-days: 14
6868

6969
# Upload the results to GitHub's code scanning dashboard.
7070
- name: "Upload to code-scanning"
71-
uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
71+
uses: github/codeql-action/upload-sarif@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
7272
with:
7373
sarif_file: results.sarif

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permissions: read-all
99

1010
jobs:
1111
pre-commit:
12-
runs-on: ubuntu-latest
12+
runs-on: ubuntu-22.04
1313
steps:
1414
- name: Set up clang-format
1515
run: |

dpnp/backend/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ set(DPNP_SRC
3131
kernels/dpnp_krnl_mathematical.cpp
3232
kernels/dpnp_krnl_random.cpp
3333
kernels/dpnp_krnl_sorting.cpp
34-
kernels/dpnp_krnl_statistics.cpp
35-
src/constants.cpp
3634
src/dpnp_iface_fptr.cpp
3735
src/memory_sycl.cpp
3836
src/queue_sycl.cpp

0 commit comments

Comments
 (0)