From: Georgi Gerganov <redacted>
Date: Fri, 29 Dec 2023 12:41:36 +0000 (+0200)
Subject: scripts : do not sync commits from this repo
X-Git-Tag: upstream/0.0.4488~2776
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=ca38b8d334baa724bd6c9402470931d26427466f;p=pkg%2Fggml%2Fsources%2Fllama.cpp

scripts : do not sync commits from this repo
---

diff --git a/scripts/sync-ggml-am.sh b/scripts/sync-ggml-am.sh
index 83abe368..93aad88a 100755
--- a/scripts/sync-ggml-am.sh
+++ b/scripts/sync-ggml-am.sh
@@ -26,22 +26,36 @@ echo "Syncing ggml changes since commit $lc"
 
 cd $SRC_GGML
 
-git log --oneline $lc..HEAD
-
-git format-patch $lc --stdout -- \
-    include/ggml/ggml*.h \
-    src/ggml*.h \
-    src/ggml*.c \
-    src/ggml*.cpp \
-    src/ggml*.m \
-    src/ggml*.metal \
-    src/ggml*.cu \
-    tests/test-opt.cpp \
-    tests/test-grad0.cpp \
-    tests/test-quantize-fns.cpp \
-    tests/test-quantize-perf.cpp \
-    tests/test-backend-ops.cpp \
-    > $SRC_LLAMA/ggml-src.patch
+git log --oneline $lc..HEAD | grep -v "(llama/[0-9]*)" | cut -d' ' -f1 > $SRC_LLAMA/ggml-commits
+
+if [ ! -s $SRC_LLAMA/ggml-commits ]; then
+    rm -v $SRC_LLAMA/ggml-commits
+    echo "No new commits"
+    exit 0
+fi
+
+if [ -f $SRC_LLAMA/ggml-src.patch ]; then
+    rm -v $SRC_LLAMA/ggml-src.patch
+fi
+
+while read c; do
+    git format-patch -k $c~1..$c --stdout -- \
+        include/ggml/ggml*.h \
+        src/ggml*.h \
+        src/ggml*.c \
+        src/ggml*.cpp \
+        src/ggml*.m \
+        src/ggml*.metal \
+        src/ggml*.cu \
+        tests/test-opt.cpp \
+        tests/test-grad0.cpp \
+        tests/test-quantize-fns.cpp \
+        tests/test-quantize-perf.cpp \
+        tests/test-backend-ops.cpp \
+        >> $SRC_LLAMA/ggml-src.patch
+done < $SRC_LLAMA/ggml-commits
+
+rm -v $SRC_LLAMA/ggml-commits
 
 # delete files if empty
 if [ ! -s $SRC_LLAMA/ggml-src.patch ]; then