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 @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Fixed `absolute` (float32/float64) returning `-NaN` for `+NaN` input on the scalar fallback path (same issue as numpy/numpy@dc478c58b9, gh-31433) [gh-269](https://github.com/IntelPython/mkl_umath/pull/269)
* Fixed an over-decref of the borrowed module dictionary reference on the module initialization error path [gh-264](https://github.com/IntelPython/mkl_umath/pull/264)
* Fixed a leak of the module object when the NumPy C-API import fails during module initialization [gh-263](https://github.com/IntelPython/mkl_umath/pull/263)
* Fixed `ImportError` on Linux/macOS when built with `meson-python` >= 0.22, which strips the `$ORIGIN` RPATH Meson auto-inserts for internal `link_with` dependencies [gh-275](https://github.com/IntelPython/mkl_umath/pull/275)

### Removed
* Removed the `python-gil` constraint from the conda recipes, which pinned `mkl_umath` to GIL-enabled Python 3.14 builds [gh-255](https://github.com/IntelPython/mkl_umath/pull/255)
Expand Down
8 changes: 8 additions & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,13 @@ gen_loops_h = custom_target(
depends: gen_umath_c
)

# RPATHs for the installed targets, relative to each target's location:
# origin -> the package dir holding libmkl_umath_loops.so, which the
# extension modules link against
# origin/../.. \ the environment library dir, where the MKL runtime lives
# origin/../../.. /
# Passed as raw link_args (not install_rpath) so meson-python preserves them on
# every supported version. Empty on Windows, which has no RPATH concept.
rpath_link_args = []
if host_machine.system() != 'windows'
if host_machine.system() == 'darwin'
Expand All @@ -158,6 +165,7 @@ if host_machine.system() != 'windows'
endif

rpath_link_args = [
'-Wl,-rpath,' + origin,
'-Wl,-rpath,' + origin / '../..',
'-Wl,-rpath,' + origin / '../../..',
]
Expand Down
Loading