Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/posix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
- cron: '0 0 * * 0'

env:
OPENBLAS_COMMIT: "v0.3.30"
OPENBLAS_COMMIT: "v0.3.30-349-gf6df9beb"
MACOSX_DEPLOYMENT_TARGET: 10.9

jobs:
Expand Down Expand Up @@ -39,6 +39,8 @@ jobs:

- { 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}
Expand Down
36 changes: 11 additions & 25 deletions .github/workflows/windows-arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
branches: [ main ]

env:
OPENBLAS_COMMIT: "v0.3.30"
OPENBLAS_COMMIT: "v0.3.30-349-gf6df9beb"
OPENBLAS_ROOT: "c:\\opt"
# Preserve working directory for calls into bash
# Without this, invoking bash will cd to the home directory
Expand Down Expand Up @@ -37,25 +37,22 @@ jobs:
python-version: 3.12
architecture: arm64

- name: Setup visual studio
uses: microsoft/setup-msbuild@v2

- name: Download, install 7zip.
run: |
Invoke-WebRequest https://www.7-zip.org/a/7z2409-arm64.exe -UseBasicParsing -OutFile 7z_arm.exe
Start-Process -FilePath ".\7z_arm.exe" -ArgumentList "/S" -Wait
echo "C:\Program Files\7-Zip" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append

- name: Download and install LLVM installer
run: |
Invoke-WebRequest https://github.com/llvm/llvm-project/releases/download/llvmorg-19.1.5/LLVM-19.1.5-woa64.exe -UseBasicParsing -OutFile LLVM-woa64.exe
Invoke-WebRequest https://github.com/llvm/llvm-project/releases/download/llvmorg-20.1.8/LLVM-20.1.8-woa64.exe -UseBasicParsing -OutFile LLVM-woa64.exe
Start-Process -FilePath ".\LLVM-woa64.exe" -ArgumentList "/S" -Wait
echo "C:\Program Files\LLVM\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append

- name: Update CMake for WoA
- name: Install CMake and Ninja for Win-ARM64
shell: pwsh
run: |
pip install cmake
get-command cmake
Invoke-WebRequest https://github.com/Kitware/CMake/releases/download/v3.29.4/cmake-3.29.4-windows-arm64.msi -OutFile cmake-arm64.msi
Start-Process msiexec.exe -ArgumentList "/i cmake-arm64.msi /quiet /norestart" -Wait
echo "C:\Program Files\CMake\bin" >> $env:GITHUB_PATH

Invoke-WebRequest https://github.com/ninja-build/ninja/releases/download/v1.13.1/ninja-winarm64.zip -OutFile ninja-winarm64.zip
Expand-Archive ninja-winarm64.zip -DestinationPath ninja
Copy-Item ninja\ninja.exe -Destination "C:\Windows\System32"

- name: Set env variables
run: |
Expand All @@ -70,12 +67,6 @@ jobs:
git submodule update --init --recursive
.\tools\build_steps_win_arm64.bat 64 ${env:INTERFACE_BITS}

- name: Pack
run: |
cd local
cp -r "scipy_openblas${env:INTERFACE_BITS}" $env:INTERFACE_BITS
7z a ../builds/openblas-${env:PLAT}-${env:INTERFACE64}.zip -tzip $env:INTERFACE_BITS

- name: Test ${{ matrix.INTERFACE_BITS }}-bit interface wheel
run: |
python -m pip install --no-index --find-links dist scipy_openblas${env:INTERFACE_BITS}
Expand All @@ -87,11 +78,6 @@ jobs:
name: wheels-${{ env.PLAT }}-${{ env.INTERFACE64 }}
path: dist/scipy_openblas*.whl

- uses: actions/upload-artifact@v4.3.0
with:
name: openblas-${{ env.PLAT }}-${{ env.INTERFACE64 }}
path: builds/openblas*.zip

- name: Install Anaconda client
run: |
# Rust installation needed for rpds-py.
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
workflow_dispatch: null

