From dbbdb2eedcd9c9f0d451be7a884fb0ba8d791230 Mon Sep 17 00:00:00 2001
From: Concedo <39025047+LostRuins@users.noreply.github.com>
Date: Thu, 21 Nov 2024 18:56:59 +0800
Subject: [PATCH] try fix macos build again (+3 squashed commit)

Squashed commit:

[7d2a67132] fix ci builds

[f0a5f0a97] fixed a typo

[8736d9034] try fix ci builds (+1 squashed commits)

Squashed commits:

[c2ae5a542] Revert "updated ci"

This reverts commit d8ebdde6eef0a5324a6762ed1aae50b76c5e373a.
---
 .github/workflows/kcpp-build-release-win-cuda.yaml        | 6 +-----
 .github/workflows/kcpp-build-release-win-cuda12.yaml      | 6 +-----
 .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 +-----
 Makefile                                                  | 7 ++++---
 6 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/kcpp-build-release-win-cuda.yaml b/.github/workflows/kcpp-build-release-win-cuda.yaml
index ab3e00800..e63ace77d 100644
--- a/.github/workflows/kcpp-build-release-win-cuda.yaml
+++ b/.github/workflows/kcpp-build-release-win-cuda.yaml
@@ -25,11 +25,7 @@ jobs:
           mkdir build
           cd build
           cmake .. -DLLAMA_CUBLAS=ON -DCMAKE_SYSTEM_VERSION="10.0.19041.0"
-          if [ "${env:NUMBER_OF_PROCESSORS}" -gt 1 ]; then
-            cmake --build . --config Release -j 2
-          else
-            cmake --build . --config Release -j 1
-          fi
+          cmake --build . --config Release -j 2
 
       - name: Save artifact
         uses: actions/upload-artifact@v3
diff --git a/.github/workflows/kcpp-build-release-win-cuda12.yaml b/.github/workflows/kcpp-build-release-win-cuda12.yaml
index a62b60c07..c7980bbc4 100644
--- a/.github/workflows/kcpp-build-release-win-cuda12.yaml
+++ b/.github/workflows/kcpp-build-release-win-cuda12.yaml
@@ -25,11 +25,7 @@ jobs:
           mkdir build
           cd build
           cmake .. -DLLAMA_CUBLAS=ON -DCMAKE_SYSTEM_VERSION="10.0.19041.0"
-          if [ "${env:NUMBER_OF_PROCESSORS}" -gt 1 ]; then
-            cmake --build . --config Release -j 2
-          else
-            cmake --build . --config Release -j 1
-          fi
+          cmake --build . --config Release -j 2
 
       - name: Save artifact
         uses: actions/upload-artifact@v3
diff --git a/.github/workflows/kcpp-build-release-win-full-cu12.yaml b/.github/workflows/kcpp-build-release-win-full-cu12.yaml
index 0971b99c3..4bd545b6c 100644
--- a/.github/workflows/kcpp-build-release-win-full-cu12.yaml
+++ b/.github/workflows/kcpp-build-release-win-full-cu12.yaml
@@ -58,11 +58,7 @@ jobs:
           mkdir build
           cd build
           cmake .. -DLLAMA_CUBLAS=ON -DCMAKE_SYSTEM_VERSION="10.0.19041.0"
-          if [ "${env:NUMBER_OF_PROCESSORS}" -gt 1 ]; then
-            cmake --build . --config Release -j 2
-          else
-            cmake --build . --config Release -j 1
-          fi
+          cmake --build . --config Release -j 2
           mv bin/Release/koboldcpp_cublas.dll ../koboldcpp_cublas.dll
           cd ..
 
diff --git a/.github/workflows/kcpp-build-release-win-full.yaml b/.github/workflows/kcpp-build-release-win-full.yaml
index 0ac79ccc2..576485934 100644
--- a/.github/workflows/kcpp-build-release-win-full.yaml
+++ b/.github/workflows/kcpp-build-release-win-full.yaml
@@ -58,11 +58,7 @@ jobs:
           mkdir build
           cd build
           cmake .. -DLLAMA_CUBLAS=ON -DCMAKE_SYSTEM_VERSION="10.0.19041.0"
-          if [ "${env:NUMBER_OF_PROCESSORS}" -gt 1 ]; then
-            cmake --build . --config Release -j 2
-          else
-            cmake --build . --config Release -j 1
-          fi
+          cmake --build . --config Release -j 2
           mv bin/Release/koboldcpp_cublas.dll ../koboldcpp_cublas.dll
           cd ..
 
diff --git a/.github/workflows/kcpp-build-release-win-oldcpu-full.yaml b/.github/workflows/kcpp-build-release-win-oldcpu-full.yaml
index d4ee51852..3b8ae778d 100644
--- a/.github/workflows/kcpp-build-release-win-oldcpu-full.yaml
+++ b/.github/workflows/kcpp-build-release-win-oldcpu-full.yaml
@@ -58,11 +58,7 @@ jobs:
           mkdir build
           cd build
           cmake .. -DLLAMA_CUBLAS=ON -DLLAMA_AVX2=OFF -DCMAKE_SYSTEM_VERSION="10.0.19041.0"
-          if [ "${env:NUMBER_OF_PROCESSORS}" -gt 1 ]; then
-            cmake --build . --config Release -j 2
-          else
-            cmake --build . --config Release -j 1
-          fi
+          cmake --build . --config Release -j 2
           mv bin/Release/koboldcpp_cublas.dll ../koboldcpp_cublas.dll
           cd ..
 
diff --git a/Makefile b/Makefile
index bab4caaa3..0b55b8f6e 100644
--- a/Makefile
+++ b/Makefile
@@ -298,10 +298,11 @@ ifdef LLAMA_METAL
 	LDFLAGS  += -framework Foundation -framework Metal -framework MetalKit -framework MetalPerformanceShaders
 	OBJS     += ggml-metal.o
 
-ggml-metal.o: ggml/src/ggml-metal/ggml-metal.m ggml/include/ggml-metal.h
+ggml-metal.o: ggml/src/ggml-metal/ggml-metal.m ggml/src/ggml-metal/ggml-metal-impl.h ggml/include/ggml-metal.h
 	@echo "== Preparing merged Metal file =="
-	@sed -e '/#include "..\/ggml-common.h"/r ggml/src/ggml-common.h' -e '/#include "..\/ggml-common.h"/d' < ggml/src/ggml-metal/ggml-metal.metal > ggml/src/ggml-metal-merged.metal
-	@cp ggml/src/ggml-metal-merged.metal ./ggml-metal-merged.metal
+	@sed -e '/#include "..\/ggml-common.h"/r ggml/src/ggml-common.h' -e '/#include "..\/ggml-common.h"/d' < ggml/src/ggml-metal/ggml-metal.metal > ggml/src/ggml-metal/ggml-metal-embed.metal.tmp
+	@sed -e '/#include "ggml-metal-impl.h"/r ggml/src/ggml-metal/ggml-metal-impl.h' -e '/#include "ggml-metal-impl.h"/d' < ggml/src/ggml-metal/ggml-metal-embed.metal.tmp > ggml/src/ggml-metal/ggml-metal-merged.metal
+	@cp ggml/src/ggml-metal/ggml-metal-merged.metal ./ggml-metal-merged.metal
 	$(CC) $(CFLAGS) -c $< -o $@
 endif # LLAMA_METAL