Merge pull request #101 from mattip/issue-24067

update to work around numpy issue 24067
MacPython · Jul 16, 2023 · a64e515 · a64e515
2 parents 4900ad3 + 77da785
commit a64e515
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 28 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ on:
     branches: [ main ]
 
 env:
-  OPENBLAS_COMMIT: "v0.3.23"
+  OPENBLAS_COMMIT: "3d31191b"
   OPENBLAS_ROOT: "c:\\opt"
   # Preserve working directory for calls into bash
   CHERE_INVOKING: "yes"

diff --git a/.github/workflows/multibuild.yml b/.github/workflows/multibuild.yml
@@ -55,7 +55,7 @@ jobs:
             INTERFACE64: '1'
     env:
       REPO_DIR: OpenBLAS
-      OPENBLAS_COMMIT: "v0.3.23"
+      OPENBLAS_COMMIT: "3d31191b"
       NIGHTLY: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
       MACOSX_DEPLOYMENT_TARGET: 10.9
       MB_PYTHON_VERSION: ${{ matrix.python-version }}
@@ -80,9 +80,10 @@ jobs:
     - name: Set extra env
       run: |
         if [ "macos-11" == "${{ matrix.os }}" ]; then
+          ls /Library/Developer/CommandLineTools/SDKs
           echo "TRAVIS_OS_NAME=osx" >> $GITHUB_ENV;
-          echo "LDFLAGS=-L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib" >> $GITHUB_ENV;
-          echo "LIBRARY_PATH=-L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib" >> $GITHUB_ENV;
+          echo "LDFLAGS=-L/Library/Developer/CommandLineTools/SDKs/MacOSX12.1.sdk/usr/lib" >> $GITHUB_ENV;
+          echo "LIBRARY_PATH=-L/Library/Developer/CommandLineTools/SDKs/MacOSX12.1.sdk/usr/lib" >> $GITHUB_ENV;
         else
           echo "TRAVIS_OS_NAME=${{ matrix.os }}" >> $GITHUB_ENV;
         fi
@@ -102,6 +103,7 @@ jobs:
         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 travis-ci/build_steps.sh
         echo "------ BEFORE BUILD ---------"

diff --git a/.travis.yml b/.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.23"
+        - OPENBLAS_COMMIT="3d31191b"
         - REPO_DIR=OpenBLAS
         # Following generated with:
         # travis encrypt -r MacPython/openblas-libs OPENBLAS_LIBS_STAGING_UPLOAD_TOKEN=<secret token value>

diff --git a/OpenBLAS b/OpenBLAS
diff --git a/manylinux-compile.patch b/manylinux-compile.patch
diff --git a/travis-ci/build_steps.sh b/travis-ci/build_steps.sh
@@ -94,12 +94,9 @@ function build_lib {
 }
 
 function patch_source {
-    # Patches for compile error on Manylinux around v0.3.0
-    # https://github.com/xianyi/OpenBLAS/issues/1586
     # Runs inside OpenBLAS directory
-    git merge-base --is-ancestor e5752ff HEAD || return 0
-    git merge-base --is-ancestor a8002e2 HEAD && return 0
-    patch -p1 < ../manylinux-compile.patch
+    # bash does not like an empty function, add a null statement
+    :
 }
 
 function do_build_lib {
@@ -166,10 +163,11 @@ function do_build_lib {
     start_spinner
     set -x
     git config --global --add safe.directory '*'
-    (cd OpenBLAS \
-    && patch_source \
-    && CFLAGS="$CFLAGS -fvisibility=protected" make BUFFERSIZE=20 DYNAMIC_ARCH=1 USE_OPENMP=0 NUM_THREADS=64 BINARY=$bitness $interface64_flags $target_flags > /dev/null \
-    && make PREFIX=$BUILD_PREFIX $interface64_flags install )
+    pushd OpenBLAS
+    patch_source
+    CFLAGS="$CFLAGS -fvisibility=protected" make BUFFERSIZE=20 DYNAMIC_ARCH=1 USE_OPENMP=0 NUM_THREADS=64 BINARY=$bitness $interface64_flags $target_flags > /dev/null
+    make PREFIX=$BUILD_PREFIX $interface64_flags install
+    popd
     stop_spinner
     if [ "$nightly" = "1" ]; then
         local version="HEAD"