Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ This release is compatible with NumPy 2.5.
* Fixed `dpnp.linalg.svd(..., hermitian=True)` returning a non-unitary `vh` for singular input arrays due to a zero sign appearing [#2954](https://github.com/IntelPython/dpnp/pull/2954)
* Fixed scalar conversion of size-one `dpnp.tensor.usm_ndarray` (e.g. `int()`, `float()`, indexing) which failed with NumPy 2.5 after the in-place `ndarray.shape` assignment was deprecated [#2958](https://github.com/IntelPython/dpnp/pull/2958)
* Fixed `dpnp.mgrid` and `dpnp.ogrid` to return consistent results between single-slice and tuple-of-slices syntax when the step is a complex number with a non-integer magnitude (e.g. `2.5j`) [#2971](https://github.com/IntelPython/dpnp/pull/2971)
* Fixed `icx`/`icpx` warning during `conda build` by stripping the GCC-only `-fno-merge-constants` flag injected by conda-forge into `CFLAGS`/`CXXFLAGS` [#2978](https://github.com/IntelPython/dpnp/pull/2978)

### Security

Expand Down
7 changes: 7 additions & 0 deletions conda-recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@ fi
export CC=icx
export CXX=icpx

# conda-forge's gcc/g++ activation injects -fno-merge-constants into CFLAGS/CXXFLAGS
# when CONDA_BUILD==1, while icx/icpx doesn't support it and emit the warning.
# See CMPLRLLVM-19167 / CMPLRLLVM-28729 for more context and PR which added the flag:
# https://github.com/conda-forge/ctng-compiler-activation-feedstock/pull/193
Comment thread
antonwolfy marked this conversation as resolved.
export CFLAGS="${CFLAGS//-fno-merge-constants/}"
export CXXFLAGS="${CXXFLAGS//-fno-merge-constants/}"

export CMAKE_GENERATOR=Ninja
# Make CMake verbose
export VERBOSE=1
Expand Down
Loading