Merge pull request #58 from mattip/v0.3.15

build for OpenBLAS 0.3.15

Author: mattip

.github/workflows/build.yml

@@ -13,7 +13,7 @@ on:
     branches: [ master ]
 
 env:
-  OPENBLAS_COMMIT: "af2b0d0"
+  OPENBLAS_COMMIT: "v0.3.15"
   OPENBLAS_ROOT: "c:\\opt"
 
 jobs:
@@ -95,5 +95,5 @@ jobs:
         env:
          OPENBLAS_LIBS_STAGING_UPLOAD_TOKEN: ${{ secrets.MULTIBUILD_WHEELS_STAGING_ACCESS }}
         run: |
-          pip install -q git+https://github.com/Anaconda-Platform/anaconda-client@1.7.2
+          pip install -q git+https://github.com/Anaconda-Platform/anaconda-client@1.8.0
           tools/upload_to_anaconda_staging.sh

.github/workflows/multibuild.yml

@@ -36,7 +36,7 @@ jobs:
             INTERFACE64: '1'
     env:
       REPO_DIR: OpenBLAS
-      OPENBLAS_COMMIT: af2b0d0
+      OPENBLAS_COMMIT: "v0.3.15"
       MACOSX_DEPLOYMENT_TARGET: 10.9
       MB_PYTHON_VERSION: ${{ matrix.python-version }}
       TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
@@ -90,7 +90,7 @@ jobs:
             # The token is available when under the MacPython org, not on forks
             echo "secrets.MULTIBUILD_WHEELS_STAGING_ACCESS is not defined: skipping";
         else
-            pip install git+https://github.com/Anaconda-Server/anaconda-client@1.7.2;
+            pip install git+https://github.com/Anaconda-Server/anaconda-client@1.8.0
             # The first -t option refers to the token, the second is the "type"
             # option to the "upload" command
             anaconda -t  ${TOKEN} upload \

.travis.yml

@@ -2,7 +2,7 @@ env:
     global:
         # The archive that gets built has name from ``git describe`` on this
         # commit.
-        - OPENBLAS_COMMIT=af2b0d0
+        - OPENBLAS_COMMIT="v0.3.15"
         - REPO_DIR=OpenBLAS
         # Following generated with:
         # travis encrypt -r MacPython/openblas-libs OPENBLAS_LIBS_STAGING_UPLOAD_TOKEN=<secret token value>

OpenBLAS

@@ -5,8 +5,8 @@ set -e
 cd $(cygpath "$START_DIR")
 OBP=$(cygpath $OPENBLAS_ROOT\\$BUILD_BITS)
 
-static_libname=`find $OBP/lib -maxdepth 1 -type f -name '*.a' \! -name '*.dll.a'`
-dynamic_libname=`find $OBP/lib -maxdepth 1 -type f -name '*.dll.a'`
+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)
 
 if [ "$INTERFACE64" == "1" ]; then
   gfortran -I $OBP/include -fdefault-integer-8 -o test.exe test64_.f90 $static_libname

multibuild

@@ -78,8 +78,8 @@ DLL_BASENAME=libopenblas${SYMBOLSUFFIX}_${LIBNAMESUFFIX}
 if [ "$INTERFACE64" == "1" ]; then
     # OpenBLAS does not build a symbol-suffixed static library on Windows:
     # do it ourselves
-    static_libname=`find . -maxdepth 1 -type f -name '*.a' \! -name '*.dll.a' -printf '%P\n'`
     set -x  # echo commands
+    static_libname=$(find . -maxdepth 1 -type f -name '*.a' \! -name '*.dll.a' | tail -1)
     make -C exports $interface64_flags objcopy.def
     objcopy --redefine-syms exports/objcopy.def "${static_libname}" "${static_libname}.renamed"
     cp -f "${static_libname}.renamed" "$OPENBLAS_ROOT/$BUILD_BITS/lib/${static_libname}"

tools/build_gfortran.sh

@@ -4,6 +4,7 @@ set -ex
 # Note that the anaconda-client package on PyPI is too old. Install from github
 # tag instead:
 echo $(python -c "import sys; print(sys.version)")
-pip install -q git+https://github.com/Anaconda-Platform/[email protected]
+sudo chmod -R a+w /home/travis/.cache
+pip install -q git+https://github.com/Anaconda-Platform/[email protected]
 upload_to_anaconda