Skip to content

CI: use version 0.3.26.0.2 of scipy-openblas wheels #25732

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 2, 2024

Conversation

mattip
Copy link
Member

@mattip mattip commented Jan 31, 2024

Now that the wheel versions are pinned, try the latest version (with a single shared object).

Needed for #25505

@mattip
Copy link
Member Author

mattip commented Jan 31, 2024

Something on musllinux is off, the string replacement function get_library() is not being called when generating the pkg-config file. Is this from the wheel itself or from the build step...

ld: cannot find -l{get_library()}

@mattip mattip changed the title CI: use version 0.3.26.0 of scipy-openblas wheels CI: use version 0.3.26.0.1 of scipy-openblas wheels Feb 1, 2024
@mattip
Copy link
Member Author

mattip commented Feb 1, 2024

Hmm. The older wheels had an empty Libs: line when calling scipy-openblas.get_pkg_config() (on posix). Then the shared object is not built-in to NumPy, and the _distributor_init preloads the shared object into the For the case where we want to replace the tarball with the wheel #25505, we need that line to specify the shared object Libs: -L${libdir} -lscipy_openblas. So in this case I think I need an option to get_pkg_config() which would only be used in the #25505 case. Then the scipy-openblas.pc file would differ depending on the use case.

@mattip
Copy link
Member Author

mattip commented Feb 1, 2024

The chosen solution in the scipy-openblas wheels means that the call to get_pkg_config() in spin will need to become get_pkg_config(use_preloading=True), the ones in #25505 can stay with the default argument

@mattip
Copy link
Member Author

mattip commented Feb 2, 2024

CI is passing, and meson is using the scipy-openblas wheel-provided pkg-config script, for instance in muslinux and windows

Copy link
Member

@rgommers rgommers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, thanks @mattip

@rgommers rgommers added this to the 2.0.0 release milestone Feb 2, 2024
@rgommers rgommers changed the title CI: use version 0.3.26.0.1 of scipy-openblas wheels CI: use version 0.3.26.0.2 of scipy-openblas wheels Feb 2, 2024
@rgommers rgommers merged commit fc20024 into numpy:main Feb 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants