Skip to content

Commit

Permalink
[ci] Move macos10.15 job to build with LLVM 15 (taichi-dev#6634)
Browse files Browse the repository at this point in the history
Issue: taichi-dev#6447 

### Brief Summary
Getting closer...
  • Loading branch information
ailzhang authored Nov 17, 2022
1 parent 1fba52f commit 9c320cf
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/scripts/unix-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,16 @@ if [[ "$LLVM_VERSION" == "15" ]]; then
wget https://github.com/ailzhang/torchhub_example/releases/download/0.2/taichi-llvm-15-linux.zip
unzip taichi-llvm-15-linux.zip && rm taichi-llvm-15-linux.zip
export PATH="$PWD/taichi-llvm-15/bin:$PATH"
elif [[ $OSTYPE == "darwin"* ]]; then
elif [ "$(uname -s):$(uname -m)" == "Darwin:arm64" ]; then
# The following commands are done manually to save time.
#wget https://github.com/ailzhang/torchhub_example/releases/download/0.2/taichi-llvm-15-m1.zip
#unzip taichi-llvm-15-m1.zip && rm taichi-llvm-15-m1.zip
export PATH="/Users/github/taichi-llvm-15-m1/bin:$PATH"
elif [ "$(uname -s):$(uname -m)" == "Darwin:x86_64" ]; then
# The following commands are done manually to save time.
#wget https://github.com/ailzhang/torchhub_example/releases/download/0.2/llvm-15-macos10.15.zip
#unzip llvm-15-macos10.15.zip && rm llvm-15-macos10.15.zip
export LLVM_DIR="~/llvm-15-mac10.15/"
fi
export TAICHI_CMAKE_ARGS="$TAICHI_CMAKE_ARGS -DTI_LLVM_15:BOOL=ON"
fi
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ jobs:
run: |
. .github/workflows/scripts/common-utils.sh
prepare-build-cache
python misc/ci_download.py
env:
CI_PLATFORM: macos

Expand All @@ -150,6 +149,7 @@ jobs:
-DTI_WITH_VULKAN:BOOL=ON
-DTI_WITH_C_API=ON
-DTI_BUILD_TESTS:BOOL=${{ matrix.with_cpp_tests }}
LLVM_VERSION: 15

# [DEBUG] Copy this step around to enable debugging inside Github Action instances.
#- name: Setup tmate session
Expand Down

0 comments on commit 9c320cf

Please sign in to comment.