Merge branch 'develop' of https://github.com/YellowRoseCx/koboldcpp-rocm

into develop
YellowRoseCx · Apr 19, 2024 · 091f24e · 091f24e
2 parents d94cec9 + e3714de
commit 091f24e
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/.github/workflows/tests-rocm-windows.yml b/.github/workflows/tests-rocm-windows.yml
@@ -61,23 +61,30 @@ jobs:
       - name: Install Dependencies
         run: |
           python -m pip install cmake ninja
-
+          
+      - name: Install LLVM and Clang
+        uses: KyleMayes/install-llvm-action@v2
+        with:
+          version: "18.1.4"
+          force-url: "https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.4/LLVM-18.1.4-win64.exe"
+
       - name: Install PyInstaller
         run: pip install pyinstaller==6.4.0 psutil
 
       - name: Build Lib
         run: |
-          $env:CC = 'C:\Program Files\AMD\ROCm\5.7\bin\clang.exe'
-          $env:CXX = 'C:\Program Files\AMD\ROCm\5.7\bin\clang++.exe'
           $env:CMAKE_PREFIX_PATH = 'C:\Program Files\AMD\ROCm\5.7'
           $env:VERBOSE = '1'
           Set-Location 'D:\a\koboldcpp-rocm\koboldcpp-rocm'
           mkdir 'build'
           Set-Location 'D:\a\koboldcpp-rocm\koboldcpp-rocm\build'
           Get-Location
           cmake --version
-          cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DLLAMA_HIPBLAS=ON -DHIP_PLATFORM=amd -DCMAKE_C_COMPILER="C:/Program Files/AMD/ROCm/5.7/bin/clang.exe" -DCMAKE_CXX_COMPILER="C:/Program Files/AMD/ROCm/5.7/bin/clang++.exe" -DAMDGPU_TARGETS="gfx803;gfx900;gfx906;gfx908;gfx90a;gfx1010;gfx1030;gfx1031;gfx1032;gfx1100;gfx1101;gfx1102"
+          clang --version
+          cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DLLAMA_HIPBLAS=ON -DHIP_PLATFORM=amd -DCMAKE_C_COMPILER="C:/Program Files/LLVM/bin/clang.exe" -DCMAKE_CXX_COMPILER="C:/Program Files/LLVM/bin/clang++.exe" -DAMDGPU_TARGETS="gfx803;gfx900;gfx906;gfx908;gfx90a;gfx1010;gfx1030;gfx1031;gfx1032;gfx1100;gfx1101;gfx1102"
           cmake --build . --config Release -j ${env:NUMBER_OF_PROCESSORS}
+#          $env:CC = 'C:\Program Files\AMD\ROCm\5.7\bin\clang.exe'
+#          $env:CXX = 'C:\Program Files\AMD\ROCm\5.7\bin\clang++.exe'
 #          cmake .. -DLLAMA_HIPBLAS=ON -DCMAKE_SYSTEM_VERSION="10.0.19041.0" -DCMAKE_C_COMPILER="C:/Program Files/AMD/ROCm/5.7/bin/clang.exe" -DCMAKE_CXX_COMPILER="C:/Program Files/AMD/ROCm/5.7/bin/clang++.exe" -DAMDGPU_TARGETS="gfx803;gfx900;gfx906;gfx908;gfx90a;gfx1010;gfx1030;gfx1031;gfx1032;gfx1100;gfx1101;gfx1102"