[ci] Update amdgpu ci (taichi-dev#7117)

Issue: # ### Brief Summary <img width="1325" alt="image" src="https://user-images.githubusercontent.com/47965866/211569479-aa4344ce-23e3-4763-a57f-5aea42b3885c.png"> Soft-links only exist in `build` stage
ares201005 · Jan 10, 2023 · 6cf89a8 · 6cf89a8
1 parent b376493
commit 6cf89a8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/scripts/build.py b/.github/workflows/scripts/build.py
@@ -28,10 +28,6 @@ def setup_llvm(env_out: dict) -> None:
         if 'AMDGPU_TEST' in os.environ:
             # FIXME: AMDGPU bots are currently maintained separately,
             #        we should unify them with the rest of the bots.
-            lnsf = sh.sudo.ln.bake('-sf')
-            lnsf('/usr/bin/clang++-10', '/usr/bin/clang++')
-            lnsf('/usr/bin/clang-10', '/usr/bin/clang')
-            lnsf('/usr/bin/ld.lld-10', '/usr/bin/ld.lld')
             env_out['LLVM_DIR'] = '/taichi-llvm-15'
             return
         elif is_manylinux2014():

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -291,7 +291,7 @@ jobs:
           . .github/workflows/scripts/common-utils.sh
 
           ci-docker-run-amdgpu --name taichi-build \
-            registry.taichigraphics.com/taichidev-ubuntu18.04.amdgpu:v0.0.5 \
+            registry.taichigraphics.com/taichidev-ubuntu18.04.amdgpu:v0.0.6 \
             /home/dev/taichi/.github/workflows/scripts/build.py
 
         env:
@@ -311,7 +311,7 @@ jobs:
           . .github/workflows/scripts/common-utils.sh
 
           ci-docker-run-amdgpu --name taichi-test \
-             registry.taichigraphics.com/taichidev-ubuntu18.04.amdgpu:v0.0.5 \
+             registry.taichigraphics.com/taichidev-ubuntu18.04.amdgpu:v0.0.6 \
              /home/dev/taichi/.github/workflows/scripts/unix_test.sh
         env:
           PY: '3.8'

diff --git a/ci/Dockerfile.ubuntu.18.04.amdgpu b/ci/Dockerfile.ubuntu.18.04.amdgpu
@@ -11,6 +11,7 @@ RUN apt-get update && \
                        libtinfo-dev \
                        sudo \
                        clang-10 \
+                       lld-10 \
                        wget \
                        git \
                        unzip \
@@ -44,10 +45,14 @@ RUN apt-get update && \
     printf "root ALL=(ALL:ALL) NOPASSWD: ALL\ndev ALL=(ALL:ALL) NOPASSWD: ALL\n" > /etc/sudoers && \
     true
 
+RUN ln -sf /usr/bin/clang++-10 /usr/bin/clang++ && \
+    ln -sf /usr/bin/clang-10 /usr/bin/clang && \
+    ln -sf /usr/bin/ld.lld-10 /usr/bin/ld.lld
+
 # Install LLVM 15
 WORKDIR /
 # Make sure this URL gets updated each time there is a new prebuilt bin release
-RUN wget https://github.com/GaleSeLee/assets/releases/download/v0.0.2/taichi-llvm-15.0.0-linux.zip
+RUN wget https://github.com/GaleSeLee/assets/releases/download/v0.0.4/taichi-llvm-15.0.0-linux.zip
 RUN unzip taichi-llvm-15.0.0-linux.zip && \
     rm taichi-llvm-15.0.0-linux.zip
 ENV PATH="/taichi-llvm-15.0.0-linux/bin:$PATH"