From 7581156d1a9182ce287f11edb2e3a634d2ae1613 Mon Sep 17 00:00:00 2001 From: mattip Date: Wed, 2 Nov 2022 11:10:32 +0200 Subject: [PATCH 1/4] create OpenBLAS v0.3.21 builds, use macos-11 --- .github/workflows/build.yml | 2 +- .github/workflows/multibuild.yml | 20 +++++++++++--------- .travis.yml | 2 +- OpenBLAS | 2 +- multibuild | 2 +- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f951d784..e0d392e0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,7 @@ on: branches: [ master ] env: - OPENBLAS_COMMIT: "bfd9c1b58cd3" + OPENBLAS_COMMIT: "v0.3.21" OPENBLAS_ROOT: "c:\\opt" # Preserve working directory for calls into bash CHERE_INVOKING: "yes" diff --git a/.github/workflows/multibuild.yml b/.github/workflows/multibuild.yml index 9ddd1cba..5d251f6a 100644 --- a/.github/workflows/multibuild.yml +++ b/.github/workflows/multibuild.yml @@ -15,17 +15,17 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-11] platform: [x64] PLAT: [i686, x86_64] INTERFACE64: ['', '1'] MB_ML_VER: ['', 2010, 2014] include: - - os: macos-latest + - os: macos-11 PLAT: arm64 INTERFACE64: '1' platform: [x64] - - os: macos-latest + - os: macos-11 PLAT: arm64 INTERFACE64: '' platform: [x64] @@ -42,17 +42,17 @@ jobs: MB_ML_VER: _1_1 platform: [x64] exclude: - - os: macos-latest + - os: macos-11 PLAT: i686 - - os: macos-latest + - os: macos-11 MB_ML_VER: 2010 - - os: macos-latest + - os: macos-11 MB_ML_VER: 2014 - PLAT: i686 INTERFACE64: '1' env: REPO_DIR: OpenBLAS - OPENBLAS_COMMIT: "bfd9c1b58cd3" + OPENBLAS_COMMIT: "v0.3.21" MACOSX_DEPLOYMENT_TARGET: 10.9 MB_PYTHON_VERSION: ${{ matrix.python-version }} TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }} @@ -75,8 +75,10 @@ jobs: 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 - if [ "macos-latest" == "${{ matrix.os }}" ]; then echo "LDFLAGS=-L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib" >> $GITHUB_ENV; fi + if [ "macos-11" == "${{ matrix.os }}" ]; then + echo "TRAVIS_OS_NAME=osx" >> $GITHUB_ENV; else echo "TRAVIS_OS_NAME=${{ matrix.os }}" >> $GITHUB_ENV; + echo "LDFLAGS=-L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib" >> $GITHUB_ENV; + fi echo "DOCKER_TEST_IMAGE=$(echo multibuild/xenial_${{ matrix.PLAT}})" >> $GITHUB_ENV; - name: Print some Environment variable run: | diff --git a/.travis.yml b/.travis.yml index 6d5b54d7..b7d5a538 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ env: global: # The archive that gets built has name from ``git describe`` on this # commit. - - OPENBLAS_COMMIT="bfd9c1b58cd3" + - OPENBLAS_COMMIT="v0.3.21" - REPO_DIR=OpenBLAS # Following generated with: # travis encrypt -r MacPython/openblas-libs OPENBLAS_LIBS_STAGING_UPLOAD_TOKEN= diff --git a/OpenBLAS b/OpenBLAS index bfd9c1b5..0b678b19 160000 --- a/OpenBLAS +++ b/OpenBLAS @@ -1 +1 @@ -Subproject commit bfd9c1b58cd347517d4849f06504011522cc640f +Subproject commit 0b678b19dc03f2a999d6e038814c4c50b9640a4e diff --git a/multibuild b/multibuild index 3d5effd4..d4b02ce8 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit 3d5effd42fa96635beea9f007908429876e1d88a +Subproject commit d4b02ce8c707c8a2bcc721e29f2385149f994b1f From 03db90c05959c9058264716bf7b29fc7eae4917b Mon Sep 17 00:00:00 2001 From: mattip Date: Wed, 2 Nov 2022 22:22:23 +0200 Subject: [PATCH 2/4] use setup-miniconda action on windows builds --- .github/workflows/build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e0d392e0..7d2536e2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -73,9 +73,13 @@ jobs: with: path: builds/openblas*.zip + - uses: conda-incubator/setup-miniconda@v2 + with: + activate-environment: upload + - 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.8.0 + conda install anaconda-client & $env:BASH_PATH -lc tools/upload_to_anaconda_staging.sh From c5d75f64ab0d728d5491202b993cf8746964fb28 Mon Sep 17 00:00:00 2001 From: mattip Date: Thu, 3 Nov 2022 00:46:39 +0200 Subject: [PATCH 3/4] set LIBRARY_PATH for macos --- .github/workflows/build.yml | 2 +- .github/workflows/multibuild.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7d2536e2..fa25fefc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Windows build +name: Win on: push: diff --git a/.github/workflows/multibuild.yml b/.github/workflows/multibuild.yml index 5d251f6a..b4168f73 100644 --- a/.github/workflows/multibuild.yml +++ b/.github/workflows/multibuild.yml @@ -1,4 +1,4 @@ -name: Linux,macOS build +name: multibuild on: push: @@ -78,6 +78,7 @@ jobs: if [ "macos-11" == "${{ matrix.os }}" ]; then echo "TRAVIS_OS_NAME=osx" >> $GITHUB_ENV; else echo "TRAVIS_OS_NAME=${{ matrix.os }}" >> $GITHUB_ENV; echo "LDFLAGS=-L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib" >> $GITHUB_ENV; + echo "LIBRARY_PATH=-L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib" >> $GITHUB_ENV; fi echo "DOCKER_TEST_IMAGE=$(echo multibuild/xenial_${{ matrix.PLAT}})" >> $GITHUB_ENV; - name: Print some Environment variable From 9d7042217d2be34248dbaafc04a015c70a875922 Mon Sep 17 00:00:00 2001 From: mattip Date: Thu, 3 Nov 2022 07:28:20 +0200 Subject: [PATCH 4/4] redo bash syntax --- .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 b4168f73..3fb9165a 100644 --- a/.github/workflows/multibuild.yml +++ b/.github/workflows/multibuild.yml @@ -76,9 +76,11 @@ jobs: - name: Set extra env run: | if [ "macos-11" == "${{ matrix.os }}" ]; then - echo "TRAVIS_OS_NAME=osx" >> $GITHUB_ENV; else echo "TRAVIS_OS_NAME=${{ matrix.os }}" >> $GITHUB_ENV; + echo "TRAVIS_OS_NAME=osx" >> $GITHUB_ENV; echo "LDFLAGS=-L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib" >> $GITHUB_ENV; echo "LIBRARY_PATH=-L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib" >> $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