Skip to content
Open
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
15 changes: 5 additions & 10 deletions .github/workflows/posix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest]
os: [ubuntu-latest, macos-15-intel]
PLAT: [i686, x86_64]
INTERFACE64: ['0', '1']
MB_ML_VER: ['2014']
MB_ML_LIBC: ['manylinux']
include:
- os: macos-latest
- os: macos-15
PLAT: arm64
INTERFACE64: '1'
- os: macos-latest
- os: macos-15
PLAT: arm64
INTERFACE64: '0'
- os: ubuntu-latest
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:

exclude:
- PLAT: i686
os: macos-latest
os: macos-15-intel
- PLAT: i686
INTERFACE64: '1'
env:
Expand All @@ -93,11 +93,6 @@ jobs:
run: |
echo "DOCKER_TEST_IMAGE=$(echo multibuild/xenial_${{ matrix.PLAT}})" >> $GITHUB_ENV;

- uses: maxim-lobanov/[email protected]
if: ${{ matrix.os == 'macos-latest' }}
with:
xcode-version: '15.4'

- name: Print some Environment variable
run: |
echo "PLAT: ${PLAT}"
Expand Down Expand Up @@ -137,7 +132,7 @@ jobs:
version=$(cd OpenBLAS && git describe --tags --abbrev=8 | sed -e "s/^v\(.*\)-g.*/\1/" | sed -e "s/-/./g")
sed -e "s/^version = .*/version = \"${version}\"/" -i.bak pyproject.toml
fi
if [ "macos-latest" == "${{ matrix.os }}" ]; then
if [[ "${{ matrix.os }}" =~ "macos" ]]; then
source tools/build_wheel.sh
else
libc=${MB_ML_LIBC:-manylinux}
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/windows-arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,13 @@ jobs:

- 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
$expectedHash = "7c4ac97eb2ae6b960ca5f9caf3ff6124c8d2a18cc07a7840a4d2ea15537bad8e"
$fileHash = (Get-FileHash -Path "LLVM-woa64.exe" -Algorithm SHA256).Hash
if ($fileHash -ne $expectedHash) {
Write-Error "Checksum verification failed. The downloaded file may be corrupted or tampered with."
exit 1
}
Start-Process -FilePath ".\LLVM-woa64.exe" -ArgumentList "/S" -Wait
echo "C:\Program Files\LLVM\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append

Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,3 @@
[submodule "multibuild"]
path = multibuild
url = https://github.com/multi-build/multibuild.git
[submodule "gfortran-install"]
path = gfortran-install
url = https://github.com/MacPython/gfortran-install.git
1 change: 0 additions & 1 deletion gfortran-install
Submodule gfortran-install deleted from 3dd38d
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ build-backend = "setuptools.build_meta"
[project]
name = "scipy-openblas64"
# v0.3.30
version = "0.3.30.0.2"
version = "0.3.30.0.3"
requires-python = ">=3.7"
description = "Provides OpenBLAS for python packaging"
readme = "README.md"
Expand Down
13 changes: 4 additions & 9 deletions tools/build_steps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,8 @@ function before_build {
fi
source ${ROOT_DIR}/multibuild/osx_utils.sh
get_macpython_environment ${MB_PYTHON_VERSION} venv
# Since install_fortran uses `uname -a` to determine arch,
# force the architecture
arch -${PLAT} bash -s << EOF
source ${ROOT_DIR}/gfortran-install/gfortran_utils.sh
install_gfortran
EOF
# Deployment target set by gfortran_utils
echo "Deployment target $MACOSX_DEPLOYMENT_TARGET"

alias gfortran=gfortran-15

# Build the objconv tool
(cd ${ROOT_DIR}/objconv && bash ../tools/build_objconv.sh)
Expand Down Expand Up @@ -166,6 +160,7 @@ function do_build_lib {
# Pick up the gfortran runtime libraries
export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH
CFLAGS="$CFLAGS -arch x86_64"
export MACOSX_DEPLOYMENT_TARGET="11.0"
export SDKROOT=${SDKROOT:-$(xcrun --show-sdk-path)}
;;
*-i686)
Expand All @@ -181,7 +176,7 @@ function do_build_lib {
local bitness=64
local target="VORTEX"
CFLAGS="$CFLAGS -ftrapping-math -mmacos-version-min=11.0"
MACOSX_DEPLOYMENT_TARGET="11.0"
export MACOSX_DEPLOYMENT_TARGET="11.0"
export SDKROOT=${SDKROOT:-$(xcrun --show-sdk-path)}
export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH
;;
Expand Down
Loading