8000 BLD: Update vendor-meson to fix module_feature conflicts arguments bug by seiko2plus · Pull Request #28635 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

BLD: Update vendor-meson to fix module_feature conflicts arguments bug #28635

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 1 commit into from
Apr 26, 2025
Merged

BLD: Update vendor-meson to fix module_feature conflicts arguments bug #28635

merged 1 commit into from
Apr 26, 2025

Conversation

seiko2plus
Copy link
Member

Bug detected and fixed by @Vogtinator in PR numpy/meson#12. The issue was located in the Meson features module, and implementing the fix will require updating the vendored Meson repository.

@github-actions github-actions bot added the 36 - Build Build related PR label Apr 3, 2025
@seiko2plus seiko2plus force-pushed the update_vendor_meson branch from 54a6976 to 4f767a7 Compare April 3, 2025 11:07
@seiko2plus
Copy link
Member Author

Fixed the build but I got segfault, maybe its qemu bug. re-test it after brings native armhf support via #28653

@seiko2plus seiko2plus mentioned this pull request Apr 5, 2025
Merged
@charris charris mentioned this pull request Apr 6, 2025
Merged
@charris
Copy link
Member
charris commented Apr 6, 2025

@rgommers Is the meson update OK?

@rgommers
Copy link
Member
rgommers commented Apr 6, 2025

@rgommers Is the meson update OK?

Yes that's on purpose here. Once CI is green here, numpy/meson#12 can be merged and this PR updated to include the main-numpymeson branch of https://github.com/numpy/meson

@charris
Copy link
Member
charris commented Apr 6, 2025

The failure looks meson related. Caching? Or maybe the submodule needs an update.

    raise RuntimeError(
        "Meson configuration failed; please try `spin build` again with the `--clean` flag."
    )

@seiko2plus
Copy link
Member Author
seiko2plus commented Apr 6, 2025 •
edited
Loading

The failure looks meson related. Caching? Or maybe the submodule needs an update.

That's true, the submodule (the pr hash) needs a rebase since it's known blas issue this has been fixed in later meson versions, but it can be ignored for now. What matters is the armhf error needs to be green as Ralf explained.

current armhf error: numpy/_core/tests/test_memmap.py . [ 0%] numpy/_core/tests/test_multiarray.py ................................... [ 0%] ....................................................s................... [ 0%] ............................................XX.......................... [ 0%] .Fatal Python error: Aborted

Current thread 0x41007020 (most recent call first):
File "/numpy/build-install/usr/lib/python3/dist-packages/numpy/_core/fromnumeric.py", line 1122 in sort
File "/numpy/build-install/usr/lib/python3/dist-packages/numpy/_core/tests/test_multiarray.py", line 2094 in test_sort
File "/usr/local/lib/python3.10/dist-packages/_pytest/python.py", line 159 in pytest_pyfunc_call
File "/usr/local/lib/python3.10/dist-packages/pluggy/_callers.py", line 103 in _multicall
File "/usr/local/lib/python3.10/dist-packages/pluggy/_manager.py", line 120 in _hookexec
File "/usr/local/lib/python3.10/dist-packages/pluggy/_hooks.py", line 513 in call
File "/usr/local/lib/python3.10/dist-packages/_pytest/python.py", line 1627 in runtest
File "/usr/local/lib/python3.10/dist-packages/_pytest/runner.py", line 174 in pytest_runtest_call
File "/usr/local/lib/python3.10/dist-packages/pluggy/_callers.py", line 103 in _multicall
File "/usr/local/lib/python3.10/dist-packages/pluggy/_manager.py", line 120 in _hookexec
File "/usr/local/lib/python3.10/dist-packages/pluggy/_hooks.py", line 513 in call
File "/usr/local/lib/python3.10/dist-packages/_pytest/runner.py", line 242 in
File "/usr/local/lib/python3.10/dist-packages/_pytest/runner.py", line 341 in from_call
File "/usr/local/lib/python3.10/dist-packages/_pytest/runner.py", line 241 in call_and_report
File "/usr/local/lib/python3.10/dist-packages/_pytest/runner.py", line 132 in runtestprotocol
File "/usr/local/lib/python3.10/dist-packages/_pytest/runner.py", line 113 in pytest_runtest_protocol
File "/usr/local/lib/python3.10/dist-packages/pluggy/_callers.py", line 103 in _multicall
File "/usr/local/lib/python3.10/dist-packages/pluggy/_manager.py", line 120 in _hookexec
File "/usr/local/lib/python3.10/dist-packages/pluggy/_hooks.py", line 513 in call
File "/usr/local/lib/python3.10/dist-packages/_pytest/main.py", line 362 in pytest_runtestloop
File "/usr/local/lib/python3.10/dist-packages/pluggy/_callers.py", line 103 in _multicall
File "/usr/local/lib/python3.10/dist-packages/pluggy/_manager.py", line 120 in _hookexec
File "/usr/local/lib/python3.10/dist-packages/pluggy/_hooks.py", line 513 in call
File "/usr/local/lib/python3.10/dist-packages/_pytest/main.py", line 337 in _main
File "/usr/local/lib/python3.10/dist-packages/_pytest/main.py", line 283 in wrap_session
File "/usr/local/lib/python3.10/dist-packages/_pytest/main.py", line 330 in pytest_cmdline_main
File "/usr/local/lib/python3.10/dist-packages/pluggy/_callers.py", line 103 in _multicall
File "/usr/local/lib/python3.10/dist-packages/pluggy/_manager.py", line 120 in _hookexec
File "/usr/local/lib/python3.10/dist-packages/pluggy/_hooks.py", line 513 in call
File "/usr/local/lib/python3.10/dist-packages/_pytest/config/init.py", line 175 in main
File "/usr/local/lib/python3.10/dist-packages/_pytest/config/init.py", line 201 in console_main
File "/usr/local/bin/pytest", line 8 in

