Merge pull request #210 from mattip/macos-latest

update to macos-latest

Author: mattip

.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/[email protected]
-      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}
@@ -159,12 +159,13 @@ jobs:
         name: openblas-${{ matrix.os }}-${{ matrix.PLAT }}-${{ matrix.INTERFACE64 }}-${{ matrix.MB_ML_LIBC }}-${{ matrix.MB_ML_VER }}
         path: libs/openblas*.tar.gz
 
-    - uses: conda-incubator/setup-miniconda@v3.1.1
+    - uses: conda-incubator/setup-miniconda@v3.2.0
       with:
         channels: conda-forge
         channel-priority: true
         activate-environment: upload
         miniforge-version: latest
+        conda-remove-defaults: "true"
 
     - name: Upload
       # see https://github.com/marketplace/actions/setup-miniconda for why

.gitignore

@@ -17,3 +17,4 @@ local/scipy_openblas64/include
 local/scipy_openblas64/*.so
 local/scipy_openblas64/*.pyd
 local/scipy_openblas64/*.dylib
+objconv/

gfortran-install

@@ -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"

multibuild

@@ -1,21 +1,32 @@
 # 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
+        if [ ! -e /usr/local/lib ]; then
+            sudo mkdir -p /usr/local/lib
+            sudo chmod 777 /usr/local/lib
+            touch /usr/local/lib/.dir_exists
+        fi
+        if [ ! -e /usr/local/include ]; then
+            sudo mkdir -p /usr/local/include
+            sudo chmod 777 /usr/local/include
+            touch /usr/local/include/.dir_exists
+        fi
         source ${ROOT_DIR}/multibuild/osx_utils.sh
         get_macpython_environment ${MB_PYTHON_VERSION} venv
-        source ${ROOT_DIR}/gfortran-install/gfortran_utils.sh
-        install_gfortran
+        # 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"
 
@@ -89,7 +100,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 +109,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 +165,8 @@ 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"
+            export SDKROOT=${SDKROOT:-$(xcrun --show-sdk-path)}
             ;;
         *-i686)
             local bitness=32
@@ -168,7 +180,10 @@ function do_build_lib {
         Darwin-arm64)
             local bitness=64
             local target="VORTEX"
-            CFLAGS="$CFLAGS -ftrapping-math"
+            CFLAGS="$CFLAGS -ftrapping-math -mmacos-version-min=11.0"
+            MACOSX_DEPLOYMENT_TARGET="11.0"
+            export SDKROOT=${SDKROOT:-$(xcrun --show-sdk-path)}
+            export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH
             ;;
         *-s390x)
             local bitness=64
@@ -208,7 +223,7 @@ function do_build_lib {
         echo "Due to the qemu versions 7.2 causing utest cases to fail,"
         echo "the utest dsdot:dsdot_n_1 have been temporarily disabled."
     fi
-    if [ -v dynamic_list ]; then
+    if [ -n "$dynamic_list" ]; then
         CFLAGS="$CFLAGS -fvisibility=protected -Wno-uninitialized" \
         make BUFFERSIZE=20 DYNAMIC_ARCH=1 QUIET_MAKE=1 \
             USE_OPENMP=0 NUM_THREADS=64 \

pyproject.toml

@@ -101,10 +101,15 @@ if [ "${PLAT}" == "arm64" ]; then
     exit 0
 fi
 # Test that the wheel works with a different python
+PYTHON=python3.11
+if [ "$(uname)" == "Darwin" -a "${PLAT}" == "x86_64" ]; then
+    which python3.11
+    PYTHON="arch -x86_64 python3.11"
+fi
 if [ "${INTERFACE64}" != "1" ]; then
-  python3.11 -m pip install --no-index --find-links dist scipy_openblas32
-  python3.11 -m scipy_openblas32
+  $PYTHON -m pip install --no-index --find-links dist scipy_openblas32
+  $PYTHON -m scipy_openblas32
 else
-  python3.11 -m pip install --no-index --find-links dist scipy_openblas64
-  python3.11 -m scipy_openblas64
+  $PYTHON -m pip install --no-index --find-links dist scipy_openblas64
+  $PYTHON -m scipy_openblas64
 fi

tools/build_steps.sh

@@ -4,7 +4,10 @@
 set -e
 
 # Set extra env
-if [[ $(uname -m) == "x86_64" ]]; then
+if [[ $(uname) == "Darwin" ]]; then
+    # Force x86_64
+    export PLAT=x86_64
+elif [[ $(uname -m) == "x86_64" ]]; then
     echo got x86_64
     export TRAVIS_OS_NAME=ubuntu-latest
     export PLAT=x86_64
@@ -64,11 +67,6 @@ function build_openblas {
     fi
     # Build OpenBLAS
     set -xeo pipefail
-    if [ "$PLAT" == "arm64" ]; then
-      sudo xcode-select -switch /Applications/Xcode_12.5.1.app
-      export SDKROOT=/Applications/Xcode_12.5.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.3.sdk
-      clang --version
-    fi
     source tools/build_steps.sh
     echo "------ BEFORE BUILD ---------"
     before_build