diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 93567d2..e567c27 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -23,16 +23,16 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-13] + os: [ubuntu-latest, macos-latest] PLAT: [i686, x86_64] INTERFACE64: ['0', '1'] MB_ML_VER: ['2014'] MB_ML_LIBC: ['manylinux'] include: - - os: macos-13 + - os: macos-latest PLAT: arm64 INTERFACE64: '1' - - os: macos-13 + - os: macos-latest PLAT: arm64 INTERFACE64: '0' - os: ubuntu-latest @@ -67,7 +67,7 @@ jobs: exclude: - PLAT: i686 - os: macos-13 + os: macos-latest - PLAT: i686 INTERFACE64: '1' env: @@ -94,9 +94,9 @@ jobs: echo "DOCKER_TEST_IMAGE=$(echo multibuild/xenial_${{ matrix.PLAT}})" >> $GITHUB_ENV; - uses: maxim-lobanov/setup-xcode@v1.6.0 - if: ${{ matrix.os == 'macos-13' }} + if: ${{ matrix.os == 'macos-latest' }} with: - xcode-version: '14.3' + xcode-version: '15.4' - name: Print some Environment variable run: | @@ -137,7 +137,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-13" == "${{ matrix.os }}" ]; then + if [ "macos-latest" == "${{ matrix.os }}" ]; then source tools/build_wheel.sh else libc=${MB_ML_LIBC:-manylinux} diff --git a/gfortran-install b/gfortran-install index 47bb0df..3dd38d9 160000 --- a/gfortran-install +++ b/gfortran-install @@ -1 +1 @@ -Subproject commit 47bb0df1e6f766503f81e4fd3d5d2acadd887393 +Subproject commit 3dd38d9ce78b3890598cb0eff18a7bec50c06f5e diff --git a/multibuild b/multibuild index 452dd2d..24f1446 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit 452dd2d1705f6b2375369a6570c415beb3163f70 +Subproject commit 24f1446f6477893b2ef9d721aabcee7a494ca2b1 diff --git a/pyproject.toml b/pyproject.toml index 842951f..90bc7f9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ build-backend = "setuptools.build_meta" [project] name = "scipy-openblas64" # v0.3.30 -version = "0.3.30.0.1" +version = "0.3.30.0.2" requires-python = ">=3.7" description = "Provides OpenBLAS for python packaging" readme = "README.md" diff --git a/tools/build_steps.sh b/tools/build_steps.sh index 5d8a14f..33497d3 100644 --- a/tools/build_steps.sh +++ b/tools/build_steps.sh @@ -1,17 +1,17 @@ # Build script for manylinux and OSX BUILD_PREFIX=/usr/local -# OSX gfortran archive -GFORTRAN_DMG="archives/gfortran-4.9.0-Mavericks.dmg" ROOT_DIR=$(dirname $(dirname "${BASH_SOURCE[0]}")) source ${ROOT_DIR}/multibuild/common_utils.sh -source ${ROOT_DIR}/gfortran-install/gfortran_utils.sh MB_PYTHON_VERSION=3.9 function before_build { # Manylinux Python version set in build_lib if [ -n "$IS_OSX" ]; then + sudo mkdir -p /usr/local/lib + sudo chmod 777 /usr/local/lib + touch /usr/local/lib/.dir_exists source ${ROOT_DIR}/multibuild/osx_utils.sh get_macpython_environment ${MB_PYTHON_VERSION} venv source ${ROOT_DIR}/gfortran-install/gfortran_utils.sh @@ -89,7 +89,6 @@ function build_lib { # # Depends on globals # BUILD_PREFIX - install suffix e.g. "/usr/local" - # GFORTRAN_DMG # MB_ML_VER set -x local plat=${1:-$PLAT} @@ -99,7 +98,7 @@ function build_lib { # Make directory to store built archive if [ -n "$IS_OSX" ]; then # Do build, add gfortran hash to end of name - wrap_wheel_builder do_build_lib "$plat" "gf_${GFORTRAN_SHA:0:7}" "$interface64" "$nightly" + do_build_lib "$plat" "gf_${GFORTRAN_SHA:0:7}" "$interface64" "$nightly" return fi # Manylinux wrapper @@ -155,6 +154,7 @@ function do_build_lib { local target="CORE2" # Pick up the gfortran runtime libraries export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH + CFLAGS="$CFLAGS -arch x86_64" ;; *-i686) local bitness=32 @@ -168,7 +168,8 @@ function do_build_lib { Darwin-arm64) local bitness=64 local target="VORTEX" - CFLAGS="$CFLAGS -ftrapping-math" + CFLAGS="$CFLAGS -ftrapping-math -mmacosx-version-min=11.0" + MACOSX_DEPLOYMENT_TARGET="11.0" ;; *-s390x) local bitness=64