update OpenBLAS commit, use macos-15.intel

.github/workflows/posix.yml

@@ -10,7 +10,7 @@ on:
     - cron: '0 0 * * 0'
 
 env:
-  OPENBLAS_COMMIT: "v0.3.30"
+  OPENBLAS_COMMIT: "585e6d06802a0"
   MACOSX_DEPLOYMENT_TARGET: 10.9
 
 jobs:
@@ -28,8 +28,8 @@ jobs:
           - { 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: macos-latest, PLAT: x86_64, INTERFACE64: '0', MB_ML_LIBC: macosx}
-          - { os: macos-latest, PLAT: x86_64, INTERFACE64: '1', MB_ML_LIBC: macosx}
+          - { os: macos-15-intel, PLAT: x86_64, INTERFACE64: '0', MB_ML_LIBC: macosx}
+          - { os: macos-15-intel, PLAT: x86_64, INTERFACE64: '1', MB_ML_LIBC: macosx}
 
           - { os: macos-latest, PLAT: arm64, INTERFACE64: '0', MB_ML_LIBC: macosx}
           - { os: macos-latest, PLAT: arm64, INTERFACE64: '1', MB_ML_LIBC: macosx}

.github/workflows/windows-arm.yml

@@ -7,7 +7,7 @@ on:
     branches: [ main ]
 
 env:
-  OPENBLAS_COMMIT: "v0.3.30"
+  OPENBLAS_COMMIT: "585e6d06802a0"
   OPENBLAS_ROOT: "c:\\opt"
   # Preserve working directory for calls into bash
   # Without this, invoking bash will cd to the home directory

.github/workflows/windows.yml

@@ -8,7 +8,7 @@ on:
   workflow_dispatch: null
 
 env:
-  OPENBLAS_COMMIT: "v0.3.30"
+  OPENBLAS_COMMIT: "585e6d06802a0"
   OPENBLAS_ROOT: "c:\\opt"
   # Preserve working directory for calls into bash
   # Without this, invoking bash will cd to the home directory

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "OpenBLAS"]
 	path = OpenBLAS
 	url = https://github.com/xianyi/OpenBLAS.git
+[submodule "gfortran-install"]
+	path = gfortran-install
+	url = https://github.com/MacPython/gfortran-install.git

.travis.yml

@@ -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: "585e6d06802a0"
 
 dist: jammy
 services: docker

pyproject.toml

@@ -9,7 +9,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "scipy-openblas64"
 # v0.3.30
-version = "0.3.30.0.5"
+version = "0.3.30.317.0"
 requires-python = ">=3.7"
 description = "Provides OpenBLAS for python packaging"
 readme = "README.md"

tools/build_objconv.sh

@@ -1,4 +1,4 @@
 echo "Building objconv..."
 set -e -x
 unzip source.zip
-g++ -O1 -o objconv *.cpp
+g++ -O1 -Wno-deprecated-declarations -o objconv *.cpp

tools/build_steps.sh

@@ -39,7 +39,17 @@ function before_build {
         # get_macpython_environment ${MB_PYTHON_VERSION} venv
         python3.9 -m venv venv
         source venv/bin/activate
-        alias gfortran=gfortran-15
+        # 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
+
+        echo GFORTRAN
+        which gfortran
+        gfortran --version
+        echo --------
         # Deployment target set by gfortran_utils
         echo "Deployment target $MACOSX_DEPLOYMENT_TARGET"
 
@@ -50,18 +60,16 @@ function before_build {
 
 function clean_code {
     set -ex
-    # Copied from common_utils.sh, with added debugging
     local build_commit=$1
     [ -z "$build_commit" ] && echo "build_commit not defined" && exit 1
+    git submodule update --init --recursive
     pushd OpenBLAS
     git fetch origin --tags
     echo after git fetch origin
     git checkout $build_commit
     echo after git checkout $build_commit
-    git clean -fxd 
+    git clean -fxd
     echo after git clean
-    git submodule update --init --recursive
-    echo after git submodule update
     popd
 }
 
@@ -152,7 +160,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"
+            export CFLAGS="$CFLAGS -arch x86_64 -Wno-shift-op-parentheses -Wno-logical-op-parentheses -Wno-deprecated-declarations"
             export SDKROOT=${SDKROOT:-$(xcrun --show-sdk-path)}
             ;;
         *-i686)