update build action to include clblast, openblas, and default

YellowRoseCx · Dec 2, 2023 · fbb283a · fbb283a
1 parent 787531d
commit fbb283a
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/.github/workflows/cmake-rocm-windows.yml b/.github/workflows/cmake-rocm-windows.yml
@@ -34,6 +34,21 @@ jobs:
           ref: main 
           submodules: 'recursive'
 
+      - name: Setup MSYS2
+        uses: msys2/setup-msys2@v2
+        with:
+          update: true
+          install: >-
+            base-devel
+            mingw-w64-x86_64-toolchain
+            
+      - name: Build CLBLAST & Others with make
+        run: |
+          Set-Location 'D:\a\koboldcpp-rocm\koboldcpp-rocm'          
+          Get-Location
+          ls
+          make CC=gcc LLAMA_CLBLAST=1 LLAMA_OPENBLAS=1 -j2
+          
       - name: Install ROCm SDK
         run: |
           curl -LO https://download.amd.com/developer/eula/rocm-hub/AMD-Software-PRO-Edition-23.Q3-Win10-Win11-For-HIP.exe
@@ -66,7 +81,7 @@ jobs:
           Get-Location
           cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DLLAMA_HIPBLAS=ON -DCMAKE_C_COMPILER="C:/Program Files/AMD/ROCm/5.5/bin/clang.exe" -DCMAKE_CXX_COMPILER="C:/Program Files/AMD/ROCm/5.5/bin/clang++.exe" -DAMDGPU_TARGETS="gfx803;gfx900;gfx906;gfx908;gfx90a;gfx1010;gfx1030;gfx1031;gfx1032;gfx1100;gfx1101;gfx1102"
           cmake --build . -j2
-        
+
       - name: Copy ROCm DLLs and Run PyInstaller
         run: |
           Set-Location 'D:\a\koboldcpp-rocm\koboldcpp-rocm'
@@ -75,7 +90,7 @@ jobs:
           copy "C:\Program Files\AMD\ROCm\5.5\bin\rocblas.dll" .\
           robocopy "C:\Program Files\AMD\ROCm\5.5\bin\rocblas" .\rocblas /MIR
           pip install customtkinter
-          PyInstaller --noconfirm --onefile --collect-all customtkinter --clean --console --icon ".\niko.ico" --add-data "./klite.embd;." --add-data "D:\a\koboldcpp-rocm\koboldcpp-rocm\build\bin\koboldcpp_hipblas.dll;." --add-data "./hipblas.dll;." --add-data "./rocblas.dll;." --add-data "./rwkv_vocab.embd;." --add-data "./rwkv_world_vocab.embd;." --add-data "./rocblas;." --add-data "C:/Windows/System32/msvcp140.dll;." --add-data "C:/Windows/System32/vcruntime140_1.dll;." "./koboldcpp.py" -n "koboldcpp_rocm_only.exe"
+          PyInstaller --noconfirm --onefile --collect-all customtkinter --clean --console --icon ".\niko.ico" --add-data "./klite.embd;." --add-data "./winclinfo.exe;." --add-data "./OpenCL.dll;." --add-data "./kcpp_docs.embd;." --add-data "./koboldcpp_default.dll;." --add-data "./koboldcpp_openblas.dll;." --add-data "./koboldcpp_failsafe.dll;." --add-data "./koboldcpp_noavx2.dll;." --add-data "./libopenblas.dll;." --add-data "./koboldcpp_clblast.dll;." --add-data "./koboldcpp_clblast_noavx2.dll;." --add-data "./clblast.dll;." --add-data "D:\a\koboldcpp-rocm\koboldcpp-rocm\build\bin\koboldcpp_hipblas.dll;." --add-data "./hipblas.dll;." --add-data "./rocblas.dll;." --add-data "./rwkv_vocab.embd;." --add-data "./rwkv_world_vocab.embd;." --add-data "./rocblas;." --add-data "C:/Windows/System32/msvcp140.dll;." --add-data "C:/Windows/System32/vcruntime140_1.dll;." "./koboldcpp.py" -n "koboldcpp_rocm.exe"
 #          curl -LO https://github.com/YellowRoseCx/koboldcpp-rocm/releases/download/v1.43.2-ROCm/gfx103132rocblasfiles.7z
 #          7z x gfx103132rocblasfiles.7z 
       - uses: actions/upload-artifact@v3
@@ -86,7 +101,7 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           name: koboldcpp_rocm_only-${{ inputs.version }}
-          path: D:\a\koboldcpp-rocm\koboldcpp-rocm\dist\koboldcpp_rocm_only.exe
+          path: D:\a\koboldcpp-rocm\koboldcpp-rocm\dist\koboldcpp_rocm.exe
 
       - name: Upload files to a GitHub release
         id: upload-release