env:
OPENBLAS_COMMIT: "v0.3.30"
OPENBLAS_COMMIT: "v0.3.30-349-gf6df9beb"
OPENBLAS_ROOT: "c:\\opt"
# Preserve working directory for calls into bash
# Without this, invoking bash will cd to the home directory
Expand Down Expand Up @@ -131,7 +131,9 @@ jobs:
cat tools/LICENSE_win32.txt >> LICENSE.txt
python -m pip wheel -w dist -vv .
# move the mis-named scipy_openblas64-none-any.whl to a platform-specific name
for f in dist/*.whl; do mv $f "${f/%any.whl/$WHEEL_PLAT.whl}"; done
if [[ -e dist/*any*.whl ]]; then
for f in dist/*.whl; do mv $f "${f/%any.whl/$WHEEL_PLAT.whl}"; done
fi

- name: Set up different Python
uses: actions/setup-python@v5
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ env:
global:
# The archive that gets built has name from ``git describe`` on this
# commit.
- OPENBLAS_COMMIT: "v0.3.30"
- OPENBLAS_COMMIT: "v0.3.30-349-gf6df9beb"

dist: jammy
services: docker
Expand Down
2 changes: 1 addition & 1 deletion OpenBLAS
61 changes: 0 additions & 61 deletions patches/0001-backout-PR-4741.patch

This file was deleted.

35 changes: 0 additions & 35 deletions patches/remove-lock-around-thread-shutdown.patch

This file was deleted.

4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ build-backend = "setuptools.build_meta"

[project]
name = "scipy-openblas64"
# v0.3.30
version = "0.3.30.0.7"
# v0.3.30-349-gf6df9beb
version = "0.3.30.349.0"
requires-python = ">=3.7"
description = "Provides OpenBLAS for python packaging"
readme = "README.md"
Expand Down
5 changes: 5 additions & 0 deletions tools/build_steps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,11 @@ EOF
Linux-aarch64)
local bitness=64
local target="ARMV8"
# manylinux2014 image uses gcc-10, which miscompiles ARMV8SVE and up
if [ "$MB_ML_VER" == "2014" ]; then
echo setting DYNAMIC_LIST for manylinux2014 to ARMV8 only
local dynamic_list="ARMV8"
fi
;;
Darwin-arm64)
local bitness=64
Expand Down
28 changes: 23 additions & 5 deletions tools/build_steps_win_arm64.bat
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ if errorlevel 1 (
exit /b 2
)

:: Patch
for /r %%f in (..\patches\*) do git apply %%f
if errorlevel 1 exit /b 1

:: Set suffixed-ILP64 flags
if "%if_bits%"=="64" (
set "interface_flags=-DINTERFACE64=1 -DSYMBOLSUFFIX=64_"
Expand All @@ -91,18 +95,32 @@ mkdir build || exit /b 1 & cd build || exit /b 1
echo Setting up ARM64 Developer Command Prompt and running CMake...

:: Initialize VS ARM64 environment
for /f "usebackq tokens=*" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property installationPath`) do call "%%i\VC\Auxiliary\Build\vcvarsall.bat" arm64
CALL "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsarm64.bat"

:: Prefer LLVM flang
PATH=C:\Program Files\LLVM\bin;%PATH%

:: Run CMake and Ninja build
cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DUSE_THREADS=1 -DNUM_THREADS=24 -DTARGET=ARMV8 -DBUILD_SHARED_LIBS=ON -DARCH=arm64 ^
-DBINARY=%build_bits% -DCMAKE_SYSTEM_PROCESSOR=ARM64 -DCMAKE_C_COMPILER=clang-cl ^
-DCMAKE_Fortran_COMPILER=flang-new -DSYMBOLPREFIX="scipy_" -DLIBNAMEPREFIX="scipy_" %interface_flags%

set CFLAGS=-Wno-reserved-macro-identifier -Wno-unsafe-buffer-usage -Wno-unused-macros -Wno-sign-conversion -Wno-reserved-identifier
cmake .. -G Ninja ^
-DCMAKE_BUILD_TYPE=Release ^
-DTARGET=ARMV8 ^
-DBINARY=%build_bits% ^
-DCMAKE_C_COMPILER=clang-cl ^
-DCMAKE_Fortran_COMPILER=flang-new ^
-DBUILD_SHARED_LIBS=ON ^
-DCMAKE_SYSTEM_PROCESSOR=arm64 ^
-DCMAKE_SYSTEM_NAME=Windows ^
-DSYMBOLPREFIX="scipy_" ^
-DLIBNAMEPREFIX="scipy_" ^
-DUSE_THREADS=1 ^
-DNUM_THREADS=24 ^
%interface_flags%

if errorlevel 1 exit /b 1

ninja
ninja -j 16
if errorlevel 1 exit /b 1

echo Build complete. Returning to Batch.
Expand Down
Loading