Extension modules: numpy._core._multiarray_umath, numpy.linalg._umath_linalg, numpy._core._multiarray_tests, numpy._core._rational_tests, numpy._core._umath_tests, cython.cimports.libc.math, numpy.random._common, numpy.random.bit_generator, numpy.random._bounded_integers, numpy.random._mt19937, numpy.random.mtrand, numpy.random._philox, numpy.random._pcg64, numpy.random._sfc64, numpy.random._generator, numpy._core._struct_ufunc_tests, numpy._core._simd, numpy._core._operand_flag_tests, numpy.linalg.lapack_lite (total: 19)

close/open, re-test we have native armhf support now.

@seiko2plus seiko2plus closed this Apr 6, 2025
@seiko2plus seiko2plus reopened this Apr 6, 2025
@seiko2plus seiko2plus force-pushed the update_vendor_meson branch 3 times, most recently from 176ec5b to 26074af Compare April 8, 2025 11:00
@seiko2plus seiko2plus mentioned this pull request Apr 8, 2025
Merged
@seiko2plus
Copy link
Member Author

@rgommers, I moved link error fix into a separated pull-request #28671

@seiko2plus seiko2plus force-pushed the update_vendor_meson branch from 26074af to 4f767a7 Compare April 10, 2025 10:27
@seberg seberg added this to the 2.3.0 release milestone Apr 23, 2025
@seiko2plus seiko2plus mentioned this pull request Apr 26, 2025
Closed
@seiko2plus seiko2plus force-pushed the update_vendor_meson branch from 4f767a7 to 1cb8aa1 Compare April 26, 2025 16:34
@seiko2plus
Update vendor-meson to fix module_feature conflicts arguments bug
1d261ff 
Fix incorrect handling of the compiler arguments 'conflicts' that
was causing failures when detecting asmid instructions at compile time on
aarch32 platforms.
@seiko2plus seiko2plus marked this pull request as ready for review April 26, 2025 17:12
@seiko2plus seiko2plus changed the title BLD: Fix ASIMD feature build on AArch32 Update vendor-meson to fix module_feature conflicts arguments bug Apr 26, 2025
@seiko2plus seiko2plus added the 09 - Backport-Candidate PRs tagged should be backported label Apr 26, 2025
@charris charris changed the title Update vendor-meson to fix module_feature conflicts arguments bug BLD: Update vendor-meson to fix module_feature conflicts arguments bug Apr 26, 2025
@charris charris merged commit 94b232f into numpy:main Apr 26, 2025
73 checks passed
@charris
Copy link
Member
charris commented Apr 26, 2025

Thanks Sayed.

@charris charris mentioned this pull request Apr 28, 2025
Merged
@charris charris removed the 09 - Backport-Candidate PRs tagged should be backported label Apr 28, 2025
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
Projects
None yet
Milestone
2.3.0 release
Development

Successfully merging this pull request may close these issues.
4 participants
@seiko2plus @charris @rgommers @seberg
0