Merge pull request #143 from mattip/untangle

update to latest HEAD, consistently use LIBNAME

Author: mattip

.github/workflows/posix.yml

@@ -47,7 +47,7 @@ jobs:
             INTERFACE64: '1'
     env:
       REPO_DIR: OpenBLAS
-      OPENBLAS_COMMIT: "5403900539"
+      OPENBLAS_COMMIT: "5fbe25954b"
       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: "5403900539"
+  OPENBLAS_COMMIT: "5fbe25954b"
   OPENBLAS_ROOT: "c:\\opt"
   # Preserve working directory for calls into bash
   # Without this, invoking bash will cd to the home directory

.travis.yml

@@ -2,7 +2,7 @@ env:
     global:
         # The archive that gets built has name from ``git describe`` on this
         # commit.
-        - OPENBLAS_COMMIT="5403900539"
+        - OPENBLAS_COMMIT="5fbe25954b"
         - REPO_DIR=OpenBLAS
 
 language: python

OpenBLAS

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

multibuild

@@ -11,7 +11,7 @@ OBP=$(cygpath $OPENBLAS_ROOT\\$BUILD_BITS)
 
 static_libname=$(find $OBP/lib -maxdepth 1 -type f -name '*.a' \! -name '*.dll.a' | tail -1)
 dynamic_libname=$(find $OBP/lib -maxdepth 1 -type f -name '*.dll.a' | tail -1)
-dll_name=$(echo $dynamic_libname | sed 's#/lib/#/bin/#' | sed 's/.a$//')
+dll_name=$(find $OBP/bin -maxdepth 1 -type f -name '*.dll' | tail -1)
 
 grep dpotrf $OBP/include/*
 nm $static_libname | grep dpotrf

pyproject.toml

@@ -77,15 +77,15 @@ fflags="$fextra $cflags -frecursive -ffpe-summary=invalid,zero"
 # Set suffixed-ILP64 flags
 if [ "$if_bits" == "64" ]; then
     SYMBOLSUFFIX="64_"
-    interface_flags="INTERFACE64=1 SYMBOLSUFFIX=${SYMBOLSUFFIX}"
+    interface_flags="INTERFACE64=1 SYMBOLSUFFIX=64_ LIBNAMESUFFIX=64_"
     # We override FCOMMON_OPT, so we need to set default integer manually
     fflags="$fflags -fdefault-integer-8"
 else
     interface_flags=""
 fi
 # 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"
+interface_flags="$interface_flags SYMBOLPREFIX=scipy_ LIBNAMEPREFIX=scipy_ FIXED_LIBNAME=1"
 
 # Build name for output library from gcc version and OpenBLAS commit.
 GCC_TAG="gcc_$(gcc -dumpversion | tr .- _)"