Conflict resolution

taichi-dev · Oct 8, 2021 · d9c31d7 · d9c31d7
2 parents bb5665b + 43f8746
commit d9c31d7
Show file tree

Hide file tree

Showing 48 changed files with 726 additions and 409 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -84,10 +84,10 @@ jobs:
           glewinfo
           ti diagnose
           ti changelog
-          ti test -vr2 -t2 -k "not ndarray"
+          ti test -vr2 -t2 -k "not ndarray and not torch"
           # ndarray test might OOM if run with -t2.
           # FIXME: unify this with presubmit.yml to avoid further divergence
-          ti test -vr2 -t1 -k "ndarray"
+          ti test -vr2 -t1 -k "ndarray or torch"
         env:
           PYTHON: ${{ matrix.python }}
 
@@ -267,8 +267,7 @@ jobs:
           7z x taichi-llvm-10.0.0-msvc2019.zip -otaichi_llvm
           curl --retry 10 --retry-delay 5 https://github.com/taichi-dev/taichi_assets/releases/download/llvm10/clang-10.0.0-win.zip -LO
           7z x clang-10.0.0-win.zip -otaichi_clang
-          $env:PATH += ";C:\taichi_llvm\bin"
-          $env:PATH += ";C:\taichi_clang\bin"
+          $env:PATH = ";C:\taichi_llvm\bin;C:\taichi_clang\bin;" + $env:PATH
           clang --version
           cd D:\a\taichi\taichi
           python -m pip install -r requirements_dev.txt
@@ -293,8 +292,7 @@ jobs:
       - name: Test
         shell: powershell
         run: |
-          $env:PATH += ";C:\taichi_llvm\bin"
-          $env:PATH += ";C:\taichi_clang\bin"
+          $env:PATH = ";C:\taichi_llvm\bin;C:\taichi_clang\bin;" + $env:PATH
           python -c "import taichi"
           python examples/algorithm/laplace.py
           python bin/taichi diagnose

diff --git a/docs/lang/articles/get-started.md b/docs/lang/articles/get-started.md
@@ -16,7 +16,7 @@ python3 -m pip install taichi
 ```
 
 :::note
-Currently, Taichi only supports Python 3.6/3.7/3.8 (64-bit).
+Currently, Taichi only supports Python 3.6/3.7/3.8/3.9 (64-bit).
 :::
 
 import Tabs from '@theme/Tabs';
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ python3 -m pip install taichi @@
     ```
     :::note
-    Currently, Taichi only supports Python 3.6/3.7/3.8 (64-bit).
+    Currently, Taichi only supports Python 3.6/3.7/3.8/3.9 (64-bit).
     :::
     import Tabs from '@theme/Tabs';
@@ Expand Down @@