From e76439e2c87df4f15d1b0536467a4f51b533bb73 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 14 Jan 2021 01:59:18 -0600 Subject: [PATCH 01/15] try new gfortran install --- .gitmodules | 2 +- gfortran-install | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index ae67f99..7320353 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,4 +6,4 @@ url = https://github.com/matthew-brett/multibuild.git [submodule "gfortran-install"] path = gfortran-install - url = https://github.com/MacPython/gfortran-install.git + url = https://github.com/isuruf/gfortran-install.git diff --git a/gfortran-install b/gfortran-install index d430fe6..81cb28b 160000 --- a/gfortran-install +++ b/gfortran-install @@ -1 +1 @@ -Subproject commit d430fe6e38b6c5149c53f775a4437964e2f7b883 +Subproject commit 81cb28bae0aa4ecbedc91230a3e4f6e508fdc307 From c042088832045065527ad968b9f5e56ae877cc7e Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 21 Jan 2021 17:40:03 -0600 Subject: [PATCH 02/15] build for arm64 --- .github/workflows/multibuild.yml | 4 ++++ gfortran-install | 2 +- multibuild | 2 +- travis-ci/build_steps.sh | 8 ++++++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/multibuild.yml b/.github/workflows/multibuild.yml index 6c12e29..044b2d7 100644 --- a/.github/workflows/multibuild.yml +++ b/.github/workflows/multibuild.yml @@ -20,6 +20,10 @@ jobs: PLAT: [i686, x86_64] INTERFACE64: ['', '1'] MB_ML_VER: ['', 2010, 2014] + include: + - os: macos-latest + PLAT: arm64 + INTERFACE64: '' exclude: - os: macos-latest PLAT: i686 diff --git a/gfortran-install b/gfortran-install index 81cb28b..216da54 160000 --- a/gfortran-install +++ b/gfortran-install @@ -1 +1 @@ -Subproject commit 81cb28bae0aa4ecbedc91230a3e4f6e508fdc307 +Subproject commit 216da54b777d3869e7019ece0be8bf31f51113c8 diff --git a/multibuild b/multibuild index 3bd75ee..0d93db5 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit 3bd75eee8fa98ee70e29d59f4ec5a15291362cc2 +Subproject commit 0d93db5422d6677aac5cf0ff4ecb731e5e629aa0 diff --git a/travis-ci/build_steps.sh b/travis-ci/build_steps.sh index 2156573..7eace98 100644 --- a/travis-ci/build_steps.sh +++ b/travis-ci/build_steps.sh @@ -89,6 +89,9 @@ function do_build_lib { x86_64) local bitness=64 local target_flags="TARGET=PRESCOTT" + if [ -n "$IS_OSX" ]; then + target_flags="TARGET=CORE2" + fi ;; i686) local bitness=32 @@ -98,11 +101,16 @@ function do_build_lib { local bitness=64 local target_flags="TARGET=ARMV8" ;; + arm64) + local bitness=64 + local target_flags="TARGET=VORTEX" + ;; s390x) local bitness=64 ;; ppc64le) local bitness=64 + local target_flags="TARGET=POWER8" ;; *) echo "Strange plat value $plat"; exit 1 ;; esac From c173bcc6cddd30dc0beffe874dab09a0338fd2f0 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 21 Jan 2021 17:43:49 -0600 Subject: [PATCH 03/15] use python 3.9 --- .github/workflows/multibuild.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/multibuild.yml b/.github/workflows/multibuild.yml index 044b2d7..4754c69 100644 --- a/.github/workflows/multibuild.yml +++ b/.github/workflows/multibuild.yml @@ -51,10 +51,10 @@ jobs: with: submodules: recursive fetch-depth: 0 - - name: Set up Python 3.8 + - name: Set up Python 3.9 uses: actions/setup-python@v2 with: - python-version: 3.8 + python-version: 3.9 - 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 From 93f5531949972b2886c72165da77782ee53c0876 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 21 Jan 2021 17:45:48 -0600 Subject: [PATCH 04/15] use 3.9 in build_steps.sh --- travis-ci/build_steps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis-ci/build_steps.sh b/travis-ci/build_steps.sh index 7eace98..e03126d 100644 --- a/travis-ci/build_steps.sh +++ b/travis-ci/build_steps.sh @@ -7,7 +7,7 @@ ROOT_DIR=$(dirname $(dirname "${BASH_SOURCE[0]}")) source ${ROOT_DIR}/multibuild/common_utils.sh source ${ROOT_DIR}/gfortran-install/gfortran_utils.sh -MB_PYTHON_VERSION=3.7 +MB_PYTHON_VERSION=3.9 function before_build { # Manylinux Python version set in build_lib From ca85acd4164b993d9284fbc04ab82dade51ec5d5 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 21 Jan 2021 17:49:41 -0600 Subject: [PATCH 05/15] update gfortran-install --- .github/workflows/multibuild.yml | 1 + gfortran-install | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/multibuild.yml b/.github/workflows/multibuild.yml index 4754c69..b4ced04 100644 --- a/.github/workflows/multibuild.yml +++ b/.github/workflows/multibuild.yml @@ -24,6 +24,7 @@ jobs: - os: macos-latest PLAT: arm64 INTERFACE64: '' + platform: [x64] exclude: - os: macos-latest PLAT: i686 diff --git a/gfortran-install b/gfortran-install index 216da54..0d1fb6b 160000 --- a/gfortran-install +++ b/gfortran-install @@ -1 +1 @@ -Subproject commit 216da54b777d3869e7019ece0be8bf31f51113c8 +Subproject commit 0d1fb6b6105f620c66d6959b996739d4a92abfab From 34f356426a73f4c0fb24b2ca08386b915f1a90bf Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 21 Jan 2021 17:50:19 -0600 Subject: [PATCH 06/15] skip linux builds for now --- .github/workflows/multibuild.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/multibuild.yml b/.github/workflows/multibuild.yml index b4ced04..5871dae 100644 --- a/.github/workflows/multibuild.yml +++ b/.github/workflows/multibuild.yml @@ -26,6 +26,7 @@ jobs: INTERFACE64: '' platform: [x64] exclude: + - os: ubuntu-latest - os: macos-latest PLAT: i686 - os: macos-latest From 4a090079b97e9d88d52b2047eed446eb727dd8e1 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 21 Jan 2021 17:59:19 -0600 Subject: [PATCH 07/15] verbose --- travis-ci/build_steps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis-ci/build_steps.sh b/travis-ci/build_steps.sh index e03126d..1cecd8b 100644 --- a/travis-ci/build_steps.sh +++ b/travis-ci/build_steps.sh @@ -132,7 +132,7 @@ function do_build_lib { set -x (cd OpenBLAS \ && patch_source \ - && make BUFFERSIZE=20 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 \ && make PREFIX=$BUILD_PREFIX $interface64_flags install ) stop_spinner local version=$(cd OpenBLAS && git describe --tags --abbrev=8) From 19ba74a27bb7f9dbf342471941c702838559be06 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 21 Jan 2021 18:06:33 -0600 Subject: [PATCH 08/15] debug --- travis-ci/build_steps.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/travis-ci/build_steps.sh b/travis-ci/build_steps.sh index 1cecd8b..7620406 100644 --- a/travis-ci/build_steps.sh +++ b/travis-ci/build_steps.sh @@ -81,6 +81,7 @@ function do_build_lib { # # Depends on globals # BUILD_PREFIX - install suffix e.g. "/usr/local" + env local plat=$1 local suffix=$2 local interface64=$3 From cf836ed4e0b50db592d9e19aeb063469b8034457 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 21 Jan 2021 18:09:55 -0600 Subject: [PATCH 09/15] use wrap_wheel_builder --- .github/workflows/build.yml | 99 ------------------------------------- travis-ci/build_steps.sh | 2 +- 2 files changed, 1 insertion(+), 100 deletions(-) delete mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index ae0783c..0000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,99 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: Windows build - -defaults: - run: - shell: bash - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - -env: - OPENBLAS_COMMIT: "v0.3.13" - OPENBLAS_ROOT: "c:\\opt" - -jobs: - build: - strategy: - matrix: - BUILD_BITS: [64, 32] - INTERFACE64: ['1', ''] - os: [windows-latest] - exclude: - - BUILD_BITS: 32 - INTERFACE64: 1 - fail-fast: false - runs-on: ${{ matrix.os }} - - steps: - - uses: actions/checkout@v2 - - uses: ilammy/msvc-dev-cmd@v1 - - - name: Setup - run: | - BITS=${{ matrix.BUILD_BITS }} - echo "BUILD_BITS=$BITS" >> $GITHUB_ENV; - if [ "$BITS" == "32" ]; then - echo "PLAT=i686" >> $GITHUB_ENV; - else - echo "PLAT=x86_64" >> $GITHUB_ENV; - fi - echo "START_DIR=$PWD" >> $GITHUB_ENV; - choco install -y zip - - - run: | - choco install -y mingw --forcex86 --force --version=8.1.0 - choco install -y make - name: Install 32-bit mingw - shell: powershell - if: ${{ matrix.BUILD_BITS == '32' }} - - - run: | - # see https://www.mail-archive.com/gcc-bugs@gcc.gnu.org/msg586184.html - if [ "${{ matrix.BUILD_BITS }}" == "64" ]; then - include=/c/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/lib/gcc/x86_64-w64-mingw32/8.1.0/include/avx512fintrin.h - else - include=/c/ProgramData/Chocolatey/lib/mingw/tools/install/mingw32/lib/gcc/i686-w64-mingw32/8.1.0/include/avx512fintrin.h - fi - sed -i -e"s/_mm512_abs_pd (__m512 __A)/_mm512_abs_pd (__m512d __A)/" $include - name: Fix gcc bug - - - name: Build - run: | - BITS=${{ matrix.BUILD_BITS }} - if [ "${{ matrix.INTERFACE64 }}" == "1" ]; then - export INTERFACE64=1 - fi - if [ "$BITS" == "32" ]; then - export PATH=/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw32/bin:$PATH - fi - echo $PATH - git submodule update --init --recursive - tools/build_openblas.sh - - - name: Test - run: | - BITS=${{ matrix.BUILD_BITS }} - if [ "$BITS" == "32" ]; then - export PATH=/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw32/bin:$PATH - fi - if [ "${{ matrix.INTERFACE64 }}" == "1" ]; then - export INTERFACE64=1 - fi - tools/build_gfortran.sh - cp test.exe builds - cp test_dyn.exe builds - ./test.exe - cp $(cygpath $OPENBLAS_ROOT)/$BITS/bin/*.dll . - ./test_dyn.exe - - - name: Upload - 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 - tools/upload_to_anaconda_staging.sh diff --git a/travis-ci/build_steps.sh b/travis-ci/build_steps.sh index 7620406..a159eae 100644 --- a/travis-ci/build_steps.sh +++ b/travis-ci/build_steps.sh @@ -44,7 +44,7 @@ function build_lib { # Make directory to store built archive if [ -n "$IS_OSX" ]; then # Do build, add gfortran hash to end of name - do_build_lib "$plat" "gf_${GFORTRAN_SHA:0:7}" "$interface64" + wrap_wheel_builder do_build_lib "$plat" "gf_${GFORTRAN_SHA:0:7}" "$interface64" return fi # Manylinux wrapper From 72e6b5f286a4c2b7a27e5884731a3e69c43fd7db Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 21 Jan 2021 18:17:33 -0600 Subject: [PATCH 10/15] use macos-11.0 image --- .github/workflows/multibuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/multibuild.yml b/.github/workflows/multibuild.yml index 5871dae..cd72cda 100644 --- a/.github/workflows/multibuild.yml +++ b/.github/workflows/multibuild.yml @@ -21,7 +21,7 @@ jobs: INTERFACE64: ['', '1'] MB_ML_VER: ['', 2010, 2014] include: - - os: macos-latest + - os: macos-11.0 PLAT: arm64 INTERFACE64: '' platform: [x64] From 3e16738f92129434cc206683f6216560aa53a94a Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 21 Jan 2021 18:31:17 -0600 Subject: [PATCH 11/15] use macos-latest with new xcode --- .github/workflows/multibuild.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/multibuild.yml b/.github/workflows/multibuild.yml index cd72cda..bfcd196 100644 --- a/.github/workflows/multibuild.yml +++ b/.github/workflows/multibuild.yml @@ -21,7 +21,7 @@ jobs: INTERFACE64: ['', '1'] MB_ML_VER: ['', 2010, 2014] include: - - os: macos-11.0 + - os: macos-latest PLAT: arm64 INTERFACE64: '' platform: [x64] @@ -72,6 +72,8 @@ jobs: pip install virtualenv - name: Build and Install Wheels run: | + sudo xcode-select -switch /Applications/Xcode_12.2.app + export SDKROOT=/Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk source travis-ci/build_steps.sh echo "------ BEFORE BUILD ---------" before_build From 060da29a6c2f87835e92d3e61d1d749c4c4ad1d3 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sat, 23 Jan 2021 15:00:49 -0600 Subject: [PATCH 12/15] remove debug --- .github/workflows/build.yml | 99 ++++++++++++++++++++++++++++++++ .github/workflows/multibuild.yml | 5 +- .gitmodules | 2 +- gfortran-install | 2 +- travis-ci/build_steps.sh | 3 +- 5 files changed, 104 insertions(+), 7 deletions(-) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..ae0783c --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,99 @@ +# This is a basic workflow to help you get started with Actions + +name: Windows build + +defaults: + run: + shell: bash + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +env: + OPENBLAS_COMMIT: "v0.3.13" + OPENBLAS_ROOT: "c:\\opt" + +jobs: + build: + strategy: + matrix: + BUILD_BITS: [64, 32] + INTERFACE64: ['1', ''] + os: [windows-latest] + exclude: + - BUILD_BITS: 32 + INTERFACE64: 1 + fail-fast: false + runs-on: ${{ matrix.os }} + + steps: + - uses: actions/checkout@v2 + - uses: ilammy/msvc-dev-cmd@v1 + + - name: Setup + run: | + BITS=${{ matrix.BUILD_BITS }} + echo "BUILD_BITS=$BITS" >> $GITHUB_ENV; + if [ "$BITS" == "32" ]; then + echo "PLAT=i686" >> $GITHUB_ENV; + else + echo "PLAT=x86_64" >> $GITHUB_ENV; + fi + echo "START_DIR=$PWD" >> $GITHUB_ENV; + choco install -y zip + + - run: | + choco install -y mingw --forcex86 --force --version=8.1.0 + choco install -y make + name: Install 32-bit mingw + shell: powershell + if: ${{ matrix.BUILD_BITS == '32' }} + + - run: | + # see https://www.mail-archive.com/gcc-bugs@gcc.gnu.org/msg586184.html + if [ "${{ matrix.BUILD_BITS }}" == "64" ]; then + include=/c/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/lib/gcc/x86_64-w64-mingw32/8.1.0/include/avx512fintrin.h + else + include=/c/ProgramData/Chocolatey/lib/mingw/tools/install/mingw32/lib/gcc/i686-w64-mingw32/8.1.0/include/avx512fintrin.h + fi + sed -i -e"s/_mm512_abs_pd (__m512 __A)/_mm512_abs_pd (__m512d __A)/" $include + name: Fix gcc bug + + - name: Build + run: | + BITS=${{ matrix.BUILD_BITS }} + if [ "${{ matrix.INTERFACE64 }}" == "1" ]; then + export INTERFACE64=1 + fi + if [ "$BITS" == "32" ]; then + export PATH=/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw32/bin:$PATH + fi + echo $PATH + git submodule update --init --recursive + tools/build_openblas.sh + + - name: Test + run: | + BITS=${{ matrix.BUILD_BITS }} + if [ "$BITS" == "32" ]; then + export PATH=/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw32/bin:$PATH + fi + if [ "${{ matrix.INTERFACE64 }}" == "1" ]; then + export INTERFACE64=1 + fi + tools/build_gfortran.sh + cp test.exe builds + cp test_dyn.exe builds + ./test.exe + cp $(cygpath $OPENBLAS_ROOT)/$BITS/bin/*.dll . + ./test_dyn.exe + + - name: Upload + 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 + tools/upload_to_anaconda_staging.sh diff --git a/.github/workflows/multibuild.yml b/.github/workflows/multibuild.yml index bfcd196..4d390d4 100644 --- a/.github/workflows/multibuild.yml +++ b/.github/workflows/multibuild.yml @@ -26,7 +26,6 @@ jobs: INTERFACE64: '' platform: [x64] exclude: - - os: ubuntu-latest - os: macos-latest PLAT: i686 - os: macos-latest @@ -53,10 +52,10 @@ jobs: with: submodules: recursive fetch-depth: 0 - - name: Set up Python 3.9 + - name: Set up Python 3.8 uses: actions/setup-python@v2 with: - python-version: 3.9 + 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 diff --git a/.gitmodules b/.gitmodules index 7320353..ae67f99 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,4 +6,4 @@ url = https://github.com/matthew-brett/multibuild.git [submodule "gfortran-install"] path = gfortran-install - url = https://github.com/isuruf/gfortran-install.git + url = https://github.com/MacPython/gfortran-install.git diff --git a/gfortran-install b/gfortran-install index 0d1fb6b..2644c04 160000 --- a/gfortran-install +++ b/gfortran-install @@ -1 +1 @@ -Subproject commit 0d1fb6b6105f620c66d6959b996739d4a92abfab +Subproject commit 2644c04ad9a1a64e87c6899cdb762b9a002926ad diff --git a/travis-ci/build_steps.sh b/travis-ci/build_steps.sh index a159eae..0474678 100644 --- a/travis-ci/build_steps.sh +++ b/travis-ci/build_steps.sh @@ -81,7 +81,6 @@ function do_build_lib { # # Depends on globals # BUILD_PREFIX - install suffix e.g. "/usr/local" - env local plat=$1 local suffix=$2 local interface64=$3 @@ -133,7 +132,7 @@ function do_build_lib { set -x (cd OpenBLAS \ && patch_source \ - && make BUFFERSIZE=20 DYNAMIC_ARCH=1 USE_OPENMP=0 NUM_THREADS=64 BINARY=$bitness $interface64_flags $target_flags \ + && 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) From a4cf41998c798191295856105aff7bc7533b2a6e Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sat, 23 Jan 2021 16:43:40 -0600 Subject: [PATCH 13/15] guard xcode-select --- .github/workflows/multibuild.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/multibuild.yml b/.github/workflows/multibuild.yml index 4d390d4..413f822 100644 --- a/.github/workflows/multibuild.yml +++ b/.github/workflows/multibuild.yml @@ -71,8 +71,10 @@ jobs: pip install virtualenv - name: Build and Install Wheels run: | - sudo xcode-select -switch /Applications/Xcode_12.2.app - export SDKROOT=/Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk + if [[ "$PLAT" == "arm64" ]]; then + sudo xcode-select -switch /Applications/Xcode_12.2.app + export SDKROOT=/Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk + fi source travis-ci/build_steps.sh echo "------ BEFORE BUILD ---------" before_build From 571bdeb41838abd03c82b0956af643e3f7d9544e Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 29 Jan 2021 10:58:32 -0600 Subject: [PATCH 14/15] update multibuild and make the switch labels clearer --- multibuild | 2 +- travis-ci/build_steps.sh | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/multibuild b/multibuild index 0d93db5..2bf2b36 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit 0d93db5422d6677aac5cf0ff4ecb731e5e629aa0 +Subproject commit 2bf2b360f084aaa4b166935c3bd279e2e842f6ff diff --git a/travis-ci/build_steps.sh b/travis-ci/build_steps.sh index 0474678..761370a 100644 --- a/travis-ci/build_steps.sh +++ b/travis-ci/build_steps.sh @@ -85,30 +85,31 @@ function do_build_lib { local suffix=$2 local interface64=$3 echo "Building with settings: '$plat' '$suffix' '$interface64'" - case $plat in - x86_64) + case $(get_os)-$plat in + Linux-x86_64) local bitness=64 local target_flags="TARGET=PRESCOTT" - if [ -n "$IS_OSX" ]; then - target_flags="TARGET=CORE2" - fi ;; - i686) + Darwin-x86_64) + local bitness=64 + local target_flags="TARGET=CORE2" + ;; + *-i686) local bitness=32 local target_flags="TARGET=PRESCOTT" ;; - aarch64) + Linux-aarch64) local bitness=64 local target_flags="TARGET=ARMV8" ;; - arm64) + Darwin-arm64) local bitness=64 local target_flags="TARGET=VORTEX" ;; - s390x) + *-s390x) local bitness=64 ;; - ppc64le) + *-ppc64le) local bitness=64 local target_flags="TARGET=POWER8" ;; From e1abae8feb648f82b6524b1ec31c46ec47f241d0 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sat, 30 Jan 2021 14:00:19 -0600 Subject: [PATCH 15/15] Update gfortran-install --- gfortran-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gfortran-install b/gfortran-install index 2644c04..67e8b69 160000 --- a/gfortran-install +++ b/gfortran-install @@ -1 +1 @@ -Subproject commit 2644c04ad9a1a64e87c6899cdb762b9a002926ad +Subproject commit 67e8b6983e9db975e0af82871ee99cd81e37c58b