From e19298dd434e459d0ff5500f8520ce5ca6bedd2e Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Tue, 18 Feb 2025 15:21:35 +0100 Subject: [PATCH 1/4] Disable GitHub workflows with python 3.13 --- .github/workflows/check-mkl-interfaces.yaml | 9 +++++++-- .github/workflows/conda-package.yml | 17 ++++++++++++----- .github/workflows/cron-run-tests.yaml | 4 +++- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/.github/workflows/check-mkl-interfaces.yaml b/.github/workflows/check-mkl-interfaces.yaml index 65bc9d4002fd..95fd94519f51 100644 --- a/.github/workflows/check-mkl-interfaces.yaml +++ b/.github/workflows/check-mkl-interfaces.yaml @@ -10,6 +10,9 @@ permissions: read-all env: CHANNELS: '-c dppy/label/dev -c https://software.repos.intel.com/python/conda/ -c conda-forge --override-channels' + # python 3.13 is blocked since BLAS requires "mkl<2025.0" (see https://github.com/conda-forge/blas-feedstock/pull/128 + # which depends on resolving MKL issue https://github.com/conda-forge/intel_repack-feedstock/issues/83) + TEST_PYTHON_VERSION: '3.12' TEST_ENV_NAME: 'test_onemkl_interfaces' RERUN_TESTS_ON_FAILURE: 'true' RUN_TESTS_MAX_ATTEMPTS: 2 @@ -32,7 +35,9 @@ jobs: strategy: matrix: - python: ['3.13'] + # python 3.13 is blocked since BLAS requires "mkl<2025.0" (see https://github.com/conda-forge/blas-feedstock/pull/128 + # which depends on resolving MKL issue https://github.com/conda-forge/intel_repack-feedstock/issues/83) + python: [${{ env.TEST_PYTHON_VERSION }}] os: [ubuntu-22.04] # windows-2019 - no DFT support for Windows in oneMKL permissions: @@ -125,7 +130,7 @@ jobs: strategy: matrix: - python: ['3.13'] + python: [${{ env.TEST_PYTHON_VERSION }}] os: [ubuntu-22.04] # windows-2019 - no DFT support for Windows in oneMKL permissions: diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 8994eb724730..7c43666a670a 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -16,7 +16,9 @@ env: CONDA_BUILD_INDEX_ENV_PY_VER: '3.12' # conda does not support python 3.13 CONDA_BUILD_VERSION: '25.1.1' CONDA_INDEX_VERSION: '0.5.0' - LATEST_PYTHON: '3.13' + # python 3.13 is blocked since BLAS requires "mkl<2025.0" (see https://github.com/conda-forge/blas-feedstock/pull/128 + # which depends on resolving MKL issue https://github.com/conda-forge/intel_repack-feedstock/issues/83) + LATEST_PYTHON: '3.12' RERUN_TESTS_ON_FAILURE: 'true' RUN_TESTS_MAX_ATTEMPTS: 2 TEST_ENV_NAME: 'test' @@ -31,7 +33,9 @@ jobs: strategy: fail-fast: false matrix: - python: ['3.9', '3.10', '3.11', '3.12', '3.13'] + # python 3.13 is blocked since BLAS requires "mkl<2025.0" (see https://github.com/conda-forge/blas-feedstock/pull/128 + # which depends on resolving MKL issue https://github.com/conda-forge/intel_repack-feedstock/issues/83) + python: ['3.9', '3.10', '3.11', '3.12'] os: [ubuntu-22.04, windows-2019] permissions: @@ -124,7 +128,8 @@ jobs: strategy: fail-fast: false matrix: - python: ['3.9', '3.10', '3.11', '3.12', '3.13'] + # python 3.13 is blocked due to MKL issue + python: ['3.9', '3.10', '3.11', '3.12'] os: [ubuntu-latest] env: @@ -253,7 +258,8 @@ jobs: strategy: fail-fast: false matrix: - python: ['3.9', '3.10', '3.11', '3.12', '3.13'] + # python 3.13 is blocked due to MKL issue + python: ['3.9', '3.10', '3.11', '3.12'] os: [windows-2019] env: @@ -389,7 +395,8 @@ jobs: strategy: matrix: - python: ['3.9', '3.10', '3.11', '3.12', '3.13'] + # python 3.13 is blocked due to MKL issue + python: ['3.9', '3.10', '3.11', '3.12'] os: [ubuntu-22.04, windows-2019] runs-on: ${{ matrix.os }} diff --git a/.github/workflows/cron-run-tests.yaml b/.github/workflows/cron-run-tests.yaml index 18ce2ca632e6..4714c8f0f6dd 100644 --- a/.github/workflows/cron-run-tests.yaml +++ b/.github/workflows/cron-run-tests.yaml @@ -37,7 +37,9 @@ jobs: strategy: fail-fast: false matrix: - python: ['3.9', '3.10', '3.11', '3.12', '3.13'] + # python 3.13 is blocked since BLAS requires "mkl<2025.0" (see https://github.com/conda-forge/blas-feedstock/pull/128 + # which depends on resolving MKL issue https://github.com/conda-forge/intel_repack-feedstock/issues/83) + python: ['3.9', '3.10', '3.11', '3.12'] runner: [ubuntu-22.04, ubuntu-24.04, windows-2019] steps: From 8ce477bd758c75e3b3942ce9742bd45876eb4242 Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Tue, 18 Feb 2025 15:29:43 +0100 Subject: [PATCH 2/4] Do not use env variable in the jobs matrix --- .github/workflows/check-mkl-interfaces.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/check-mkl-interfaces.yaml b/.github/workflows/check-mkl-interfaces.yaml index 95fd94519f51..f33c7c741915 100644 --- a/.github/workflows/check-mkl-interfaces.yaml +++ b/.github/workflows/check-mkl-interfaces.yaml @@ -10,9 +10,6 @@ permissions: read-all env: CHANNELS: '-c dppy/label/dev -c https://software.repos.intel.com/python/conda/ -c conda-forge --override-channels' - # python 3.13 is blocked since BLAS requires "mkl<2025.0" (see https://github.com/conda-forge/blas-feedstock/pull/128 - # which depends on resolving MKL issue https://github.com/conda-forge/intel_repack-feedstock/issues/83) - TEST_PYTHON_VERSION: '3.12' TEST_ENV_NAME: 'test_onemkl_interfaces' RERUN_TESTS_ON_FAILURE: 'true' RUN_TESTS_MAX_ATTEMPTS: 2 @@ -37,7 +34,7 @@ jobs: matrix: # python 3.13 is blocked since BLAS requires "mkl<2025.0" (see https://github.com/conda-forge/blas-feedstock/pull/128 # which depends on resolving MKL issue https://github.com/conda-forge/intel_repack-feedstock/issues/83) - python: [${{ env.TEST_PYTHON_VERSION }}] + python: ['3.12'] os: [ubuntu-22.04] # windows-2019 - no DFT support for Windows in oneMKL permissions: @@ -130,7 +127,9 @@ jobs: strategy: matrix: - python: [${{ env.TEST_PYTHON_VERSION }}] + # python 3.13 is blocked since BLAS requires "mkl<2025.0" (see https://github.com/conda-forge/blas-feedstock/pull/128 + # which depends on resolving MKL issue https://github.com/conda-forge/intel_repack-feedstock/issues/83) + python: ['3.12'] os: [ubuntu-22.04] # windows-2019 - no DFT support for Windows in oneMKL permissions: From 8cd154a959225c8c457d4224221fe4642c186405 Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Tue, 18 Feb 2025 15:42:30 +0100 Subject: [PATCH 3/4] There is not way to install DPNP with NumPy 2.0 --- .github/workflows/check-mkl-interfaces.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-mkl-interfaces.yaml b/.github/workflows/check-mkl-interfaces.yaml index f33c7c741915..1e3fed6db5f9 100644 --- a/.github/workflows/check-mkl-interfaces.yaml +++ b/.github/workflows/check-mkl-interfaces.yaml @@ -20,7 +20,7 @@ env: onedpl-devel setuptools python - numpy">=2.0" + numpy cython cmake ninja From 90300cc072d68ed4263c3ff5c4b518e31e10ac40 Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Tue, 18 Feb 2025 18:44:45 +0100 Subject: [PATCH 4/4] Update dpnp.tests.third_party.cupy.manipulation_tests.test_basic::TestCopytoFromScalar to pass for all dtypes --- dpnp/tests/third_party/cupy/manipulation_tests/test_basic.py | 1 + 1 file changed, 1 insertion(+) diff --git a/dpnp/tests/third_party/cupy/manipulation_tests/test_basic.py b/dpnp/tests/third_party/cupy/manipulation_tests/test_basic.py index 59f598c17ad9..4aac9493d0b1 100644 --- a/dpnp/tests/third_party/cupy/manipulation_tests/test_basic.py +++ b/dpnp/tests/third_party/cupy/manipulation_tests/test_basic.py @@ -199,6 +199,7 @@ def test_copyto_multigpu_noncontinguous(self, dtype): testing.assert_array_equal(expected, dst.get()) +@testing.with_requires("numpy>=2.1") @testing.parameterize( *testing.product( {