From 79fd42214f96ef6d5a8ed682303692ff3b6a7dba Mon Sep 17 00:00:00 2001
From: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date: Sat, 2 Dec 2023 03:00:03 -0600
Subject: [PATCH] new build action

---
 .github/workflows/tests-rocm-windows.yml | 36 +++---------------------
 1 file changed, 4 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/tests-rocm-windows.yml b/.github/workflows/tests-rocm-windows.yml
index cbfeba43b7017..d092ce765e4a4 100644
--- a/.github/workflows/tests-rocm-windows.yml
+++ b/.github/workflows/tests-rocm-windows.yml
@@ -31,7 +31,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           repository: 'YellowRoseCx/koboldcpp-rocm'
-          ref: main
+          ref: developmain-12-2-2023
           submodules: 'recursive'
           
       - name: Setup MSYS2
@@ -80,7 +80,7 @@ jobs:
           Set-Location 'D:\a\koboldcpp-rocm\koboldcpp-rocm\build'
           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          
+          cmake --build . -j2
 
       - name: Copy ROCm DLLs and Run PyInstaller
         run: |
@@ -90,37 +90,9 @@ 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 "./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"
+          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
         with:
           name: koboldcpp_hipblas-${{ inputs.version }}
@@ -128,7 +100,7 @@ jobs:
           
       - uses: actions/upload-artifact@v3
         with:
-          name: koboldcpp_rocm-${{ inputs.version }}
+          name: koboldcpp_rocm_only-${{ inputs.version }}
           path: D:\a\koboldcpp-rocm\koboldcpp-rocm\dist\koboldcpp_rocm.exe
 
       # - name: Upload files to a GitHub release