Skip to content
This repository has been archived by the owner on Aug 30, 2024. It is now read-only.

build universal2 wheel #104

Merged
merged 21 commits into from
Feb 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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[email protected];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

- if [ -n "${TOKEN}" ] ; then
anaconda -t ${TOKEN} upload -u ${ANACONDA_ORG} ${TRAVIS_BUILD_DIR}/wheelhouse/*.whl;
fi
5 changes: 4 additions & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,14 @@ 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"
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"
5 changes: 3 additions & 2 deletions azure/posix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,9 @@ jobs:
displayName: Define build env variables

- bash: |
set -e
set -ex
echo $BUILD_COMMIT

pip install virtualenv wheel
BUILD_DEPENDS="$CYTHON_BUILD_DEP"

Expand All @@ -77,7 +78,7 @@ jobs:
displayName: Build wheel

- bash: |
set -e
set -ex
source multibuild/common_utils.sh
source multibuild/travis_steps.sh
source extra_functions.sh
Expand Down
14 changes: 9 additions & 5 deletions config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,19 @@
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 {
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_wheel $@
}

function build_libs {
Expand All @@ -26,8 +29,9 @@ 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
$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 {
Expand Down
2 changes: 1 addition & 1 deletion gfortran-install
2 changes: 1 addition & 1 deletion numpy
Submodule numpy updated 1461 files