Merge pull request #141 from mattip/no-patch

use new LIBNAMEPREFIX, LIBNAMESUFFIS, FIXED_LIBNAME options instead of patching

Author: mattip

.github/workflows/posix.yml

@@ -47,7 +47,7 @@ jobs:
             INTERFACE64: '1'
     env:
       REPO_DIR: OpenBLAS
-      OPENBLAS_COMMIT: "v0.3.26"
+      OPENBLAS_COMMIT: "5403900539"
       NIGHTLY: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
       MACOSX_DEPLOYMENT_TARGET: 10.9
       MB_PYTHON_VERSION: ${{ matrix.python-version }}

.github/workflows/windows.yml

@@ -7,7 +7,7 @@ on:
     branches: [ main ]
 
 env:
-  OPENBLAS_COMMIT: "v0.3.26"
+  OPENBLAS_COMMIT: "5403900539"
   OPENBLAS_ROOT: "c:\\opt"
   # Preserve working directory for calls into bash
   # Without this, invoking bash will cd to the home directory
@@ -27,6 +27,7 @@ jobs:
       fail-fast: false
     runs-on: ${{ matrix.os }}
 
+    timeout-minutes: 90
     steps:
     - uses: actions/[email protected]
     - name: install-rtools

.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.26"
+        - OPENBLAS_COMMIT="5403900539"
         - REPO_DIR=OpenBLAS
 
 language: python

OpenBLAS

@@ -8,7 +8,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "scipy-openblas64"
-version = "0.3.26.0.5"
+version = "0.3.26.238.0"
 requires-python = ">=3.7"
 description = "Provides OpenBLAS for python packaging"
 readme = "README.md"

multibuild

@@ -83,14 +83,15 @@ if [ "$if_bits" == "64" ]; then
 else
     interface_flags=""
 fi
-interface_flags="$interface_flags SYMBOLPREFIX=scipy_"
+# On windows, the LIBNAMEPREFIX is not needed, SYMBOLPREFIX is added to the lib
+# name LIBPREFIX in Makefile.system.
+interface_flags="$interface_flags SYMBOLPREFIX=scipy_ FIXED_LIBNAME=1"
 
 # Build name for output library from gcc version and OpenBLAS commit.
 GCC_TAG="gcc_$(gcc -dumpversion | tr .- _)"
 OPENBLAS_VERSION=$(git describe --tags --abbrev=8)
 # Build OpenBLAS
 # Variable used in creating output libraries
-export LIBNAMESUFFIX=${OPENBLAS_VERSION}-${GCC_TAG}
 make BINARY=$build_bits DYNAMIC_ARCH=1 USE_THREAD=1 USE_OPENMP=0 \
      NUM_THREADS=24 NO_WARMUP=1 NO_AFFINITY=1 CONSISTENT_FPCSR=1 \
      BUILD_LAPACK_DEPRECATED=1 TARGET=PRESCOTT BUFFERSIZE=20\
@@ -100,7 +101,7 @@ make BINARY=$build_bits DYNAMIC_ARCH=1 USE_THREAD=1 USE_OPENMP=0 \
      MAX_STACK_ALLOC=2048 \
      $interface_flags
 make PREFIX=$openblas_root/$build_bits $interface_flags install
-DLL_BASENAME=libscipy_openblas${SYMBOLSUFFIX}_${LIBNAMESUFFIX}
+DLL_BASENAME=libscipy_openblas${SYMBOLSUFFIX}${LIBNAMESUFFIX}
 
 # OpenBLAS does not build a symbol-suffixed static library on Windows:
 # do it ourselves. On 32-bit builds, the objcopy.def names need a '_' prefix

patches/0001-create-a-single-shared-object.patch

@@ -149,17 +149,18 @@ function do_build_lib {
     esac
     case $interface64 in
         1)
-            local interface_flags="INTERFACE64=1 SYMBOLSUFFIX=64_ SYMBOLPREFIX=scipy_ OBJCONV=$PWD/objconv/objconv";
+            local interface_flags="INTERFACE64=1 SYMBOLSUFFIX=64_ LIBNAMESUFFIX=64_ OBJCONV=$PWD/objconv/objconv";
             local symbolsuffix="64_";
             if [ -n "$IS_OSX" ]; then
                 $PWD/objconv/objconv --help
             fi
             ;;
         *)
-            local interface_flags="SYMBOLPREFIX=scipy_ OBJCONV=$PWD/objconv/objconv"
+            local interface_flags="OBJCONV=$PWD/objconv/objconv"
             local symbolsuffix="";
             ;;
     esac
+    interface_flags="$interface_flags SYMBOLPREFIX=scipy_ LIBNAMEPREFIX=scipy_ FIXED_LIBNAME=1"
     mkdir -p libs
     start_spinner
     set -x