From 143b611274aa67dd02c25e153ffbe811afedaa2b Mon Sep 17 00:00:00 2001
From: Concedo <39025047+LostRuins@users.noreply.github.com>
Date: Wed, 19 Mar 2025 21:56:35 +0800
Subject: [PATCH] updated workflows

---
 .github/workflows/kcpp-build-release-linux-cuda12.yaml    | 1 -
 .github/workflows/kcpp-build-release-linux.yaml           | 1 -
 .github/workflows/kcpp-build-release-win-full-cu12.yaml   | 6 ------
 .github/workflows/kcpp-build-release-win-full.yaml        | 6 ------
 .github/workflows/kcpp-build-release-win-oldcpu-full.yaml | 6 ------
 .gitignore                                                | 4 ++++
 koboldcpp.sh                                              | 6 ------
 7 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/kcpp-build-release-linux-cuda12.yaml b/.github/workflows/kcpp-build-release-linux-cuda12.yaml
index 670b035e9..938eae06e 100644
--- a/.github/workflows/kcpp-build-release-linux-cuda12.yaml
+++ b/.github/workflows/kcpp-build-release-linux-cuda12.yaml
@@ -4,7 +4,6 @@ on: workflow_dispatch
 env:
   BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
   KCPP_CUDA: 12.1.0
-  REBUILD_VK_SHADERS: 1
 
 jobs:
   linux:
diff --git a/.github/workflows/kcpp-build-release-linux.yaml b/.github/workflows/kcpp-build-release-linux.yaml
index cde9d9f53..a5fcb7b0d 100644
--- a/.github/workflows/kcpp-build-release-linux.yaml
+++ b/.github/workflows/kcpp-build-release-linux.yaml
@@ -4,7 +4,6 @@ on: workflow_dispatch
 env:
   BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
   NOAVX2: 1
-  REBUILD_VK_SHADERS: 1
 
 jobs:
   linux:
diff --git a/.github/workflows/kcpp-build-release-win-full-cu12.yaml b/.github/workflows/kcpp-build-release-win-full-cu12.yaml
index 14b778754..ea2f8ced2 100644
--- a/.github/workflows/kcpp-build-release-win-full-cu12.yaml
+++ b/.github/workflows/kcpp-build-release-win-full-cu12.yaml
@@ -42,12 +42,6 @@ jobs:
           wmic cpu get name
           wmic os get TotalVisibleMemorySize, FreePhysicalMemory
 
-      - name: Rebuild Vulkan Shaders
-        id: make_vk_shaders
-        run: |
-          make vulkan-shaders-gen -j ${env:NUMBER_OF_PROCESSORS}
-          echo "Vulkan Shaders Rebuilt"
-
       - name: Build Non-CUDA
         id: make_build
         run: |
diff --git a/.github/workflows/kcpp-build-release-win-full.yaml b/.github/workflows/kcpp-build-release-win-full.yaml
index 609cdf6f1..5dfcb2868 100644
--- a/.github/workflows/kcpp-build-release-win-full.yaml
+++ b/.github/workflows/kcpp-build-release-win-full.yaml
@@ -42,12 +42,6 @@ jobs:
           wmic cpu get name
           wmic os get TotalVisibleMemorySize, FreePhysicalMemory
 
-      - name: Rebuild Vulkan Shaders
-        id: make_vk_shaders
-        run: |
-          make vulkan-shaders-gen -j ${env:NUMBER_OF_PROCESSORS}
-          echo "Vulkan Shaders Rebuilt"
-
       - name: Build Non-CUDA
         id: make_build
         run: |
diff --git a/.github/workflows/kcpp-build-release-win-oldcpu-full.yaml b/.github/workflows/kcpp-build-release-win-oldcpu-full.yaml
index 9ffb2f93d..34c6dab66 100644
--- a/.github/workflows/kcpp-build-release-win-oldcpu-full.yaml
+++ b/.github/workflows/kcpp-build-release-win-oldcpu-full.yaml
@@ -42,12 +42,6 @@ jobs:
           wmic cpu get name
           wmic os get TotalVisibleMemorySize, FreePhysicalMemory
 
-      - name: Rebuild Vulkan Shaders
-        id: make_vk_shaders
-        run: |
-          make vulkan-shaders-gen -j ${env:NUMBER_OF_PROCESSORS}
-          echo "Vulkan Shaders Rebuilt"
-
       - name: Build Non-CUDA
         id: make_build
         run: |
diff --git a/.gitignore b/.gitignore
index 0ca05ee19..96fc4433c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,10 @@
 .vscode/
 
 ggml-metal-embed.metal
+ggml/src/ggml-vulkan-shaders.cpp
+ggml/src/ggml-vulkan-shaders.hpp
+vulkan-shaders-gen.exe
+vulkan-shaders-gen
 
 lcov-report/
 gcovr-report/
diff --git a/koboldcpp.sh b/koboldcpp.sh
index 7fb6e57c0..8c18ad237 100755
--- a/koboldcpp.sh
+++ b/koboldcpp.sh
@@ -25,12 +25,6 @@ if [ -n "$NOAVX2" ]; then
 	LLAMA_NOAVX2_FLAG="LLAMA_NOAVX2=1"
 fi
 
-if [ -n "$REBUILD_VK_SHADERS" ]; then
-	echo "Rebuilding Vulkan Shaders..."
-	bin/micromamba run -r conda -p conda/envs/linux make vulkan-shaders-gen -j$(nproc) LLAMA_ADD_CONDA_PATHS=1
-	echo "Vulkan Shaders Rebuilt."
-fi
-
 bin/micromamba run -r conda -p conda/envs/linux make -j$(nproc) LLAMA_VULKAN=1 LLAMA_CLBLAST=1 LLAMA_CUBLAS=1 LLAMA_PORTABLE=1 LLAMA_ADD_CONDA_PATHS=1 $LLAMA_NOAVX2_FLAG
 if [ $? -ne 0 ]; then
     echo "Error: make failed."