8000 BLD: update vendored Meson to 1.5.2 by rgommers · Pull Request #27550 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

BLD: update vendored Meson to 1.5.2 #27550

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Oct 15, 2024
Merged

BLD: update vendored Meson to 1.5.2 #27550

merged 2 commits into from
Oct 15, 2024

Conversation

rgommers
Copy link
Member
@rgommers rgommers commented Oct 14, 2024 •
edited
Loading

@rgommers rgommers added component: build Meson Items related to the introduction of Meson as the new build system for NumPy labels Oct 14, 2024
@rgommers rgommers marked this pull request as draft October 14, 2024 12:00
@github-actions github-actions bot added the 36 - Build Build related PR label Oct 14, 2024
@rgommers
Copy link
Member Author

The only CI failures are unrelated (due to gh-27548). The BLAS detection in those two failing jobs worked fine, so this looks about ready.

Will add another fix and retest.

@rgommers rgommers mentioned this pull request Oct 14, 2024
Merged
@charris charris added the 09 - Backport-Candidate PRs tagged should be backported label Oct 14, 2024
@charris
Copy link
Member
charris commented Oct 14, 2024

Tagged this for backport, I will be making at least one more 2.1 release.

@rgommers rgommers mentioned this pull request Oct 14, 2024
Merged
@rgommers rgommers added this to the 2.2.0 release milestone Oct 14, 2024
@charris
Copy link
Member
charris commented Oct 14, 2024

Is this based off current main? The macos failure might go away with a rebase.

@rgommers
Copy link
Member Author
rgommers commented Oct 14, 2024 •
edited
Loading

Yeah it's up-to-date, only a few commits behind. The macOS conda-forge failure is coming in with the AIX linker change in the vendored Meson it looked like, the job is passing on the first commit in this PR EDIT: looks like it was flaky - it's failing again. Still puzzled by it though, not sure what's going on there.

I'll drop the change for now - the primary goal here is to update to Meson 1.5.x and get free-threading on Windows going.

@rgommers
Copy link
Member Author

Ugh, the macOS failure is a flake that just happened to also touch on icc. It shows up on gh-27544 from 3 days ago as well, and also on several other issues from years ago (e.g., gh-17635). None of the other issues have an explanation.

@mattip
Copy link
Member
mattip commented Oct 14, 2024

I see the test run is using xdist with two workers. Is there something in the test that is not thread safe? Maybe some other test is importing and changing sys.modules in parallel with this one?

@mattip
Copy link
Member
mattip commented Oct 14, 2024

The failures are in numpy.distutils which is deprecated. Can we avoid testing whether any of its API has changed?

@charris
Copy link
Member
charris commented Oct 14, 2024

macOS failure is a flake

The reason I ask is that it was common until a cache update. See #27532.

@rgommers
Copy link
Member Author

The reason I ask is that it was common until a cache update.

Hmm, not impossible, although I think my initial PR included that fix already (it was anchored on a commit only 2 days old). That said, your "wrong setuptools version" is quite plausible.

The failures are in numpy.distutils which is deprecated. Can we avoid testing whether any of its API has changed?

An easy way to do that would be to bump this CI job to use Python 3.12 (assuming nothing else is broken there). I'll check that.

@rgommers rgommers mentioned this pull request Oct 14, 2024
Merged
@mattip
Copy link
Member
mattip commented Oct 14, 2024

Did you mean to change this?

numpy/.github/workflows/macos.yml

Line 28 in 855bed7

python-version: ["3.11"]

@charris
Copy link
Member
charris commented Oct 14, 2024

Note that the problems seemed to start with a new release of 3.11.

@rgommers
Copy link
Member Author

Did you mean to change this?

Yes indeed. Done in gh-27555.

@rgommers
BLD: update vendored Meson to include a fix for AIX
467dfc4 
Will be included upstream in Meson 1.6.0; cherry-picked in
numpy/meson#17.
@rgommers rgommers added the 39 - free-threading PRs and issues related to support for free-threading CPython (a.k.a. no-GIL, PEP 703) label Oct 15, 2024
@rgommers rgommers marked this pull request as ready for review October 15, 2024 09:08
@rgommers
Copy link
Member Author

Okay, this is finally ready now. I updated the PR description with what it adds/fixes. Should be back-portable for 2.1.3.

@rgommers rgommers mentioned this pull request Oct 15, 2024
Merged
@charris charris merged commit 45ae70d into numpy:main Oct 15, 2024
65 of 67 checks passed
@charris
Copy link
Member
charris commented Oct 15, 2024

Thanks Ralf.

@rgommers rgommers deleted the update-meson-152 branch October 15, 2024 14:32
@charris charris mentioned this pull request Oct 15, 2024
Merged
@charris charris removed the 09 - Backport-Candidate PRs tagged should be backported label Oct 15, 2024
@charris charris mentioned this pull request Oct 15, 2024
Merged
@rgommers rgommers mentioned this pull request Jun 6, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
36 - Build Build related PR 39 - free-threading PRs and issues related to support for free-threading CPython (a.k.a. no-GIL, PEP 703) component: build Meson Items related to the introduction of Meson as the new build system for NumPy
Projects
None yet
Milestone
2.2.0 release
Development

Successfully merging this pull request may close these issues.

numpy 2.0.1 build issue on ibm AIX OS
3 participants
@rgommers @charris @mattip
0