Skip to content

Commit e69893b

Browse files
authored
Merge branch 'master' into update-tests-search-special-statistics-umath
2 parents 61216dd + b09533e commit e69893b

File tree

4 files changed

+23
-9
lines changed

4 files changed

+23
-9
lines changed

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ env:
2020
onedpl-devel
2121
setuptools
2222
python
23-
numpy">=2.0"
23+
numpy
2424
cython
2525
cmake
2626
ninja
@@ -32,7 +32,9 @@ jobs:
3232

3333
strategy:
3434
matrix:
35-
python: ['3.13']
35+
# python 3.13 is blocked since BLAS requires "mkl<2025.0" (see https://github.com/conda-forge/blas-feedstock/pull/128
36+
# which depends on resolving MKL issue https://github.com/conda-forge/intel_repack-feedstock/issues/83)
37+
python: ['3.12']
3638
os: [ubuntu-22.04] # windows-2019 - no DFT support for Windows in oneMKL
3739

3840
permissions:
@@ -125,7 +127,9 @@ jobs:
125127

126128
strategy:
127129
matrix:
128-
python: ['3.13']
130+
# python 3.13 is blocked since BLAS requires "mkl<2025.0" (see https://github.com/conda-forge/blas-feedstock/pull/128
131+
# which depends on resolving MKL issue https://github.com/conda-forge/intel_repack-feedstock/issues/83)
132+
python: ['3.12']
129133
os: [ubuntu-22.04] # windows-2019 - no DFT support for Windows in oneMKL
130134

131135
permissions:

.github/workflows/conda-package.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ env:
1616
CONDA_BUILD_INDEX_ENV_PY_VER: '3.12' # conda does not support python 3.13
1717
CONDA_BUILD_VERSION: '25.1.1'
1818
CONDA_INDEX_VERSION: '0.5.0'
19-
LATEST_PYTHON: '3.13'
19+
# python 3.13 is blocked since BLAS requires "mkl<2025.0" (see https://github.com/conda-forge/blas-feedstock/pull/128
20+
# which depends on resolving MKL issue https://github.com/conda-forge/intel_repack-feedstock/issues/83)
21+
LATEST_PYTHON: '3.12'
2022
RERUN_TESTS_ON_FAILURE: 'true'
2123
RUN_TESTS_MAX_ATTEMPTS: 2
2224
TEST_ENV_NAME: 'test'
@@ -31,7 +33,9 @@ jobs:
3133
strategy:
3234
fail-fast: false
3335
matrix:
34-
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
36+
# python 3.13 is blocked since BLAS requires "mkl<2025.0" (see https://github.com/conda-forge/blas-feedstock/pull/128
37+
# which depends on resolving MKL issue https://github.com/conda-forge/intel_repack-feedstock/issues/83)
38+
python: ['3.9', '3.10', '3.11', '3.12']
3539
os: [ubuntu-22.04, windows-2019]
3640

3741
permissions:
@@ -124,7 +128,8 @@ jobs:
124128
strategy:
125129
fail-fast: false
126130
matrix:
127-
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
131+
# python 3.13 is blocked due to MKL issue
132+
python: ['3.9', '3.10', '3.11', '3.12']
128133
os: [ubuntu-latest]
129134

130135
env:
@@ -253,7 +258,8 @@ jobs:
253258
strategy:
254259
fail-fast: false
255260
matrix:
256-
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
261+
# python 3.13 is blocked due to MKL issue
262+
python: ['3.9', '3.10', '3.11', '3.12']
257263
os: [windows-2019]
258264

259265
env:
@@ -389,7 +395,8 @@ jobs:
389395

390396
strategy:
391397
matrix:
392-
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
398+
# python 3.13 is blocked due to MKL issue
399+
python: ['3.9', '3.10', '3.11', '3.12']
393400
os: [ubuntu-22.04, windows-2019]
394401

395402
runs-on: ${{ matrix.os }}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ jobs:
3737
strategy:
3838
fail-fast: false
3939
matrix:
40-
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
40+
# python 3.13 is blocked since BLAS requires "mkl<2025.0" (see https://github.com/conda-forge/blas-feedstock/pull/128
41+
# which depends on resolving MKL issue https://github.com/conda-forge/intel_repack-feedstock/issues/83)
42+
python: ['3.9', '3.10', '3.11', '3.12']
4143
runner: [ubuntu-22.04, ubuntu-24.04, windows-2019]
4244

4345
steps:

dpnp/tests/third_party/cupy/manipulation_tests/test_basic.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ def test_copyto_multigpu_noncontinguous(self, dtype):
199199
testing.assert_array_equal(expected, dst.get())
200200

201201

202+
@testing.with_requires("numpy>=2.1")
202203
@testing.parameterize(
203204
*testing.product(
204205
{

0 commit comments

Comments
 (0)