From be5f406ffb8e97b21aee153394bf76ab82faa424 Mon Sep 17 00:00:00 2001 From: taichi-ci-bot <96040685+taichi-ci-bot@users.noreply.github.com> Date: Fri, 7 Jan 2022 18:33:41 +0800 Subject: [PATCH 01/14] add rerun job --- .github/workflows/issue_comment.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/issue_comment.yml b/.github/workflows/issue_comment.yml index 7398d128a..5f8f46081 100644 --- a/.github/workflows/issue_comment.yml +++ b/.github/workflows/issue_comment.yml @@ -18,3 +18,5 @@ jobs: commands: | format benchmark + rebase + rerun From 6491bde2d46af9fae28619ef302fd52bbb663782 Mon Sep 17 00:00:00 2001 From: yolo2themoon Date: Tue, 11 Jan 2022 17:13:01 +0800 Subject: [PATCH 02/14] [ci] Test macos-11 --- .github/workflows/release.yml | 4 ++-- .github/workflows/testing.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6108f714a..6421f0809 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -134,7 +134,7 @@ jobs: strategy: fail-fast: false matrix: ${{ fromJson(needs.matrix_prep.outputs.matrix) }} - runs-on: macos-latest + runs-on: macos-11 steps: - uses: actions/checkout@v2 with: @@ -155,7 +155,7 @@ jobs: - name: Download Pre-Built LLVM 10.0.0 run: python misc/ci_download.py env: - CI_PLATFORM: macos-latest + CI_PLATFORM: macos-11 - name: Create Python Wheel run: | diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index a02363def..8bacca132 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -231,7 +231,7 @@ jobs: strategy: matrix: include: - - os: macos-latest + - os: macos-11 python: 3.7 with_cc: OFF with_cpp_tests: ON @@ -412,7 +412,7 @@ jobs: strategy: matrix: include: - - os: macos-latest + - os: macos-11 python: 3.8 defaults: run: From e03fd6f106bd051c432aaa3a5c1c5b17fdf2e153 Mon Sep 17 00:00:00 2001 From: yolo2themoon Date: Tue, 11 Jan 2022 17:39:55 +0800 Subject: [PATCH 03/14] mute sccache --- .github/workflows/testing.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 8bacca132..4f63c1fad 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -246,13 +246,13 @@ jobs: with: python-version: ${{ matrix.python }} - - name: Get sccache cache - uses: actions/cache@v2 - with: - path: sccache_cache - key: sccache-mac-${{ github.sha }} - restore-keys: | - sccache-mac- + # - name: Get sccache cache + # uses: actions/cache@v2 + # with: + # path: sccache_cache + # key: sccache-mac-${{ github.sha }} + # restore-keys: | + # sccache-mac- - name: Download Pre-Built LLVM 10.0.0 run: | From 72cfaaf6b686a20fd1f5466f317aa2af0fe1d41f Mon Sep 17 00:00:00 2001 From: yolo2themoon Date: Tue, 11 Jan 2022 17:58:53 +0800 Subject: [PATCH 04/14] wip --- .github/workflows/testing.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 4f63c1fad..8bd4b4f17 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -268,11 +268,12 @@ jobs: if [[ ${{needs.check_files.outputs.run_job}} == false ]]; then exit 0 fi - mkdir -p sccache_cache + clang++ --version + cmake --version export PATH=`pwd`/taichi-llvm/bin/:$PATH .github/workflows/scripts/unix_build.sh env: - TAICHI_CMAKE_ARGS: -DTI_WITH_OPENGL:BOOL=OFF -DTI_WITH_CC:BOOL=${{ matrix.with_cc }} -DTI_WITH_VULKAN:BOOL=OFF -DTI_BUILD_TESTS:BOOL=${{ matrix.with_cpp_tests }} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache + TAICHI_CMAKE_ARGS: -DTI_WITH_OPENGL:BOOL=OFF -DTI_WITH_CC:BOOL=${{ matrix.with_cc }} -DTI_WITH_VULKAN:BOOL=OFF -DTI_BUILD_TESTS:BOOL=${{ matrix.with_cpp_tests }} CXX: clang++ # [DEBUG] Copy this step around to enable debugging inside Github Action instances. #- name: Setup tmate session From 95049a59979e7f119355f962f3dbfaf746610ecb Mon Sep 17 00:00:00 2001 From: yolo2themoon Date: Tue, 11 Jan 2022 18:14:08 +0800 Subject: [PATCH 05/14] wip --- .github/workflows/testing.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 8bd4b4f17..e88948381 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -232,7 +232,7 @@ jobs: matrix: include: - os: macos-11 - python: 3.7 + python: 3.8 with_cc: OFF with_cpp_tests: ON wanted_archs: "cpu" @@ -435,6 +435,8 @@ jobs: - name: Build run: | + clang++ --version + cmake --version if [[ ${{needs.check_files.outputs.run_job}} == false ]]; then exit 0 fi From f018ee09b64dd259a09ee0c18e49c81d00d483b8 Mon Sep 17 00:00:00 2001 From: yolo2themoon Date: Tue, 11 Jan 2022 18:19:34 +0800 Subject: [PATCH 06/14] clang11 --- .github/workflows/testing.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index e88948381..aecff1b1c 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -253,6 +253,14 @@ jobs: # key: sccache-mac-${{ github.sha }} # restore-keys: | # sccache-mac- + - name: Install Clang-11 + run: | + clang++ --version + cmake --version + brew install llvm@11 + export CXX=/opt/homebrew/opt/llvm@11/bin/clang++ + clang++ --version + cmake --version - name: Download Pre-Built LLVM 10.0.0 run: | @@ -265,11 +273,12 @@ jobs: - name: Build & Install run: | + clang++ --version + export CXX=/opt/homebrew/opt/llvm@11/bin/clang++ + clang++ --version if [[ ${{needs.check_files.outputs.run_job}} == false ]]; then exit 0 fi - clang++ --version - cmake --version export PATH=`pwd`/taichi-llvm/bin/:$PATH .github/workflows/scripts/unix_build.sh env: From c68e4dd234efade955d1e1ddb7e37cb601418218 Mon Sep 17 00:00:00 2001 From: yolo2themoon Date: Tue, 11 Jan 2022 18:40:42 +0800 Subject: [PATCH 07/14] export --- .github/workflows/testing.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index aecff1b1c..fc35a0a8d 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -256,11 +256,11 @@ jobs: - name: Install Clang-11 run: | clang++ --version - cmake --version brew install llvm@11 - export CXX=/opt/homebrew/opt/llvm@11/bin/clang++ + echo 'export PATH="/usr/local/opt/llvm@11/bin:$PATH"' >> /Users/runner/.bash_profile + export CXX=/usr/local/opt/llvm@11/bin/clang++ clang++ --version - cmake --version + - name: Download Pre-Built LLVM 10.0.0 run: | @@ -274,7 +274,8 @@ jobs: - name: Build & Install run: | clang++ --version - export CXX=/opt/homebrew/opt/llvm@11/bin/clang++ + export CXX=/usr/local/opt/llvm@11/bin/clang++ + echo 'export PATH="/usr/local/opt/llvm@11/bin:$PATH"' >> /Users/runner/.bash_profile clang++ --version if [[ ${{needs.check_files.outputs.run_job}} == false ]]; then exit 0 From e9aafe5d00bdc75b1720ba94588c86804cca1128 Mon Sep 17 00:00:00 2001 From: yolo2themoon Date: Tue, 11 Jan 2022 20:02:48 +0800 Subject: [PATCH 08/14] python version --- .github/workflows/testing.yml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index fc35a0a8d..0ec74445f 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -232,7 +232,7 @@ jobs: matrix: include: - os: macos-11 - python: 3.8 + python: 3.7 with_cc: OFF with_cpp_tests: ON wanted_archs: "cpu" @@ -253,14 +253,6 @@ jobs: # key: sccache-mac-${{ github.sha }} # restore-keys: | # sccache-mac- - - name: Install Clang-11 - run: | - clang++ --version - brew install llvm@11 - echo 'export PATH="/usr/local/opt/llvm@11/bin:$PATH"' >> /Users/runner/.bash_profile - export CXX=/usr/local/opt/llvm@11/bin/clang++ - clang++ --version - - name: Download Pre-Built LLVM 10.0.0 run: | @@ -273,10 +265,15 @@ jobs: - name: Build & Install run: | + python3 --version + brew install llvm@11 + echo '---' clang++ --version export CXX=/usr/local/opt/llvm@11/bin/clang++ + clang++ --version echo 'export PATH="/usr/local/opt/llvm@11/bin:$PATH"' >> /Users/runner/.bash_profile clang++ --version + echo '---' if [[ ${{needs.check_files.outputs.run_job}} == false ]]; then exit 0 fi @@ -445,8 +442,6 @@ jobs: - name: Build run: | - clang++ --version - cmake --version if [[ ${{needs.check_files.outputs.run_job}} == false ]]; then exit 0 fi From d19946e49e716d608fa8a62957a940f4201b7862 Mon Sep 17 00:00:00 2001 From: yolo2themoon Date: Tue, 11 Jan 2022 21:03:14 +0800 Subject: [PATCH 09/14] os_info --- .github/workflows/testing.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 0ec74445f..4b8796240 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -246,13 +246,13 @@ jobs: with: python-version: ${{ matrix.python }} - # - name: Get sccache cache - # uses: actions/cache@v2 - # with: - # path: sccache_cache - # key: sccache-mac-${{ github.sha }} - # restore-keys: | - # sccache-mac- + - name: Get sccache cache + uses: actions/cache@v2 + with: + path: sccache_cache + key: sccache-mac-${{ github.sha }} + restore-keys: | + sccache-mac- - name: Download Pre-Built LLVM 10.0.0 run: | @@ -265,7 +265,10 @@ jobs: - name: Build & Install run: | + sw_vers + system_profiler SPHardwareDataType python3 --version + python3 -m pip debug --verbose brew install llvm@11 echo '---' clang++ --version From e36b73a2a6a330d82c7024ad0bbb2f4f7129db41 Mon Sep 17 00:00:00 2001 From: yolo2themoon Date: Wed, 12 Jan 2022 11:49:22 +0800 Subject: [PATCH 10/14] check pip --- .github/workflows/testing.yml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 4b8796240..ba818e04c 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -262,21 +262,18 @@ jobs: python misc/ci_download.py env: CI_PLATFORM: ${{ matrix.os }} + + - name: Check pip + run: | + python3 -m wheel version + python3 -m pip install wheel setuptools pip --upgrade + python3 -m wheel version + python3 -m pip debug --verbose - name: Build & Install run: | - sw_vers - system_profiler SPHardwareDataType - python3 --version - python3 -m pip debug --verbose brew install llvm@11 - echo '---' - clang++ --version export CXX=/usr/local/opt/llvm@11/bin/clang++ - clang++ --version - echo 'export PATH="/usr/local/opt/llvm@11/bin:$PATH"' >> /Users/runner/.bash_profile - clang++ --version - echo '---' if [[ ${{needs.check_files.outputs.run_job}} == false ]]; then exit 0 fi @@ -423,7 +420,7 @@ jobs: strategy: matrix: include: - - os: macos-11 + - os: macos-latest python: 3.8 defaults: run: From bd1484ad197971f88f374bf0fb972248fa882e3a Mon Sep 17 00:00:00 2001 From: yolo2themoon Date: Wed, 12 Jan 2022 12:02:22 +0800 Subject: [PATCH 11/14] update --- .github/workflows/scripts/unix_build.sh | 1 + .github/workflows/scripts/unix_test.sh | 1 + .github/workflows/testing.yml | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/scripts/unix_build.sh b/.github/workflows/scripts/unix_build.sh index e29cfe704..583efbbc7 100755 --- a/.github/workflows/scripts/unix_build.sh +++ b/.github/workflows/scripts/unix_build.sh @@ -47,6 +47,7 @@ setup_python() { fi python3 -m pip uninstall taichi taichi-nightly -y if [ -z "$GPU_BUILD" ]; then + echo "GPU BUILD" python3 -m pip install -r requirements_dev.txt fi } diff --git a/.github/workflows/scripts/unix_test.sh b/.github/workflows/scripts/unix_test.sh index c70413ff5..602b48dd2 100755 --- a/.github/workflows/scripts/unix_test.sh +++ b/.github/workflows/scripts/unix_test.sh @@ -19,6 +19,7 @@ if [[ "$TI_IN_DOCKER" == "true" ]]; then fi python3 -m pip install dist/*.whl if [ -z "$GPU_TEST" ]; then + echo "GPU TEST" python3 -m pip install -r requirements_test.txt python3 -m pip install torch else diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index ba818e04c..ec97044c5 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -265,7 +265,7 @@ jobs: - name: Check pip run: | - python3 -m wheel version + python3 -m pip install wheel setuptools python3 -m pip install wheel setuptools pip --upgrade python3 -m wheel version python3 -m pip debug --verbose @@ -277,10 +277,11 @@ jobs: if [[ ${{needs.check_files.outputs.run_job}} == false ]]; then exit 0 fi + mkdir -p sccache_cache export PATH=`pwd`/taichi-llvm/bin/:$PATH .github/workflows/scripts/unix_build.sh env: - TAICHI_CMAKE_ARGS: -DTI_WITH_OPENGL:BOOL=OFF -DTI_WITH_CC:BOOL=${{ matrix.with_cc }} -DTI_WITH_VULKAN:BOOL=OFF -DTI_BUILD_TESTS:BOOL=${{ matrix.with_cpp_tests }} + TAICHI_CMAKE_ARGS: -DTI_WITH_OPENGL:BOOL=OFF -DTI_WITH_CC:BOOL=${{ matrix.with_cc }} -DTI_WITH_VULKAN:BOOL=OFF -DTI_BUILD_TESTS:BOOL=${{ matrix.with_cpp_tests }} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache CXX: clang++ # [DEBUG] Copy this step around to enable debugging inside Github Action instances. #- name: Setup tmate session From 550def3d8ef515576bc51805646b8259306651a2 Mon Sep 17 00:00:00 2001 From: yolo2themoon Date: Wed, 12 Jan 2022 13:00:30 +0800 Subject: [PATCH 12/14] rename whl --- .github/workflows/testing.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index ec97044c5..7fda33d46 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -280,6 +280,7 @@ jobs: mkdir -p sccache_cache export PATH=`pwd`/taichi-llvm/bin/:$PATH .github/workflows/scripts/unix_build.sh + mv ./dist/taichi-0.8.10-cp37-cp37m-macosx_11_0_x86_64.whl ./dist/taichi-0.8.10-cp37-cp37m-macosx_10_15_x86_64.whl env: TAICHI_CMAKE_ARGS: -DTI_WITH_OPENGL:BOOL=OFF -DTI_WITH_CC:BOOL=${{ matrix.with_cc }} -DTI_WITH_VULKAN:BOOL=OFF -DTI_BUILD_TESTS:BOOL=${{ matrix.with_cpp_tests }} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache CXX: clang++ From 6554aa10513e3ad75aa82fbcffffb322d9d3b8dc Mon Sep 17 00:00:00 2001 From: yolo2themoon Date: Wed, 12 Jan 2022 14:13:17 +0800 Subject: [PATCH 13/14] clean up --- .github/workflows/scripts/unix_build.sh | 1 - .github/workflows/scripts/unix_test.sh | 1 - .github/workflows/testing.yml | 7 ------- 3 files changed, 9 deletions(-) diff --git a/.github/workflows/scripts/unix_build.sh b/.github/workflows/scripts/unix_build.sh index 583efbbc7..e29cfe704 100755 --- a/.github/workflows/scripts/unix_build.sh +++ b/.github/workflows/scripts/unix_build.sh @@ -47,7 +47,6 @@ setup_python() { fi python3 -m pip uninstall taichi taichi-nightly -y if [ -z "$GPU_BUILD" ]; then - echo "GPU BUILD" python3 -m pip install -r requirements_dev.txt fi } diff --git a/.github/workflows/scripts/unix_test.sh b/.github/workflows/scripts/unix_test.sh index 602b48dd2..c70413ff5 100755 --- a/.github/workflows/scripts/unix_test.sh +++ b/.github/workflows/scripts/unix_test.sh @@ -19,7 +19,6 @@ if [[ "$TI_IN_DOCKER" == "true" ]]; then fi python3 -m pip install dist/*.whl if [ -z "$GPU_TEST" ]; then - echo "GPU TEST" python3 -m pip install -r requirements_test.txt python3 -m pip install torch else diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 7fda33d46..ef426f57b 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -262,13 +262,6 @@ jobs: python misc/ci_download.py env: CI_PLATFORM: ${{ matrix.os }} - - - name: Check pip - run: | - python3 -m pip install wheel setuptools - python3 -m pip install wheel setuptools pip --upgrade - python3 -m wheel version - python3 -m pip debug --verbose - name: Build & Install run: | From f07cea7986b8296471954cf06b9cbb025cd58657 Mon Sep 17 00:00:00 2001 From: yolo2themoon Date: Wed, 12 Jan 2022 14:14:39 +0800 Subject: [PATCH 14/14] 90min time up --- .github/workflows/testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index ef426f57b..d64d6e42b 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -227,7 +227,7 @@ jobs: build_and_test_cpu_mac: name: Build and Test macos (CPU) needs: [check_code_format, check_files] - timeout-minutes: 60 + timeout-minutes: 90 strategy: matrix: include: