Merge pull request #48 from MacPython/migrate

move builds to github actions, update to BUFFERSIZE=20 and OpenBLAS v0.3.13

Author: mattip

.github/workflows/build.yml

@@ -1,6 +1,6 @@
 # This is a basic workflow to help you get started with Actions
 
-name: CI
+name: Windows build
 
 defaults:
   run:
@@ -13,7 +13,7 @@ on:
     branches: [ master ]
 
 env:
-  OPENBLAS_COMMIT: "v0.3.12"
+  OPENBLAS_COMMIT: "v0.3.13"
   OPENBLAS_ROOT: "c:\\opt"
 
 jobs:

.github/workflows/multibuild.yml

@@ -0,0 +1,94 @@
+name: Linux,macOS build
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    defaults:
+      run:
+        shell: bash
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        platform: [x64]
+        PLAT: [i686, x86_64]
+        INTERFACE64: ['', '1']
+        MB_ML_VER: ['', 2010, 2014]
+        exclude:
+          - os: macos-latest
+            PLAT: i686
+          - os: macos-latest
+            MB_ML_VER: 2010
+          - os: macos-latest
+            MB_ML_VER: 2014
+          - PLAT: i686
+            INTERFACE64: '1'
+    env:
+      REPO_DIR: OpenBLAS
+      OPENBLAS_COMMIT: v0.3.13
+      MACOSX_DEPLOYMENT_TARGET: 10.9
+      MB_PYTHON_VERSION: ${{ matrix.python-version }}
+      TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
+      MB_ML_VER: ${{ matrix.MB_ML_VER }}
+      INTERFACE64: ${{ matrix.INTERFACE64 }}
+      BUILD_DIR: ${{ github.workspace }}
+      SCIPY_WHEELS_NIGHTLY_ACCESS: ${{ secrets.SCIPY_WHEELS_NIGHTLY_ACCESS }}
+      MULTIBUILD_WHEELS_STAGING_ACCESS: ${{ secrets.MULTIBUILD_WHEELS_STAGING_BUILD }}
+      PLAT: ${{ matrix.PLAT }}
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: recursive
+        fetch-depth: 0
+    - name: Set up Python 3.8
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.8
+    - name: Set extra env
+      run: |
+        if [ "macos-latest" == "${{ matrix.os }}" ]; then echo "TRAVIS_OS_NAME=osx" >> $GITHUB_ENV; else echo "TRAVIS_OS_NAME=${{ matrix.os }}" >> $GITHUB_ENV; fi
+        echo "DOCKER_TEST_IMAGE=$(echo multibuild/xenial_${{ matrix.PLAT}})" >> $GITHUB_ENV;
+    - name: Print some Environment variable
+      run: |
+        echo "TRAVIS_OS_NAME: ${TRAVIS_OS_NAME}"
+        echo "PLAT: ${PLAT}"
+        echo "DOCKER_TEST_IMAGE: ${DOCKER_TEST_IMAGE}"
+    - name: Install VirtualEnv
+      run: |
+        python -m pip install --upgrade pip
+        pip install virtualenv
+    - name: Build and Install Wheels
+      run: |
+        source travis-ci/build_steps.sh
+        echo "------ BEFORE BUILD ---------"
+        before_build
+        echo "------ CLEAN CODE --------"
+        clean_code $REPO_DIR $OPENBLAS_COMMIT
+        echo "------ BUILD LIB --------"
+        build_lib "$PLAT" "$INTERFACE64"
+    - name: Upload tarballs
+      run: |
+        set -ex
+        TOKEN=${{ secrets.MULTIBUILD_WHEELS_STAGING_ACCESS }}
+        if [ "$TOKEN" == "" ]; then
+            # 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;
+            # The first -t option refers to the token, the second is the "type"
+            # option to the "upload" command
+            anaconda -t  ${TOKEN} upload \
+            --no-progress --skip -u multibuild-wheels-staging \
+            -t file -p "openblas-libs" \
+            -v "$(cd OpenBLAS && git describe --tags --abbrev=8)" \
+            -d "OpenBLAS for multibuild wheels" \
+            -s "OpenBLAS for multibuild wheels" \
+            libs/openblas*.tar.gz;
+        fi

.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.12
+        - OPENBLAS_COMMIT=v0.3.13
         - REPO_DIR=OpenBLAS
         # Following generated with:
         # travis encrypt -r MacPython/openblas-libs OPENBLAS_LIBS_STAGING_UPLOAD_TOKEN=<secret token value>
@@ -23,32 +23,6 @@ services: docker
 
 matrix:
   include:
-    - os: linux
-      env:
-        - PLAT=x86_64
-    - os: linux
-      env:
-        - PLAT=i686
-    - os: osx
-      language: objective-c
-      env:
-        - MB_PYTHON_VERSION=3.7
-        - PLAT=x86_64
-    - os: osx
-      language: objective-c
-      env:
-        - MB_PYTHON_VERSION=3.7
-        - PLAT=i686
-    - os: linux
-      env:
-        - PLAT=x86_64
-        - INTERFACE64=1
-    - os: osx
-      language: objective-c
-      env:
-        - MB_PYTHON_VERSION=3.7
-        - PLAT=x86_64
-        - INTERFACE64=1
     - os: linux
       arch: arm64
       env:
@@ -88,35 +62,6 @@ matrix:
         - INTERFACE64=1
         - MB_ML_VER=2014
         - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
-    # linux manylinux2010
-    - os: linux
-      env:
-        - PLAT=x86_64
-        - MB_ML_VER=2010
-    - os: linux
-      env:
-        - PLAT=i686
-        - MB_ML_VER=2010
-    - os: linux
-      env:
-        - PLAT=x86_64
-        - INTERFACE64=1
-        - MB_ML_VER=2010
-
-    # linux manylinux2014
-    - os: linux
-      env:
-        - PLAT=x86_64
-        - MB_ML_VER=2014
-    - os: linux
-      env:
-        - PLAT=i686
-        - MB_ML_VER=2014
-    - os: linux
-      env:
-        - PLAT=x86_64
-        - INTERFACE64=1
-        - MB_ML_VER=2014
 
 before_install:
     - source travis-ci/build_steps.sh

tools/build_openblas.sh

@@ -68,7 +68,7 @@ OPENBLAS_VERSION=$(git describe --tags)
 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 \
+     BUILD_LAPACK_DEPRECATED=1 TARGET=PRESCOTT BUFFERSIZE=20\
      COMMON_OPT="$cflags" \
      FCOMMON_OPT="$fflags" \
      MAX_STACK_ALLOC=2048 \

travis-ci/build_steps.sh

@@ -124,7 +124,7 @@ function do_build_lib {
     set -x
     (cd OpenBLAS \
     && patch_source \
-    && make DYNAMIC_ARCH=1 USE_OPENMP=0 NUM_THREADS=64 BINARY=$bitness $interface64_flags $target_flags > /dev/null \
+    && 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 )
     stop_spinner
     local version=$(cd OpenBLAS && git describe --tags --abbrev=8)