From: Georgi Gerganov <redacted>
Date: Thu, 27 Mar 2025 07:41:24 +0000 (+0200)
Subject: scripts : update sync (#1161)
X-Git-Tag: upstream/0.0.1898~32
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=ab9cc55a4c2b8225dc50e1fa2fbe6e62a1d5570e;p=pkg%2Fggml%2Fsources%2Fggml

scripts : update sync (#1161)
---

diff --git a/scripts/sync-llama-am.sh b/scripts/sync-llama-am.sh
index 32d1ee06..07a3805c 100755
--- a/scripts/sync-llama-am.sh
+++ b/scripts/sync-llama-am.sh
@@ -69,6 +69,11 @@ while read c; do
     git format-patch -U${ctx} -k $c~1..$c --stdout -- \
         ggml/CMakeLists.txt \
         ggml/src/CMakeLists.txt \
+        ggml/cmake/BuildTypes.cmake \
+        ggml/cmake/GitVars.cmake \
+        ggml/cmake/common.cmake \
+        ggml/cmake/ggml-config.cmake.in \
+        ggml/src/ggml-cpu/cmake/FindSIMD.cmake \
         ggml/src/ggml*.h \
         ggml/src/ggml*.c \
         ggml/src/ggml*.cpp \
@@ -121,6 +126,12 @@ if [ -f $SRC_GGML/llama-src.patch ]; then
     # ggml/CMakelists.txt       -> CMakeLists.txt
     # ggml/src/CMakelists.txt   -> src/CMakeLists.txt
     #
+    # ggml/cmake/BuildTypes.cmake            -> cmake/BuildTypes.cmake
+    # ggml/cmake/GitVars.cmake               -> cmake/GitVars.cmake
+    # ggml/cmake/common.cmake                -> cmake/common.cmake
+    # ggml/cmake/ggml-config.cmake.in        -> cmake/ggml-config.cmake.in
+    # ggml/src/ggml-cpu/cmake/FindSIMD.cmake -> src/ggml-cpu/cmake/FindSIMD.cmake
+    #
     # ggml/src/ggml*.c          -> src/ggml*.c
     # ggml/src/ggml*.cpp        -> src/ggml*.cpp
     # ggml/src/ggml*.h          -> src/ggml*.h
@@ -152,6 +163,11 @@ if [ -f $SRC_GGML/llama-src.patch ]; then
     cat llama-src.patch | sed -E \
         -e 's/\/ggml\/CMakeLists\.txt/\/CMakeLists.txt/g' \
         -e 's/\/ggml\/src\/CMakeLists\.txt/\/src\/CMakeLists.txt/g' \
+        -e 's/\/ggml\/cmake\/BuildTypes\.cmake/\/cmake\/BuildTypes\.cmake/g' \
+        -e 's/\/ggml\/cmake\/GitVars\.cmake/\/cmake\/GitVars\.cmake/g' \
+        -e 's/\/ggml\/cmake\/common\.cmake/\/cmake\/common\.cmake/g' \
+        -e 's/\/ggml\/cmake\/ggml-config\.cmake\.in/\/cmake\/ggml-config\.cmake\.in/g' \
+        -e 's/\/ggml\/src\/ggml-cpu\/cmake\/FindSIMD\.cmake/\/src\/ggml-cpu\/cmake\/FindSIMD\.cmake/g' \
         -e 's/\/ggml\/src\/ggml(.*)\.c/\/src\/ggml\1.c/g' \
         -e 's/\/ggml\/src\/ggml(.*)\.cpp/\/src\/ggml\1.cpp/g' \
         -e 's/\/ggml\/src\/ggml(.*)\.h/\/src\/ggml\1.h/g' \
diff --git a/scripts/sync-llama.sh b/scripts/sync-llama.sh
index 78672142..7c6d0272 100755
--- a/scripts/sync-llama.sh
+++ b/scripts/sync-llama.sh
@@ -2,7 +2,9 @@
 
 cp -rpv ../llama.cpp/ggml/CMakeLists.txt       CMakeLists.txt
 cp -rpv ../llama.cpp/ggml/src/CMakeLists.txt   src/CMakeLists.txt
+
 cp -rpv ../llama.cpp/ggml/cmake/*              cmake/
+cp -rpv ../llama.cpp/ggml/src/ggml-cpu/cmake/* src/ggml-cpu/cmake/
 
 cp -rpv ../llama.cpp/ggml/src/ggml*.c          src/
 cp -rpv ../llama.cpp/ggml/src/ggml*.cpp        src/