8000 BLD: make macOS version check for Accelerate NEWLAPACK more robust by rgommers · Pull Request #25040 · numpy/numpy · GitHub
[go: up one dir, main page]

Skip to content

BLD: make macOS version check for Accelerate NEWLAPACK more robust #25040

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 1 commit into from
Oct 31, 2023

Conversation

rgommers
Copy link
Member

Incorporates numpy/meson#6

Closes gh-25026

[skip azp] [skip circle]

@rgommers rgommers added 00 - Bug Meson Items related to the introduction of Meson as the new build system for NumPy labels Oct 31, 2023
@github-actions github-actions bot added the 36 - Build Build related PR label Oct 31, 2023
@rgommers rgommers added the 09 - Backport-Candidate PRs tagged should be backported label Oct 31, 2023
@rgommers rgommers added this to the 2.0.0 release milestone Oct 31, 2023
@charris charris merged commit 2f34979 into numpy:main Oct 31, 2023
@charris
Copy link
Member
charris commented Oct 31, 2023

Thanks Ralf.

@rgommers rgommers deleted the fix-macos-version-check branch October 31, 2023 13:12
@charris
Copy link
Member
charris commented Oct 31, 2023

This doesn't want to backport. Do we need #25008 as well?

@rgommers
Copy link
Member Author

Ah fun with git submodules. We don't strictly need gh-25008 and it's a large PR, that's why I didn't mark it for a backport. However, we either need to backport that or we need to create a new branch specific to 1.26.x in our fork of meson. Either option works here, but I'm thinking that it's helpful to minimize differences between main and 1.26.x given that we may need to backport more changes (there's at least one more BLAS-related fix coming) and given that 1.26.x will likely be a fairly long-lived branch.

So let's backport both? If you want me to deal with it, just say the word.

@charris
Copy link
Member
charris commented Nov 1, 2023

The problems with #25008 are likely to be because of the because of the core -> _core rename, which only affects three files, so probably not too bad. If there were a git checkout ... as <new_name> it would be easy :) Let me give it a shot tomorrow.

@charris
Copy link
Member
charris commented Nov 1, 2023

@rgommers The way to deal with the renames is to download the PR as a patch and edit the files before applying. Unfortunately, you have been happily removing distutils related stuff :) The easy way to fix that is to give up on setup for 1.26, which seems reasonable to me. Or we could just go with a 1.27 ...

@charris
Copy link
Member
charris commented Nov 1, 2023

I think the moral of that story is "Don't try to support two build systems". We have been there before.

@rgommers
Copy link
Member Author
rgommers commented Nov 1, 2023

Yes, I think we can drop setup.py based builds in 1.26.x, I don't see a downside to that. Everyone who still needs them can use 1.25.2 or 1.26.1

@charris charris removed the 09 - Backport-Candidate PRs tagged should be backported label Nov 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
00 - Bug 36 - Build Build related PR Meson Items related to the introduction of Meson as the new build system for NumPy
Projects
None yet
Development

Successfully merging this pull request may close these issues.

BUG(?): Symbol not found: _cblas_caxpy$NEWLAPACK
2 participants
0