Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[llvm] [mac] Update OS X build bots with prebuilt LLVM 10 #1429

Merged
merged 4 commits into from
Jul 8, 2020
Merged
Changes from 2 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
13 changes: 11 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,22 @@ matrix:
osx_image: xcode10.3
env:
- MATRIX_EVAL="CC=clang && CXX=clang++ && PYTHON_VERSION=3.6.1 && PYTHON=python"
- LLVM_EVAL="LLVM_REMOTE_PATH=https://github.com/yuanming-hu/taichi_assets/releases/download/llvm8/taichi-llvm-8.0.1.zip && LLVM_FILE=taichi-llvm-8.0.1.zip"
- os: osx
osx_image: xcode10.3
env:
- MATRIX_EVAL="CC=clang && CXX=clang++ && PYTHON_VERSION=3.7.1 && PYTHON=python"
- LLVM_EVAL="LLVM_REMOTE_PATH=https://github.com/yuanming-hu/taichi_assets/releases/download/llvm8/taichi-llvm-8.0.1.zip && LLVM_FILE=taichi-llvm-8.0.1.zip"
- os: osx
osx_image: xcode10.3
env:
- MATRIX_EVAL="CC=clang && CXX=clang++ && PYTHON_VERSION=3.8.1 && PYTHON=python"
- LLVM_EVAL="LLVM_REMOTE_PATH=https://github.com/yuanming-hu/taichi_assets/releases/download/llvm8/taichi-llvm-8.0.1.zip && LLVM_FILE=taichi-llvm-8.0.1.zip"
- os: osx
osx_image: xcode10.3
env:
- MATRIX_EVAL="CC=clang && CXX=clang++ && PYTHON_VERSION=3.8.1 && PYTHON=python"
- LLVM_EVAL="LLVM_REMOTE_PATH=https://github.com/taichi-dev/taichi_assets/releases/download/llvm10/taichi-llvm-10.0.0-macos.zip && LLVM_FILE=taichi-llvm-10.0.0-macos.zip"
Copy link
Collaborator

Choose a reason for hiding this comment

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

IMHO we should use three LLVM 10 and one LLVM 8, since the latter is to be deprecated very soon.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Reasonable. Let's hear what @yuanming-hu thinks about this.

Copy link
Member

@yuanming-hu yuanming-hu Jul 7, 2020

Choose a reason for hiding this comment

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

Thanks for the PR!

In release mode, all four builds will be compiled, and they will try to upload to PyPI. In Python 3.8, there're both LLVM 8 and LLVM 10 builds - whichever finishes early will be uploaded to PyPI. This creates a little randomness that we don't really want :-)

For simplicity, let's build with LLVM 10 only in this PR, with python3.6-3.8. There will be three builds only. This means LLVM 8 is no longer officially maintained since no buildbot is using that anymore. We still keep the #if LLVM_VERSION < 10 macros in the code so LLVM 8 will not be immediately broken, but if in the future if necessary we can simply drop LLVM 8 support. If someone complains, we can simply ask him to use LLVM 10 instead.

We have to cut LLVM 8 support sooner or later, and I think now is a good time. The developer installation doc should also be updated to remove LLVM 8.


skip_commits:
files:
Expand All @@ -32,15 +40,16 @@ cache:

before_install:
- eval "${MATRIX_EVAL}"
- eval "${LLVM_EVAL}"
- echo $CXX
- echo $PYTHON
- sysctl -n hw.ncpu
- pwd
- cd $TRAVIS_BUILD_DIR
- mkdir taichi-llvm
- cd taichi-llvm
- wget https://github.com/yuanming-hu/taichi_assets/releases/download/llvm8/taichi-llvm-8.0.1.zip --retry-on-http-error=403 --waitretry=3 --tries=5
- unzip taichi-llvm-8.0.1.zip
- wget $LLVM_REMOTE_PATH --retry-on-http-error=403 --waitretry=3 --tries=5
- unzip $LLVM_FILE
TH3CHARLie marked this conversation as resolved.
Show resolved Hide resolved
- export PATH=$TRAVIS_BUILD_DIR/taichi-llvm/bin/:$PATH
- ls $TRAVIS_BUILD_DIR/taichi-llvm/bin/
- echo $PATH
Expand Down