From 813125aacf9695c27c57773c9276cc4f84edaa0d Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Fri, 20 Dec 2024 09:43:40 +0100 Subject: [PATCH 1/3] Backport gh-2231 --- dpnp/backend/kernels/dpnp_krnl_common.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dpnp/backend/kernels/dpnp_krnl_common.cpp b/dpnp/backend/kernels/dpnp_krnl_common.cpp index 453c9a88747..3acbb157344 100644 --- a/dpnp/backend/kernels/dpnp_krnl_common.cpp +++ b/dpnp/backend/kernels/dpnp_krnl_common.cpp @@ -38,7 +38,7 @@ * sycl::ext::oneapi::experimental::properties was added. */ #ifndef __SYCL_COMPILER_REDUCTION_PROPERTIES_SUPPORT -#define __SYCL_COMPILER_REDUCTION_PROPERTIES_SUPPORT 20241129 +#define __SYCL_COMPILER_REDUCTION_PROPERTIES_SUPPORT 20241210L #endif namespace mkl_blas = oneapi::mkl::blas; From a492feafe7de091d5d347bdb647ac1eb66acc2d6 Mon Sep 17 00:00:00 2001 From: Anton <100830759+antonwolfy@users.noreply.github.com> Date: Mon, 16 Dec 2024 16:27:53 +0100 Subject: [PATCH 2/3] mamba search does not accept --info option (#2236) The PR proposes to resolve the issue observing in GitHub actions where `mamba search --info` results into `The following argument was not expected: --info` error. The error started to be reported since `mamba==2.0.5` release. As a workaround it is proposed to switch to `conda search --info` command which works properly. Note, #2231 is tuned here to consider available DPC++ version on Windows. --- .github/workflows/conda-package.yml | 7 +++---- dpnp/backend/kernels/dpnp_krnl_common.cpp | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 6c34fa976d7..ecfa0ac2ca7 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -214,7 +214,7 @@ jobs: - name: Test conda channel run: | - mamba search ${{ env.PACKAGE_NAME }} -c ${{ env.channel-path }} --override-channels --info --json > ${{ env.ver-json-path }} + conda search ${{ env.PACKAGE_NAME }} -c ${{ env.channel-path }} --override-channels --info --json > ${{ env.ver-json-path }} cat ${{ env.ver-json-path }} - name: Collect dependencies @@ -266,8 +266,7 @@ jobs: id: run_tests_linux uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0 with: - shell: bash - timeout_minutes: 10 + timeout_minutes: 12 max_attempts: ${{ env.RUN_TESTS_MAX_ATTEMPTS }} retry_on: any command: | @@ -351,7 +350,7 @@ jobs: - name: Test conda channel run: | @echo on - mamba search ${{ env.PACKAGE_NAME }} -c ${{ env.channel-path }} --override-channels --info --json > ${{ env.ver-json-path }} + conda search ${{ env.PACKAGE_NAME }} -c ${{ env.channel-path }} --override-channels --info --json > ${{ env.ver-json-path }} - name: Dump version.json run: more ${{ env.ver-json-path }} diff --git a/dpnp/backend/kernels/dpnp_krnl_common.cpp b/dpnp/backend/kernels/dpnp_krnl_common.cpp index 3acbb157344..545dce251ac 100644 --- a/dpnp/backend/kernels/dpnp_krnl_common.cpp +++ b/dpnp/backend/kernels/dpnp_krnl_common.cpp @@ -38,7 +38,7 @@ * sycl::ext::oneapi::experimental::properties was added. */ #ifndef __SYCL_COMPILER_REDUCTION_PROPERTIES_SUPPORT -#define __SYCL_COMPILER_REDUCTION_PROPERTIES_SUPPORT 20241210L +#define __SYCL_COMPILER_REDUCTION_PROPERTIES_SUPPORT 20241208L #endif namespace mkl_blas = oneapi::mkl::blas; From 88542e4dcfd0c1e0367ffe459344528bd443bcdc Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Fri, 20 Dec 2024 09:53:08 +0100 Subject: [PATCH 3/3] Populate changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72c5b672989..c9552e9090f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.16.3] - 12/20/2024 + +### Fixed + +* Bumped min version of DPC++ compiler required to support experimental SYCL properties [#2231](https://github.com/IntelPython/dpnp/pull/2231) + + ## [0.16.2] - 12/20/2024 ### Fixed