From 8b042bd975b1cb62b6d45671c0b8db690f45f3c9 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 5 Feb 2021 12:17:17 -0600 Subject: [PATCH 01/21] build universal2 wheel --- azure-pipelines.yml | 3 +++ gfortran-install | 2 +- multibuild | 2 +- numpy | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 03288b9..3ce2cd5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -112,5 +112,8 @@ jobs: MB_PYTHON_VERSION: "3.7" py_3.8_64: MB_PYTHON_VERSION: "3.8" + py_3.9_universal2: + MB_PYTHON_VERSION: "3.9" + PLAT: universal2 py_3.9_64: MB_PYTHON_VERSION: "3.9" diff --git a/gfortran-install b/gfortran-install index d430fe6..67e8b69 160000 --- a/gfortran-install +++ b/gfortran-install @@ -1 +1 @@ -Subproject commit d430fe6e38b6c5149c53f775a4437964e2f7b883 +Subproject commit 67e8b6983e9db975e0af82871ee99cd81e37c58b diff --git a/multibuild b/multibuild index ec386ef..bfc6d8b 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit ec386efaa9e6840b552d845dfc4d597f6b97a2b7 +Subproject commit bfc6d8b82d8c37b8ca1e386081fd800e81c6ab4a diff --git a/numpy b/numpy index 9e419a0..6373ded 160000 --- a/numpy +++ b/numpy @@ -1 +1 @@ -Subproject commit 9e419a0359cb5dbb9ae0b2711ab7a59b121a98cf +Subproject commit 6373ded2ed1403cc3ec40dc5d919b316a1b58e44 From 1374d201e468d977d33dd99249596ca6a9bc5ab4 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sat, 6 Feb 2021 13:31:10 -0600 Subject: [PATCH 02/21] macos 10.15 --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3ce2cd5..0af495c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -106,7 +106,7 @@ jobs: - template: azure/posix.yml parameters: name: macOS - vmImage: macOS-10.14 + vmImage: macOS-10.15 matrix: py_3.7_64: MB_PYTHON_VERSION: "3.7" From 4f770632a2799e94b033aa5f6192840c9e7d5a99 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sat, 6 Feb 2021 13:42:39 -0600 Subject: [PATCH 03/21] Use BUILD_PREFIX instead of /usr/local --- config.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config.sh b/config.sh index 26b8098..d27caf9 100644 --- a/config.sh +++ b/config.sh @@ -26,8 +26,10 @@ function build_libs { $PYTHON_EXE -mpip install urllib3 $PYTHON_EXE -c"import platform; print('platform.uname().machine', platform.uname().machine)" basedir=$($PYTHON_EXE numpy/tools/openblas_support.py) - $use_sudo cp -r $basedir/lib/* /usr/local/lib - $use_sudo cp $basedir/include/* /usr/local/include + mkdir -p $BUILD_PREFIX/lib + mkdir -p $BUILD_PREFIX/include + $use_sudo cp -r $basedir/lib/* $BUILD_PREFIX/lib + $use_sudo cp $basedir/include/* $BUILD_PREFIX/include } function get_test_cmd { From ab4a1a1893f7fb89a909b674fbba8e6348c01b59 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 15 Feb 2021 10:15:59 -0600 Subject: [PATCH 04/21] update multibuild and wrap wheel builder --- config.sh | 4 +--- multibuild | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/config.sh b/config.sh index d27caf9..f2e9d86 100644 --- a/config.sh +++ b/config.sh @@ -5,15 +5,13 @@ if [ $(uname) == "Linux" ]; then IS_LINUX=1; fi source gfortran-install/gfortran_utils.sh function build_wheel { - local lib_plat=$PLAT if [ -n "$IS_OSX" ]; then install_gfortran fi echo gcc --version echo `gcc --version` - build_libs $lib_plat # Fix version error for development wheels by using bdist_wheel - build_bdist_wheel $@ + wrap_wheel_builder build_libs && build_bdist_wheel $@ } function build_libs { diff --git a/multibuild b/multibuild index bfc6d8b..6567257 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit bfc6d8b82d8c37b8ca1e386081fd800e81c6ab4a +Subproject commit 656725778f1a8b78e8b3a84aebb7b18eaf0e6f38 From 8112543bba1285343afc644bb8b97357545efcae Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 15 Feb 2021 11:12:49 -0600 Subject: [PATCH 05/21] verbose --- azure/posix.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index 5fd9252..94973a2 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -59,7 +59,7 @@ jobs: displayName: Define build env variables - bash: | - set -e + set -ex echo $BUILD_COMMIT pip install virtualenv wheel BUILD_DEPENDS="$CYTHON_BUILD_DEP" @@ -77,7 +77,7 @@ jobs: displayName: Build wheel - bash: | - set -e + set -ex source multibuild/common_utils.sh source multibuild/travis_steps.sh source extra_functions.sh From 63948af50d39bf428e905ee513ccea64e5c909f5 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 24 Feb 2021 08:02:59 -0600 Subject: [PATCH 06/21] update multibuild --- multibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multibuild b/multibuild index 6567257..56258b4 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit 656725778f1a8b78e8b3a84aebb7b18eaf0e6f38 +Subproject commit 56258b40e1b615a073ae5026a7aa6521a03482f5 From 13a37f26cda038bf7267883e4826b9f9877dd872 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 24 Feb 2021 12:07:37 -0600 Subject: [PATCH 07/21] update multibuild --- multibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multibuild b/multibuild index 56258b4..8be8042 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit 56258b40e1b615a073ae5026a7aa6521a03482f5 +Subproject commit 8be8042f892216f4f8af735b4fcb7ac2b97c0b84 From 5e528c4a19409748549d943e69dd8e82002b6457 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 25 Feb 2021 02:22:36 -0600 Subject: [PATCH 08/21] Update posix.yml --- azure/posix.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/azure/posix.yml b/azure/posix.yml index 94973a2..bcc4233 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -61,6 +61,11 @@ jobs: - bash: | set -ex echo $BUILD_COMMIT + + if [[ "$PLAT" == "arm64" ]]; then + sudo xcode-select -switch /Applications/Xcode_12.2.app/Contents/Developer + env + fi pip install virtualenv wheel BUILD_DEPENDS="$CYTHON_BUILD_DEP" From 28d31d404cb734fa1c3c2c8a7300bbf378f66f54 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 25 Feb 2021 02:26:13 -0600 Subject: [PATCH 09/21] Update posix.yml --- azure/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/posix.yml b/azure/posix.yml index bcc4233..12d6a9c 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -62,7 +62,7 @@ jobs: set -ex echo $BUILD_COMMIT - if [[ "$PLAT" == "arm64" ]]; then + if [[ "$PLAT" == "arm64" || "$PLAT" == "universal2" ]]; then sudo xcode-select -switch /Applications/Xcode_12.2.app/Contents/Developer env fi From a0d8a113b8a5996ca9fb8a16ad97106194171443 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 25 Feb 2021 02:33:31 -0600 Subject: [PATCH 10/21] Update posix.yml --- azure/posix.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/azure/posix.yml b/azure/posix.yml index 12d6a9c..c760df4 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -63,8 +63,10 @@ jobs: echo $BUILD_COMMIT if [[ "$PLAT" == "arm64" || "$PLAT" == "universal2" ]]; then - sudo xcode-select -switch /Applications/Xcode_12.2.app/Contents/Developer + export DEVELOPER_DIR=/Applications/Xcode_12.4.app/Contents/Developer + sudo xcode-select -switch /Applications/Xcode_12.4.app/Contents/Developer env + ls /Library/Developer/CommandLineTools/SDKs/ fi pip install virtualenv wheel BUILD_DEPENDS="$CYTHON_BUILD_DEP" From c3d6faf537d96882c82a2f342bea3d06200b6611 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 25 Feb 2021 02:40:13 -0600 Subject: [PATCH 11/21] Update posix.yml --- azure/posix.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure/posix.yml b/azure/posix.yml index c760df4..bbf2b03 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -67,6 +67,7 @@ jobs: sudo xcode-select -switch /Applications/Xcode_12.4.app/Contents/Developer env ls /Library/Developer/CommandLineTools/SDKs/ + xcrun --sdk macosx --show-sdk-version fi pip install virtualenv wheel BUILD_DEPENDS="$CYTHON_BUILD_DEP" From 449dfce16c28531f8877c359639959cd8f266eb6 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 25 Feb 2021 02:43:10 -0600 Subject: [PATCH 12/21] Update posix.yml --- azure/posix.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index bbf2b03..0a0e7c5 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -63,8 +63,7 @@ jobs: echo $BUILD_COMMIT if [[ "$PLAT" == "arm64" || "$PLAT" == "universal2" ]]; then - export DEVELOPER_DIR=/Applications/Xcode_12.4.app/Contents/Developer - sudo xcode-select -switch /Applications/Xcode_12.4.app/Contents/Developer + sudo xcode-select -switch /Applications/Xcode_12.4.app/ env ls /Library/Developer/CommandLineTools/SDKs/ xcrun --sdk macosx --show-sdk-version From 003de3c4639f5a4d070cbc5be1758b8974b6562d Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 25 Feb 2021 05:19:22 -0600 Subject: [PATCH 13/21] update multibuild --- multibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multibuild b/multibuild index 8be8042..cdd6c87 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit 8be8042f892216f4f8af735b4fcb7ac2b97c0b84 +Subproject commit cdd6c87043ae9a38653ae82d0bc7258471828bb9 From bf23b4ef47e2944de0bee97620480b7db418dfaf Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 25 Feb 2021 12:26:48 -0600 Subject: [PATCH 14/21] update multibuild --- multibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multibuild b/multibuild index cdd6c87..b4b38f4 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit cdd6c87043ae9a38653ae82d0bc7258471828bb9 +Subproject commit b4b38f4b16b79dcc59f7bea4a1810054ad8181ba From 0e2c0e8e1182d13892d4cb3ed621a54d2b07a72b Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 25 Feb 2021 13:03:15 -0600 Subject: [PATCH 15/21] Update posix.yml --- azure/posix.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure/posix.yml b/azure/posix.yml index 0a0e7c5..80c0e75 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -67,6 +67,7 @@ jobs: env ls /Library/Developer/CommandLineTools/SDKs/ xcrun --sdk macosx --show-sdk-version + xcrun --sdk macosx --show-sdk-path fi pip install virtualenv wheel BUILD_DEPENDS="$CYTHON_BUILD_DEP" From 20f1b2000090ee1c7234f253a97821022eca9c1a Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 25 Feb 2021 13:09:00 -0600 Subject: [PATCH 16/21] Update posix.yml --- azure/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/posix.yml b/azure/posix.yml index 80c0e75..b9906dc 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -67,7 +67,7 @@ jobs: env ls /Library/Developer/CommandLineTools/SDKs/ xcrun --sdk macosx --show-sdk-version - xcrun --sdk macosx --show-sdk-path + export SDKROOT=$(xcrun --sdk macosx --show-sdk-path) fi pip install virtualenv wheel BUILD_DEPENDS="$CYTHON_BUILD_DEP" From 361b43688804c2a6f91b2daef348cd5e9821fa37 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 25 Feb 2021 13:31:32 -0600 Subject: [PATCH 17/21] Fix OpenBLAS directory --- config.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/config.sh b/config.sh index f2e9d86..1aa2998 100644 --- a/config.sh +++ b/config.sh @@ -28,6 +28,7 @@ function build_libs { mkdir -p $BUILD_PREFIX/include $use_sudo cp -r $basedir/lib/* $BUILD_PREFIX/lib $use_sudo cp $basedir/include/* $BUILD_PREFIX/include + export OPENBLAS=$BUILD_PREFIX } function get_test_cmd { From b2357a440a2118ecf4fa8ccf963540174fb2e462 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 25 Feb 2021 15:13:06 -0600 Subject: [PATCH 18/21] Fix calling wrap_wheel_builder --- config.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/config.sh b/config.sh index 1aa2998..d086717 100644 --- a/config.sh +++ b/config.sh @@ -4,6 +4,11 @@ if [ $(uname) == "Linux" ]; then IS_LINUX=1; fi source gfortran-install/gfortran_utils.sh +function _build_wheel { + build_libs + build_bdist_wheel $@ +} + function build_wheel { if [ -n "$IS_OSX" ]; then install_gfortran @@ -11,7 +16,7 @@ function build_wheel { echo gcc --version echo `gcc --version` # Fix version error for development wheels by using bdist_wheel - wrap_wheel_builder build_libs && build_bdist_wheel $@ + wrap_wheel_builder _build_wheel $@ } function build_libs { From 25c6d9ad2ca4ad3ab1facaf9a4859013d5212954 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 25 Feb 2021 15:36:38 -0600 Subject: [PATCH 19/21] update multibuild and remove hacks --- azure/posix.yml | 7 ------- multibuild | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index b9906dc..a213662 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -62,13 +62,6 @@ jobs: set -ex echo $BUILD_COMMIT - if [[ "$PLAT" == "arm64" || "$PLAT" == "universal2" ]]; then - sudo xcode-select -switch /Applications/Xcode_12.4.app/ - env - ls /Library/Developer/CommandLineTools/SDKs/ - xcrun --sdk macosx --show-sdk-version - export SDKROOT=$(xcrun --sdk macosx --show-sdk-path) - fi pip install virtualenv wheel BUILD_DEPENDS="$CYTHON_BUILD_DEP" diff --git a/multibuild b/multibuild index b4b38f4..cc068f5 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit b4b38f4b16b79dcc59f7bea4a1810054ad8181ba +Subproject commit cc068f5b28d741bcf5898487ea63684bc5f69a8a From 6f57fb5dd944e6f4242229fb36b78a155e0248da Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 25 Feb 2021 15:43:55 -0600 Subject: [PATCH 20/21] fix ppc64le builds --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bd50c5f..96d8cc0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -81,7 +81,7 @@ after_success: ANACONDA_ORG="multibuild-wheels-staging"; TOKEN=${NUMPY_STAGING_UPLOAD_TOKEN}; fi - - pip install git+https://github.com/Anaconda-Server/anaconda-client; + - pip install git+https://github.com/Anaconda-Server/anaconda-client.git@1.7.2; - if [ -n "${TOKEN}" ] ; then anaconda -t ${TOKEN} upload -u ${ANACONDA_ORG} ${TRAVIS_BUILD_DIR}/wheelhouse/*.whl; fi From bea046ffb6d81b5e0ada9e43af7f7b74887286d5 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 26 Feb 2021 07:28:25 -0600 Subject: [PATCH 21/21] reduce diff --- config.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/config.sh b/config.sh index d086717..8f3b772 100644 --- a/config.sh +++ b/config.sh @@ -29,8 +29,6 @@ function build_libs { $PYTHON_EXE -mpip install urllib3 $PYTHON_EXE -c"import platform; print('platform.uname().machine', platform.uname().machine)" basedir=$($PYTHON_EXE numpy/tools/openblas_support.py) - mkdir -p $BUILD_PREFIX/lib - mkdir -p $BUILD_PREFIX/include $use_sudo cp -r $basedir/lib/* $BUILD_PREFIX/lib $use_sudo cp $basedir/include/* $BUILD_PREFIX/include export OPENBLAS=$BUILD_PREFIX