From eb7978f7525065255af1db2ef01f7455c84eb6bd Mon Sep 17 00:00:00 2001 From: mattip Date: Sun, 22 Mar 2026 12:38:43 +0200 Subject: [PATCH 1/4] rebase on main --- .github/workflows/posix.yml | 18 +++++++++--------- CHANGELOG.md | 3 +++ pyproject.toml | 3 +-- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 712d166e..36b327e0 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -28,10 +28,10 @@ jobs: fail-fast: false matrix: include: - - { os: ubuntu-latest, PLAT: i686, INTERFACE64: '0', MB_ML_VER: '2014', MB_ML_LIBC: manylinux} + - { os: ubuntu-latest, PLAT: i686, INTERFACE64: '0', MB_ML_VER: '_2_28', MB_ML_LIBC: manylinux} - - { os: ubuntu-latest, PLAT: x86_64, INTERFACE64: '0', MB_ML_VER: '2014', MB_ML_LIBC: manylinux} - - { os: ubuntu-latest, PLAT: x86_64, INTERFACE64: '1', MB_ML_VER: '2014', MB_ML_LIBC: manylinux} + - { os: ubuntu-latest, PLAT: x86_64, INTERFACE64: '0', MB_ML_VER: '_2_28', MB_ML_LIBC: manylinux} + - { os: ubuntu-latest, PLAT: x86_64, INTERFACE64: '1', MB_ML_VER: '_2_28', MB_ML_LIBC: manylinux} - { os: macos-14, PLAT: x86_64, INTERFACE64: '0', MB_ML_LIBC: macosx} - { os: macos-14, PLAT: x86_64, INTERFACE64: '1', MB_ML_LIBC: macosx} @@ -42,17 +42,17 @@ jobs: - { os: ubuntu-latest, PLAT: x86_64, INTERFACE64: '0', MB_ML_VER: '_1_2', MB_ML_LIBC: musllinux} - { os: ubuntu-latest, PLAT: x86_64, INTERFACE64: '1', MB_ML_VER: '_1_2', MB_ML_LIBC: musllinux} - - { os: ubuntu-24.04-arm, PLAT: aarch64, INTERFACE64: '0', MB_ML_VER: '2014', MB_ML_LIBC: manylinux} - - { os: ubuntu-24.04-arm, PLAT: aarch64, INTERFACE64: '1', MB_ML_VER: '2014', MB_ML_LIBC: manylinux} + - { os: ubuntu-24.04-arm, PLAT: aarch64, INTERFACE64: '0', MB_ML_VER: '_2_28', MB_ML_LIBC: manylinux} + - { os: ubuntu-24.04-arm, PLAT: aarch64, INTERFACE64: '1', MB_ML_VER: '_2_28', MB_ML_LIBC: manylinux} - { os: ubuntu-24.04-arm, PLAT: aarch64, INTERFACE64: '0', MB_ML_VER: '_1_2', MB_ML_LIBC: musllinux} - { os: ubuntu-24.04-arm, PLAT: aarch64, INTERFACE64: '1', MB_ML_VER: '_1_2', MB_ML_LIBC: musllinux} - - { os: ubuntu-24.04-arm, PLAT: ppc64le, INTERFACE64: '0', MB_ML_VER: '2014', MB_ML_LIBC: manylinux} - - { os: ubuntu-24.04-arm, PLAT: ppc64le, INTERFACE64: '1', MB_ML_VER: '2014', MB_ML_LIBC: manylinux} + - { os: ubuntu-24.04-arm, PLAT: ppc64le, INTERFACE64: '0', MB_ML_VER: '_2_28', MB_ML_LIBC: manylinux} + - { os: ubuntu-24.04-arm, PLAT: ppc64le, INTERFACE64: '1', MB_ML_VER: '_2_28', MB_ML_LIBC: manylinux} - - { os: ubuntu-24.04-arm, PLAT: s390x, INTERFACE64: '0', MB_ML_VER: '2014', MB_ML_LIBC: manylinux} - - { os: ubuntu-24.04-arm, PLAT: s390x, INTERFACE64: '1', MB_ML_VER: '2014', MB_ML_LIBC: manylinux} + - { os: ubuntu-24.04-arm, PLAT: s390x, INTERFACE64: '0', MB_ML_VER: '_2_28', MB_ML_LIBC: manylinux} + - { os: ubuntu-24.04-arm, PLAT: s390x, INTERFACE64: '1', MB_ML_VER: '_2_28', MB_ML_LIBC: manylinux} - { os: ubuntu-24.04-arm, PLAT: riscv64, INTERFACE64: '0', MB_ML_VER: '_2_39', MB_ML_LIBC: manylinux} - { os: ubuntu-24.04-arm, PLAT: riscv64, INTERFACE64: '1', MB_ML_VER: '_2_39', MB_ML_LIBC: manylinux} diff --git a/CHANGELOG.md b/CHANGELOG.md index f15163e3..2ac2464b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ## OpenBLAS v0.3.31.188 (v0.3.31-188-g4956446c) +### 0.3.31.188.1 (2026-03-23) +- Build manylinux_2_28 wheels + ### 0.3.31.188.0 (2026-03-22) - Update to v0.3.31.188 diff --git a/pyproject.toml b/pyproject.toml index 70454712..8555d14b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,9 +7,8 @@ requires = [ build-backend = "setuptools.build_meta" [project] -name = "scipy-openblas64" # v0.3.31-188-g4956446c -version = "0.3.31.188.0" +version = "0.3.31.188.1" requires-python = ">=3.7" description = "Provides OpenBLAS for python packaging" readme = "README.md" From a31c33a85a99fd8e19e290cfc94756949849e826 Mon Sep 17 00:00:00 2001 From: mattip Date: Fri, 20 Mar 2026 15:41:45 +0200 Subject: [PATCH 2/4] use clang only on qemu platforms --- .github/workflows/posix.yml | 2 -- ci-before-build.sh | 13 +++++++++---- pyproject.toml | 3 --- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 36b327e0..871f87d5 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -62,9 +62,7 @@ jobs: MB_ML_LIBC: ${{ matrix.MB_ML_LIBC }} MB_ML_VER: ${{ matrix.MB_ML_VER }} INTERFACE64: ${{ matrix.INTERFACE64 }} - BUILD_DIR: ${{ github.workspace }} PLAT: ${{ matrix.PLAT }} - OS-NAME: ${{ matrix.os }} steps: - uses: actions/checkout@v6.0.1 diff --git a/ci-before-build.sh b/ci-before-build.sh index 83abf25c..470ed5f5 100755 --- a/ci-before-build.sh +++ b/ci-before-build.sh @@ -24,10 +24,15 @@ fi sed -e "s/^VERSION = .*/VERSION = ${version}/" -i.bak OpenBLAS/Makefile.rule echo "creating wheel from $OPENBLAS_COMMIT (NIGHTLY is $NIGHTLY)" -if [ "$(uname)" != "Darwin" ]; then - ./tools/install-static-clang.sh - export PATH=/opt/clang/bin:$PATH -fi +case "$PLAT" in + ppc64le|s390x|riscv64) + ./tools/install-static-clang.sh + export PATH=/opt/clang/bin:$PATH + CC="/opt/clang/bin/clang" + CXX="/opt/clang/bin/clang++" + LDFLAGS="-fuse-ld=lld" + ;; +esac # Build OpenBLAS source build-openblas.sh diff --git a/pyproject.toml b/pyproject.toml index 8555d14b..557adc68 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -54,8 +54,5 @@ environment-pass = [ "OS-NAME", "RUNNER_ARCH", ] -[tool.cibuildwheel.linux] -environment = { CC = "/opt/clang/bin/clang", CXX = "/opt/clang/bin/clang++", LDFLAGS = "-fuse-ld=lld" } - [project.entry-points.pkg_config] scipy-openblas = 'scipy_openblas64.lib.pkgconfig' From ce18fbc5fda240d84b61143d460d3645d0b5a782 Mon Sep 17 00:00:00 2001 From: mattip Date: Sat, 21 Mar 2026 19:25:23 +0200 Subject: [PATCH 3/4] export variables, make build verbose --- ci-before-build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci-before-build.sh b/ci-before-build.sh index 470ed5f5..d1382e7f 100755 --- a/ci-before-build.sh +++ b/ci-before-build.sh @@ -28,9 +28,9 @@ case "$PLAT" in ppc64le|s390x|riscv64) ./tools/install-static-clang.sh export PATH=/opt/clang/bin:$PATH - CC="/opt/clang/bin/clang" - CXX="/opt/clang/bin/clang++" - LDFLAGS="-fuse-ld=lld" + export CC="/opt/clang/bin/clang" + export CXX="/opt/clang/bin/clang++" + export LDFLAGS="-fuse-ld=lld" ;; esac From faf06e75c771cbc91fc3ae965e27b4d3ada87327 Mon Sep 17 00:00:00 2001 From: mattip Date: Sun, 22 Mar 2026 13:30:02 +0200 Subject: [PATCH 4/4] fix merge --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 557adc68..44c7ac9a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,6 +7,7 @@ requires = [ build-backend = "setuptools.build_meta" [project] +name = "scipy-openblas64" # v0.3.31-188-g4956446c version = "0.3.31.188.1" requires-python = ">=3.7"