diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5c4c2e4b..774ba252 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ on: branches: [ master ] env: - OPENBLAS_COMMIT: "5188aed" + OPENBLAS_COMMIT: "v0.3.20" OPENBLAS_ROOT: "c:\\opt" jobs: diff --git a/.github/workflows/multibuild.yml b/.github/workflows/multibuild.yml index 930bdc73..bda89c37 100644 --- a/.github/workflows/multibuild.yml +++ b/.github/workflows/multibuild.yml @@ -52,7 +52,7 @@ jobs: INTERFACE64: '1' env: REPO_DIR: OpenBLAS - OPENBLAS_COMMIT: "5188aed" + OPENBLAS_COMMIT: "v0.3.20" MACOSX_DEPLOYMENT_TARGET: 10.9 MB_PYTHON_VERSION: ${{ matrix.python-version }} TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }} diff --git a/.travis.yml b/.travis.yml index 62128da0..b55aa018 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="5188aed" + - OPENBLAS_COMMIT="v0.3.20" - REPO_DIR=OpenBLAS # Following generated with: # travis encrypt -r MacPython/openblas-libs OPENBLAS_LIBS_STAGING_UPLOAD_TOKEN= diff --git a/README.md b/README.md index 0654e05e..14598f00 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # Building OpenBLAS -This is a repository to trigger builds of OpenBLAS on Travis-CI and Appveyor. +This is a repository to trigger builds of OpenBLAS on Travis-CI (for aarch64, +ppc64, s390x) and github actions for all the others. The OpenBLAS libraries get uploaded to https://anaconda.org/multibuild-wheels-staging/openblas-libs/files diff --git a/_appveyor.yml b/_appveyor.yml deleted file mode 100644 index 6aa2c84f..00000000 --- a/_appveyor.yml +++ /dev/null @@ -1,72 +0,0 @@ -# vim ft=yaml - -os: Visual Studio 2015 - -environment: - global: - OPENBLAS_COMMIT: 349b722d8d09303 - OPENBLAS_ROOT: c:\opt - MSYS2_ROOT: c:\msys64 - # The value of the existing token can be retrieved at the bottom of the page at: - # https://anaconda.org/multibuild-wheels-staging/settings/access: - # To generate a new token, we need the permissions: - # - "Allow write access to the API site" - # - "Allow uploads to PyPI repositories" - # OPENBLAS_LIBS_STAGING_UPLOAD_TOKEN: this variable has been encrypted - # in the appveyor UI at: https://ci.appveyor.com/project/tylerjereddy/openblas-libs/settings/environment - PYTHON: "C:\\Python37" - - # Need for mingw-builds discussed at - # https://github.com/xianyi/OpenBLAS/issues/1503 - # Downloads via https://sourceforge.net/projects/mingw-w64/files - # Note spaces instead of %20 in URL, to avoid Windows env var expansion - matrix: - - BUILD_BITS: 64 - INTERFACE64: 1 - MINGW_URL: "https://sourceforge.net/projects/mingw-w64/files/Toolchains targetting Win64/Personal Builds/mingw-builds/7.1.0/threads-posix/seh/x86_64-7.1.0-release-posix-seh-rt_v5-rev0.7z/download" - - - BUILD_BITS: 32 - MINGW_URL: "https://sourceforge.net/projects/mingw-w64/files/Toolchains targetting Win32/Personal Builds/mingw-builds/7.1.0/threads-posix/dwarf/i686-7.1.0-release-posix-dwarf-rt_v5-rev0.7z/download" - - - BUILD_BITS: 64 - MINGW_URL: "https://sourceforge.net/projects/mingw-w64/files/Toolchains targetting Win64/Personal Builds/mingw-builds/7.1.0/threads-posix/seh/x86_64-7.1.0-release-posix-seh-rt_v5-rev0.7z/download" - -build_script: - # Build OpenBLAS, build and install the test file - - if "%BUILD_BITS%"=="32" (set PLAT=i686) else (set PLAT=x86_64) - - set VC9_ROOT=C:\Users\appveyor\AppData\Local\Programs\Common\Microsoft\Visual C++ for Python\9.0\VC - - PATH=%MSYS2_ROOT%\usr\bin;%PATH% - # Get mingw-builds compiler chain, put on path - # Quote for env var to protect spaces. - - curl -L "%MINGW_URL%" -o downloads\mingw_distro.7z - - 7z x downloads\mingw_distro.7z - - PATH=%__CD__%\mingw%BUILD_BITS%\bin;%PATH% - # Remove competing gcc / gfortran - - pacman -Rs --noconfirm gcc gcc-fortran mingw-w64-%PLAT%-toolchain - # zip needed for packing archive - - pacman -Sy --noconfirm zip - - git submodule update --init --recursive - - set MSYSTEM=MINGW%BUILD_BITS% - - set START_DIR=%__CD__% - - set SCRIPT_DIR=%START_DIR%tools\ - # Need --login to process MSYSTEM variable - - bash --login %SCRIPT_DIR%build_openblas.sh - -test_script: - - bash --login %SCRIPT_DIR%build_gfortran.sh - - copy test.exe builds - - copy test_dyn.exe builds - - bash --login -c "$(cygpath $START_DIR)test.exe" - - copy %OPENBLAS_ROOT%\%BUILD_BITS%\bin\*.dll . - - bash --login -c "$(cygpath $START_DIR)test_dyn.exe" - -on_finish: - - ps: Get-ChildItem builds\*.* | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name } - -on_success: - # Upload libraries to the shared staging area on anaconda.org - # Note that the anaconda-client package on PyPI is too old. Install from github - # tag instead: - - set PATH=%PYTHON%;%PYTHON%\Scripts;%PATH% - - pip install -q git+https://github.com/Anaconda-Platform/anaconda-client@1.7.2 - - bash --login %SCRIPT_DIR%upload_to_anaconda_staging.sh diff --git a/tools/prepare_local.bat b/tools/prepare_local.bat deleted file mode 100644 index f54caeba..00000000 --- a/tools/prepare_local.bat +++ /dev/null @@ -1,9 +0,0 @@ -REM Run example build locally -REM For debugging. -REM Careful, this might be out of date. Check against appveyor.yml -set OPENBLAS_COMMIT=5f998ef -set OPENBLAS_ROOT=c:\opt -set MSYS2_ROOT=C:\msys64 -set BUILD_BITS=32 -set VC9_ROOT=C:\Users\appveyor\AppData\Local\Programs\Common\Microsoft\Visual C++ for Python\9.0\VC -git submodule update --init --recursive diff --git a/travis-ci/build_steps.sh b/travis-ci/build_steps.sh index 161efe52..aa34e65f 100644 --- a/travis-ci/build_steps.sh +++ b/travis-ci/build_steps.sh @@ -160,6 +160,7 @@ function do_build_lib { mkdir -p libs start_spinner set -x + git config --global --add safe.directory '*' (cd OpenBLAS \ && patch_source \ && make BUFFERSIZE=20 DYNAMIC_ARCH=1 USE_OPENMP=0 NUM_THREADS=64 BINARY=$bitness $interface64_flags $target_flags > /dev/null \ @@ -183,7 +184,7 @@ function do_build_lib { $BUILD_PREFIX/include/*blas* \ $BUILD_PREFIX/include/*lapack* \ $BUILD_PREFIX/lib/libopenblas* \ - $BUILD_PREFIX/lib/pkgconfig* \ + $BUILD_PREFIX/lib/pkgconfig/openblas* \ $BUILD_PREFIX/lib/cmake/openblas }