CI Fix

Xilinx · Mar 21, 2024 · 3612a28 · 3612a28
1 parent 2351462
commit 3612a28
Showing 1 changed file with 14 additions and 20 deletions.
diff --git a/.github/workflows/buildAndTestAieToolsHsa.yml b/.github/workflows/buildAndTestAieToolsHsa.yml
@@ -55,21 +55,6 @@ jobs:
         run: |
           docker system prune -a -f
 
-      - name: Install necessary build tools for the ROCm runtime
-        run: |
-          sudo apt install libelf-dev elfutils libdwarf-dev
-          sudo mkdir --parents --mode=0755 /etc/apt/keyrings
-          wget https://repo.radeon.com/rocm/rocm.gpg.key -O - | \
-            gpg --dearmor | sudo tee /etc/apt/keyrings/rocm.gpg > /dev/null
-          for ver in 5.3.3 5.4.3 5.5.1 5.6; do
-            echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/rocm/apt/$ver focal main" \
-              | sudo tee --append /etc/apt/sources.list.d/rocm.list
-            done
-            echo -e 'Package: *\nPin: release o=repo.radeon.com\nPin-Priority: 600' \
-              | sudo tee /etc/apt/preferences.d/rocm-pin-600
-          sudo apt update
-          sudo apt install rocm-hip-runtime-dev5.6.0 && sudo apt-get clean
-
       - uses: uraimo/run-on-arch-action@v2.5.0
         name: Run commands
         id: runcmd
@@ -81,6 +66,19 @@ jobs:
             --mac-address ${{ secrets.XILINX_MAC }}
           run: |
             ls -l /opt/Xilinx/Vitis/2023.2/
+
+            apt install libelf-dev elfutils libdwarf-dev
+            mkdir --parents --mode=0755 /etc/apt/keyrings
+            wget https://repo.radeon.com/rocm/rocm.gpg.key -O - | \
+              gpg --dearmor | sudo tee /etc/apt/keyrings/rocm.gpg > /dev/null
+            for ver in 5.3.3 5.4.3 5.5.1 5.6; do
+              echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/rocm/apt/$ver focal main" \
+                | tee --append /etc/apt/sources.list.d/rocm.list
+              done
+              echo -e 'Package: *\nPin: release o=repo.radeon.com\nPin-Priority: 600' \
+                | tee /etc/apt/preferences.d/rocm-pin-600
+            apt update
+            apt install rocm-hip-runtime-dev5.6.0 && sudo apt-get clean
             
             # this is the inverse of `base64 -w 1000000 Xilinx.lic`
             # the -w ("wrap after 1000000 cols") is so that there are no spaces in the XILINX_LIC env var
@@ -91,13 +89,9 @@ jobs:
             cd /mlir-aie
 
             # Downloading the ROCm air platforms
-            sudo apt update
-            sudo apt install pkg-config && sudo apt clean
-            echo "Cloning ROCm AIR"
+            apt install pkg-config
             source utils/clone-rocm-air-platforms.sh
-            echo "Building ROCt"
             source ROCm-air-platforms/utils/clone-build-roct.sh
-            echo "Building ROCr"
             source ROCm-air-platforms/utils/clone-build-rocr.sh
 
             # Need to install external libxaie