From 92a0068f6ee357c693c0c6d22f214082e257786e Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Thu, 27 Mar 2025 18:46:38 +0100 Subject: [PATCH 1/2] Bump DPC++ compiler and MKL versions used in build --- .github/workflows/conda-package.yml | 4 ++-- dpnp/tests/test_statistics.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 62a0e4390d73..9baa073feebb 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -93,13 +93,13 @@ jobs: continue-on-error: true run: conda build --no-test --python ${{ matrix.python }} --numpy 2.0 ${{ env.channels-list }} conda-recipe env: - MAX_BUILD_CMPL_MKL_VERSION: '2025.1a0' + MAX_BUILD_CMPL_MKL_VERSION: '2025.2a0' - name: ReBuild conda package if: steps.build_conda_pkg.outcome == 'failure' run: conda build --no-test --python ${{ matrix.python }} --numpy 2.0 ${{ env.channels-list }} conda-recipe env: - MAX_BUILD_CMPL_MKL_VERSION: '2025.1a0' + MAX_BUILD_CMPL_MKL_VERSION: '2025.2a0' - name: Upload artifact uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 diff --git a/dpnp/tests/test_statistics.py b/dpnp/tests/test_statistics.py index e9d303ce6b90..6c77f6d5a4af 100644 --- a/dpnp/tests/test_statistics.py +++ b/dpnp/tests/test_statistics.py @@ -19,6 +19,7 @@ get_float_complex_dtypes, get_float_dtypes, has_support_aspect64, + is_win_platform, numpy_version, ) from .third_party.cupy.testing import with_requires @@ -197,6 +198,7 @@ def _get_kwargs(mode=None, method=None): def setup_method(self): numpy.random.seed(0) + # @pytest.mark.skipif(is_win_platform(), reason="SAT-7784") @pytest.mark.parametrize( "a, v", [([1], [1, 2, 3]), ([1, 2, 3], [1]), ([1, 2, 3], [1, 2])] ) @@ -216,6 +218,7 @@ def test_correlate(self, a, v, mode, dtype, method): assert_dtype_allclose(result, expected) + # @pytest.mark.skipif(is_win_platform(), reason="SAT-7784") @pytest.mark.parametrize("a_size", [1, 100, 10000]) @pytest.mark.parametrize("v_size", [1, 100, 10000]) @pytest.mark.parametrize("mode", ["full", "valid", "same"]) From b31329ad35f6c96dd6827e38d2977ddbaa64202e Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Fri, 28 Mar 2025 10:13:32 +0100 Subject: [PATCH 2/2] Change priority of conda channels in check MKL i/f workflow --- .github/workflows/check-mkl-interfaces.yaml | 2 +- dpnp/tests/test_statistics.py | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/check-mkl-interfaces.yaml b/.github/workflows/check-mkl-interfaces.yaml index 2170cbc30acc..fb294e7c4929 100644 --- a/.github/workflows/check-mkl-interfaces.yaml +++ b/.github/workflows/check-mkl-interfaces.yaml @@ -48,7 +48,7 @@ jobs: - name: Merge conda env files run: | - conda-merge ${{ env.build-with-oneapi-env }} ${{ env.dpctl-pkg-env }} ${{ env.oneapi-pkgs-env }} > ${{ env.environment-file }} + conda-merge ${{ env.dpctl-pkg-env }} ${{ env.oneapi-pkgs-env }} ${{ env.build-with-oneapi-env }} > ${{ env.environment-file }} cat ${{ env.environment-file }} - name: Upload artifact diff --git a/dpnp/tests/test_statistics.py b/dpnp/tests/test_statistics.py index 6c77f6d5a4af..e9d303ce6b90 100644 --- a/dpnp/tests/test_statistics.py +++ b/dpnp/tests/test_statistics.py @@ -19,7 +19,6 @@ get_float_complex_dtypes, get_float_dtypes, has_support_aspect64, - is_win_platform, numpy_version, ) from .third_party.cupy.testing import with_requires @@ -198,7 +197,6 @@ def _get_kwargs(mode=None, method=None): def setup_method(self): numpy.random.seed(0) - # @pytest.mark.skipif(is_win_platform(), reason="SAT-7784") @pytest.mark.parametrize( "a, v", [([1], [1, 2, 3]), ([1, 2, 3], [1]), ([1, 2, 3], [1, 2])] ) @@ -218,7 +216,6 @@ def test_correlate(self, a, v, mode, dtype, method): assert_dtype_allclose(result, expected) - # @pytest.mark.skipif(is_win_platform(), reason="SAT-7784") @pytest.mark.parametrize("a_size", [1, 100, 10000]) @pytest.mark.parametrize("v_size", [1, 100, 10000]) @pytest.mark.parametrize("mode", ["full", "valid", "same"])