Skip to content

Commit bfb23d9

Browse files
authored
Merge branch 'maintenance/0.16.x' into backport-gh-2185
2 parents 8564a85 + b67e5f6 commit bfb23d9

File tree

6 files changed

+22
-10
lines changed

6 files changed

+22
-10
lines changed

.github/workflows/build-sphinx.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ jobs:
104104
- name: Setup miniconda
105105
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
106106
with:
107-
miniforge-variant: Mambaforge
108107
miniforge-version: latest
109108
use-mamba: true
110109
channels: conda-forge

.github/workflows/conda-package.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ jobs:
103103
- name: Setup miniconda
104104
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
105105
with:
106-
miniforge-variant: Mambaforge
107106
miniforge-version: latest
108107
use-mamba: true
109108
channels: conda-forge
@@ -197,7 +196,6 @@ jobs:
197196
- name: Setup miniconda
198197
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
199198
with:
200-
miniforge-variant: Mambaforge
201199
miniforge-version: latest
202200
use-mamba: true
203201
channels: conda-forge
@@ -327,7 +325,6 @@ jobs:
327325
- name: Setup miniconda
328326
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
329327
with:
330-
miniforge-variant: Mambaforge
331328
miniforge-version: latest
332329
use-mamba: true
333330
channels: conda-forge
@@ -469,7 +466,6 @@ jobs:
469466
- name: Setup miniconda
470467
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
471468
with:
472-
miniforge-variant: Mambaforge
473469
miniforge-version: latest
474470
use-mamba: true
475471
channels: conda-forge
@@ -505,7 +501,6 @@ jobs:
505501
steps:
506502
- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
507503
with:
508-
miniforge-variant: Mambaforge
509504
miniforge-version: latest
510505
use-mamba: true
511506
channels: conda-forge

.github/workflows/generate_coverage.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ jobs:
6262
- name: Setup miniconda
6363
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
6464
with:
65-
miniforge-variant: Mambaforge
6665
miniforge-version: latest
6766
use-mamba: true
6867
channels: conda-forge

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@ This is a bug-fix release.
1010

1111
### Changed
1212

13+
* Changed to use `Miniforge` installer in GutHub actions [#2057](https://github.com/IntelPython/dpnp/pull/2057)
1314
* Updated `README.md` to reflect current installation requirements and available options [#2166](https://github.com/IntelPython/dpnp/pull/2166)
1415
* Corrected a list of owners and code maintainers [#2185](https://github.com/IntelPython/dpnp/pull/2185)
1516

1617
### Fixed
1718

1819
* Resolved an issue with Compute Follows Data inconsistency in `dpnp.extract` function [#2172](https://github.com/IntelPython/dpnp/pull/2172)
20+
* Resolved a compilation error when building with DPC++ 2025.1 compiler [#2211](https://github.com/IntelPython/dpnp/pull/2211)
1921

2022

2123
## [0.16.0] - 10/14/2024

dpnp/backend/kernels/dpnp_krnl_common.cpp

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,23 @@
3333
#include "queue_sycl.hpp"
3434
#include <dpnp_iface.hpp>
3535

36+
/**
37+
* Version of SYCL DPC++ 2025.1 compiler where support of
38+
* sycl::ext::oneapi::experimental::properties was added.
39+
*/
40+
#ifndef __SYCL_COMPILER_REDUCTION_PROPERTIES_SUPPORT
41+
#define __SYCL_COMPILER_REDUCTION_PROPERTIES_SUPPORT 20241129
42+
#endif
43+
3644
namespace mkl_blas = oneapi::mkl::blas;
3745
namespace mkl_blas_cm = oneapi::mkl::blas::column_major;
3846
namespace mkl_blas_rm = oneapi::mkl::blas::row_major;
3947
namespace mkl_lapack = oneapi::mkl::lapack;
4048

49+
#if __SYCL_COMPILER_VERSION >= __SYCL_COMPILER_REDUCTION_PROPERTIES_SUPPORT
50+
namespace syclex = sycl::ext::oneapi::experimental;
51+
#endif
52+
4153
template <typename _KernelNameSpecialization1,
4254
typename _KernelNameSpecialization2,
4355
typename _KernelNameSpecialization3>
@@ -76,8 +88,13 @@ sycl::event dot(sycl::queue &queue,
7688
cgh.parallel_for(
7789
sycl::range<1>{size},
7890
sycl::reduction(
79-
result_out, std::plus<_DataType_output>(),
80-
sycl::property::reduction::initialize_to_identity{}),
91+
result_out, sycl::plus<_DataType_output>(),
92+
#if __SYCL_COMPILER_VERSION >= __SYCL_COMPILER_REDUCTION_PROPERTIES_SUPPORT
93+
syclex::properties(syclex::initialize_to_identity)
94+
#else
95+
sycl::property::reduction::initialize_to_identity {}
96+
#endif
97+
),
8198
[=](sycl::id<1> idx, auto &sum) {
8299
sum += static_cast<_DataType_output>(
83100
input1_in[idx * input1_strides]) *

tests/third_party/cupy/creation_tests/test_ranges.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ def test_linspace_float_overflow(self, xp):
172172
dtype = cupy.default_float_type()
173173
return xp.linspace(0.0, xp.finfo(dtype).max / 5, 10, dtype=dtype)
174174

175-
@testing.numpy_cupy_allclose()
175+
@testing.numpy_cupy_allclose(rtol={numpy.float32: 1e-6, "default": 1e-7})
176176
def test_linspace_float_underflow(self, xp):
177177
# find minimum subnormal number
178178
dtype = cupy.default_float_type()

0 commit comments

Comments
 (0)