From 06e3a6f36ebb2e6d14fe4b2e54e8e2e5a681c823 Mon Sep 17 00:00:00 2001
From: Concedo <39025047+LostRuins@users.noreply.github.com>
Date: Thu, 11 Apr 2024 21:50:07 +0800
Subject: [PATCH] test workflow (+9 squashed commit)

Squashed commit:

[3d1fedab] test workflow

[c26d3a50] test workflow

[70e84f54] test workflow

[3383d040] workflow test

[2262b3c6] workflow test

[cd335d5a] workflow test

[bdbbfaeb] workflow test

[8e9fed4c] testing workflow

[e5b90d66] workflow test
---
 .../workflows/kcpp-build-release-win-full.yaml  |  15 ++++++++++++---
 make_pyinstaller_cuda.bat                       |   1 +
 msvcp140_codecvt_ids.dll                        | Bin 0 -> 21392 bytes
 .../tools/make_old_pyinstaller.bat              |   0
 .../tools/make_old_pyinstaller_cuda.bat         |   2 +-
 .../tools/make_pyinstaller_hybrid_henk.bat      |   0
 6 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 make_pyinstaller_cuda.bat
 create mode 100644 msvcp140_codecvt_ids.dll
 rename make_old_pyinstaller.bat => otherarch/tools/make_old_pyinstaller.bat (100%)
 rename make_old_pyinstaller_cuda.bat => otherarch/tools/make_old_pyinstaller_cuda.bat (79%)
 rename make_pyinstaller_hybrid_henk.bat => otherarch/tools/make_pyinstaller_hybrid_henk.bat (100%)

diff --git a/.github/workflows/kcpp-build-release-win-full.yaml b/.github/workflows/kcpp-build-release-win-full.yaml
index 40a107975..3af277aef 100644
--- a/.github/workflows/kcpp-build-release-win-full.yaml
+++ b/.github/workflows/kcpp-build-release-win-full.yaml
@@ -31,14 +31,17 @@ jobs:
 
       - name: Add w64devkit to PATH
         run: |
-          $env:Path += ";$(Get-Location)\w64devkit-1.22.0\w64devkit\bin"
-          echo $env:Path
-          ls
+          echo "$(Get-Location)\w64devkit\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
 
       - name: Build Non-CUDA
         id: make_build
         run: |
           make -j ${env:NUMBER_OF_PROCESSORS}
+
+      - name: Package PyInstaller
+        id: make_pyinstaller
+        run: |
+          ./make_pyinstaller.bat
           ls
 
       # - uses: Jimver/cuda-toolkit@v0.2.11
@@ -59,3 +62,9 @@ jobs:
       #   with:
       #     name: kcpp_windows_cuda_binary
       #     path: build/bin/Release/
+
+      - name: Save artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: kcpp_windows_pyinstallers
+          path: dist/
diff --git a/make_pyinstaller_cuda.bat b/make_pyinstaller_cuda.bat
new file mode 100644
index 000000000..08ef31a2a
--- /dev/null
+++ b/make_pyinstaller_cuda.bat
@@ -0,0 +1 @@
+PyInstaller --noconfirm --onefile --clean --console --collect-all customtkinter --icon "./nikogreen.ico" --add-data "./winclinfo.exe;." --add-data "./OpenCL.dll;." --add-data "./klite.embd;." --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 "./koboldcpp_vulkan_noavx2.dll;." --add-data "./clblast.dll;." --add-data "./koboldcpp_vulkan.dll;." --add-data "./vulkan-1.dll;." --add-data "./koboldcpp_cublas.dll;." --add-data "./cublas64_11.dll;." --add-data "./cublasLt64_11.dll;." --add-data "./cudart64_110.dll;." --add-data "./msvcp140.dll;." --add-data "./msvcp140_codecvt_ids.dll;." --add-data "./vcruntime140.dll;." --add-data "./vcruntime140_1.dll;." --add-data "./rwkv_vocab.embd;." --add-data "./rwkv_world_vocab.embd;." "./koboldcpp.py" -n "koboldcpp.exe"
\ No newline at end of file
diff --git a/msvcp140_codecvt_ids.dll b/msvcp140_codecvt_ids.dll
new file mode 100644
index 0000000000000000000000000000000000000000..2fb1e61973667fc06155cf4ea14bd25a0de49517
GIT binary patch
literal 21392
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

literal 0
HcmV?d00001

diff --git a/make_old_pyinstaller.bat b/otherarch/tools/make_old_pyinstaller.bat
similarity index 100%
rename from make_old_pyinstaller.bat
rename to otherarch/tools/make_old_pyinstaller.bat
diff --git a/make_old_pyinstaller_cuda.bat b/otherarch/tools/make_old_pyinstaller_cuda.bat
similarity index 79%
rename from make_old_pyinstaller_cuda.bat
rename to otherarch/tools/make_old_pyinstaller_cuda.bat
index 15720fc94..4e6471269 100644
--- a/make_old_pyinstaller_cuda.bat
+++ b/otherarch/tools/make_old_pyinstaller_cuda.bat
@@ -1,4 +1,4 @@
 echo This file is only for my own usage, please do not use it. I am lazy.
 
 set PATH=d:\\MainApplications\\KoboldAIGPT\\KoboldAI-Horde-Bridge\\python;d:\\MainApplications\\KoboldAIGPT\\KoboldAI-Horde-Bridge\\python\\Scripts;%PATH%
-PyInstaller --noconfirm --onefile --clean --console --collect-all customtkinter --icon "./nikogreen.ico" --add-data "./winclinfo.exe;." --add-data "./OpenCL.dll;." --add-data "./klite.embd;." --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 "./koboldcpp_vulkan_noavx2.dll;." --add-data "./clblast.dll;." --add-data "./koboldcpp_vulkan.dll;." --add-data "./vulkan-1.dll;." --add-data "./koboldcpp_cublas.dll;." --add-data "./cublas64_11.dll;." --add-data "./cublasLt64_11.dll;." --add-data "./cudart64_110.dll;." --add-data "./msvcp140.dll;." --add-data "./vcruntime140.dll;." --add-data "./vcruntime140_1.dll;." --add-data "./rwkv_vocab.embd;." --add-data "./rwkv_world_vocab.embd;." "./koboldcpp.py" -n "koboldcpp.exe"
\ No newline at end of file
+PyInstaller --noconfirm --onefile --clean --console --collect-all customtkinter --icon "./nikogreen.ico" --add-data "./winclinfo.exe;." --add-data "./OpenCL.dll;." --add-data "./klite.embd;." --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 "./koboldcpp_vulkan_noavx2.dll;." --add-data "./clblast.dll;." --add-data "./koboldcpp_vulkan.dll;." --add-data "./vulkan-1.dll;." --add-data "./koboldcpp_cublas.dll;." --add-data "./cublas64_11.dll;." --add-data "./cublasLt64_11.dll;." --add-data "./cudart64_110.dll;." --add-data "./msvcp140.dll;." --add-data "./msvcp140_codecvt_ids.dll;." --add-data "./vcruntime140.dll;." --add-data "./vcruntime140_1.dll;." --add-data "./rwkv_vocab.embd;." --add-data "./rwkv_world_vocab.embd;." "./koboldcpp.py" -n "koboldcpp.exe"
\ No newline at end of file
diff --git a/make_pyinstaller_hybrid_henk.bat b/otherarch/tools/make_pyinstaller_hybrid_henk.bat
similarity index 100%
rename from make_pyinstaller_hybrid_henk.bat
rename to otherarch/tools/make_pyinstaller_hybrid_henk.bat