diff --git a/.github/workflows/build-sphinx.yml b/.github/workflows/build-sphinx.yml index 46d6667b99b..c1a10a4715e 100644 --- a/.github/workflows/build-sphinx.yml +++ b/.github/workflows/build-sphinx.yml @@ -104,7 +104,6 @@ jobs: - name: Setup miniconda uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4 with: - miniforge-variant: Mambaforge miniforge-version: latest use-mamba: true channels: conda-forge diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 4481223e052..6c34fa976d7 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -103,7 +103,6 @@ jobs: - name: Setup miniconda uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4 with: - miniforge-variant: Mambaforge miniforge-version: latest use-mamba: true channels: conda-forge @@ -197,7 +196,6 @@ jobs: - name: Setup miniconda uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4 with: - miniforge-variant: Mambaforge miniforge-version: latest use-mamba: true channels: conda-forge @@ -327,7 +325,6 @@ jobs: - name: Setup miniconda uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4 with: - miniforge-variant: Mambaforge miniforge-version: latest use-mamba: true channels: conda-forge @@ -469,7 +466,6 @@ jobs: - name: Setup miniconda uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4 with: - miniforge-variant: Mambaforge miniforge-version: latest use-mamba: true channels: conda-forge @@ -505,7 +501,6 @@ jobs: steps: - uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4 with: - miniforge-variant: Mambaforge miniforge-version: latest use-mamba: true channels: conda-forge diff --git a/.github/workflows/generate_coverage.yaml b/.github/workflows/generate_coverage.yaml index 3db8f2e311a..36a7aecf28d 100644 --- a/.github/workflows/generate_coverage.yaml +++ b/.github/workflows/generate_coverage.yaml @@ -62,7 +62,6 @@ jobs: - name: Setup miniconda uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4 with: - miniforge-variant: Mambaforge miniforge-version: latest use-mamba: true channels: conda-forge diff --git a/CHANGELOG.md b/CHANGELOG.md index f7badbdd430..1c5ff2d0368 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,12 +10,14 @@ This is a bug-fix release. ### Changed +* Changed to use `Miniforge` installer in GutHub actions [#2057](https://github.com/IntelPython/dpnp/pull/2057) * Updated `README.md` to reflect current installation requirements and available options [#2166](https://github.com/IntelPython/dpnp/pull/2166) * Corrected a list of owners and code maintainers [#2185](https://github.com/IntelPython/dpnp/pull/2185) ### Fixed * Resolved an issue with Compute Follows Data inconsistency in `dpnp.extract` function [#2172](https://github.com/IntelPython/dpnp/pull/2172) +* Resolved a compilation error when building with DPC++ 2025.1 compiler [#2211](https://github.com/IntelPython/dpnp/pull/2211) ## [0.16.0] - 10/14/2024 diff --git a/dpnp/backend/kernels/dpnp_krnl_common.cpp b/dpnp/backend/kernels/dpnp_krnl_common.cpp index b1d864327e6..453c9a88747 100644 --- a/dpnp/backend/kernels/dpnp_krnl_common.cpp +++ b/dpnp/backend/kernels/dpnp_krnl_common.cpp @@ -33,11 +33,23 @@ #include "queue_sycl.hpp" #include +/** + * Version of SYCL DPC++ 2025.1 compiler where support of + * sycl::ext::oneapi::experimental::properties was added. + */ +#ifndef __SYCL_COMPILER_REDUCTION_PROPERTIES_SUPPORT +#define __SYCL_COMPILER_REDUCTION_PROPERTIES_SUPPORT 20241129 +#endif + namespace mkl_blas = oneapi::mkl::blas; namespace mkl_blas_cm = oneapi::mkl::blas::column_major; namespace mkl_blas_rm = oneapi::mkl::blas::row_major; namespace mkl_lapack = oneapi::mkl::lapack; +#if __SYCL_COMPILER_VERSION >= __SYCL_COMPILER_REDUCTION_PROPERTIES_SUPPORT +namespace syclex = sycl::ext::oneapi::experimental; +#endif + template @@ -76,8 +88,13 @@ sycl::event dot(sycl::queue &queue, cgh.parallel_for( sycl::range<1>{size}, sycl::reduction( - result_out, std::plus<_DataType_output>(), - sycl::property::reduction::initialize_to_identity{}), + result_out, sycl::plus<_DataType_output>(), +#if __SYCL_COMPILER_VERSION >= __SYCL_COMPILER_REDUCTION_PROPERTIES_SUPPORT + syclex::properties(syclex::initialize_to_identity) +#else + sycl::property::reduction::initialize_to_identity {} +#endif + ), [=](sycl::id<1> idx, auto &sum) { sum += static_cast<_DataType_output>( input1_in[idx * input1_strides]) * diff --git a/tests/third_party/cupy/creation_tests/test_ranges.py b/tests/third_party/cupy/creation_tests/test_ranges.py index 92c81061b7a..bd3a21539ae 100644 --- a/tests/third_party/cupy/creation_tests/test_ranges.py +++ b/tests/third_party/cupy/creation_tests/test_ranges.py @@ -172,7 +172,7 @@ def test_linspace_float_overflow(self, xp): dtype = cupy.default_float_type() return xp.linspace(0.0, xp.finfo(dtype).max / 5, 10, dtype=dtype) - @testing.numpy_cupy_allclose() + @testing.numpy_cupy_allclose(rtol={numpy.float32: 1e-6, "default": 1e-7}) def test_linspace_float_underflow(self, xp): # find minimum subnormal number dtype = cupy.default_float_type()