8000 BLD: switch to meson-python as the default build backend by rgommers · Pull Request #23838 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

BLD: switch to meson-python as the default build backend #23838

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

Merged
merged 30 commits into from
Jun 19, 2023
Merged

BLD: switch to meson-python as the default build backend #23838

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
e3cb66a
BLD: default to using meson-python as build backend
rgommers May 29, 2023
ea1bd89
CI: tweak CI for the change to meson-python as default build backend
rgommers May 29, 2023
f7c55aa
CI: drop 32-bit Windows Azure testing, adjust 64-bit for Meson
rgommers May 29, 2023
6c024e4
BLD: fix bug with CMake fallback detection of BLAS/LAPACK
rgommers May 29, 2023
4917ebf
CI: upgrade rtools to 4.3 to get a new enough GCC version in Azure
rgommers May 29, 2023
29dcb05
CI: keep the Emscripten/Pyodide job on a setup.py-based build
rgommers May 29, 2023
618181d
use MSVC and force 64-bit OpenBLAS interfaces
mattip Jun 11, 2023
9a80630
drop rtools in wheel builds, do -DDBLAS_SYMBOL_SUFFIX=64_ differently
mattip Jun 11, 2023
1462b62
typo, install pkg-config on windows
mattip Jun 11, 2023
bebbde7
set PKG_CONFIG_PATH for windows, add CXXFLAGS
mattip Jun 11, 2023
80e0d70
disable pypy builds, move PKG_CONFIG_PATH for windows
mattip Jun 11, 2023
89ffd57
fixes from review, try a -O0 build
mattip Jun 12, 2023
aef314b
BLD: handle license files inclusion in wheels correctly
rgommers Jun 12, 2023
34933ac
windows fixes, xfail test on manylinux2014
mattip Jun 13, 2023
aabacc7
fix PKG_CONFIG_PATH, force vsenv on windows builds, fix glibc version
mattip Jun 13, 2023
2e84e21
reuse parts of scipy's scripts for windows includding delvewheel; fix…
mattip Jun 13, 2023
fae400b
tweaks and xfail a failing test on windows
mattip Jun 13, 2023
1a02d5f
TST: Azure: avoid running tests from root of repo
rgommers Jun 18, 2023
15cfdec
TST: put back xfail for array-api entrypoint temporarily
rgommers Jun 18, 2023
a5ef06b
REL: don't build 32-bit Python wheels with cibuildwheel
rgommers Jun 18, 2023
7948464
TST: disable longdouble string/print tests on Linux aarch64
rgommers Jun 18, 2023
c808cfd
BLD: hack around broken long double size detection on 32-bit Linux
rgommers Jun 18, 2023
9d588cf
TST: fix deprecation warnings from f2py test for ndim>0
rgommers Jun 18, 2023
c41a1e2
TST: xfail einsum int8/uint8 test temporarily
rgommers Jun 18, 2023
515403f
TST: disable `test_new_policy` test for memory allocator.
rgommers Jun 18, 2023
910c686
CI: avoid use of pytest for 32-bit Linux Azure job; remove xml coverage
rgommers Jun 18, 2023
69f26cf
CI: fix ILP64 usage on macOS arm64 with cibuildwheel
rgommers Jun 18, 2023
302f244
CI: disable pypy3.9 job on Azure temporarily
rgommers Jun 18, 2023
11a3cef
BLD: on 32-bit Linux, if `sizeof(long double)` is 12, change format
rgommers Jun 18, 2023
e3ddda5
Merge remote-tracking branch 'upstream/main' into default-to-meson
rgommers Jun 19, 2023
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
8000
Diff view
Prev Previous commit
Next Next commit
disable pypy builds, move PKG_CONFIG_PATH for windows
  • Loading branch information
@mattip @rgommers
mattip authored and rgommers committed Jun 18, 2023
commit 80e0d70b51b939ee53e21e1216ac67ffda3dec87
3 changes: 2 additions & 1 deletion .github/workflows/wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ jobs:
- [macos-12, macosx_x86_64]
- [windows-2019, win_amd64]
- [windows-2019, win32]
python: ["cp39", "cp310", "cp311", "pp39"]
python: ["cp39", "cp310", "cp311"]
# python: ["cp39", "cp310", "cp311", "pp39"]
exclude:
# Don't build PyPy 32-bit windows
- buildplat: [windows-2019, win32]
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,11 @@ test-skip = "*_universal2:arm64"
environment = { CFLAGS="-std=c99 -fno-strict-aliasing -DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", OPENBLAS64_="/usr/local", NPY_USE_BLAS_ILP64="1", CC="clang", CXX = "clang++", RUNNER_OS="macOS"}

[tool.cibuildwheel.windows]
environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", LDFLAGS=""}
environment = { OPENBLAS64_="openblas", OPENBLAS="", NPY_USE_BLAS_ILP64="1", CFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", CXXFLAGS="-DBLAS_SYMBOL_SUFFIX=64_ -DHAVE_BLAS_ILP64", LDFLAGS="", PKG_CONFIG_PATH="D:\\a\\numpy\\numpy\\openblas\\lib\\pkgconfig;"}

[[tool.cibuildwheel.overrides]]
select = "*-win32"
environment = { OPENBLAS64_="", OPENBLAS="openblas", NPY_USE_BLAS_ILP64="0", CFLAGS="-m32", LDFLAGS="-m32" }
environment = { OPENBLAS64_="", OPENBLAS="openblas", NPY_USE_BLAS_ILP64="0", CFLAGS="-m32", LDFLAGS="-m32", PKG_CONFIG_PATH="D:\\a\\numpy\\numpy\\openblas\\lib\\pkgconfig;"}

[tool.meson-python.args]
setup = ['--vsenv']
Expand Down
2 changes: 0 additions & 2 deletions tools/wheels/cibw_before_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,12 @@ if [[ $RUNNER_OS == "Linux" || $RUNNER_OS == "macOS" ]] ; then
elif [[ $RUNNER_OS == "Windows" ]]; then
PYTHONPATH=tools python -c "import openblas_support; openblas_support.make_init('numpy')"
target=$(python tools/openblas_support.py)
ls /tmp
mkdir -p openblas
# bash on windows does not like cp -r $target/* openblas
for f in $(ls $target); do
cp -r $target/$f openblas
done
ls openblas
echo "PKG_CONFIG_PATH=$PWD/openblas/lib/pkgconfig;" >> $env:GITHUB_ENV
fi

if [[ $RUNNER_OS == "macOS" ]]; then
Expand Down
0