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

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

diff --git a/scripts/sync-llama-am.sh b/scripts/sync-llama-am.sh
index 3d402131..f5c5fb18 100755
--- a/scripts/sync-llama-am.sh
+++ b/scripts/sync-llama-am.sh
@@ -26,21 +26,35 @@ echo "Syncing llama.cpp changes since commit $lc"
 
 cd $SRC_LLAMA
 
-git log --oneline $lc..HEAD
-
-git format-patch $lc --stdout -- \
-    ggml*.h \
-    ggml*.c \
-    ggml*.cpp \
-    ggml*.m \
-    ggml*.metal \
-    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_GGML/llama-src.patch
+git log --oneline $lc..HEAD | grep -v "(ggml/[0-9]*)" | cut -d' ' -f1 > $SRC_GGML/llama-commits
+
+if [ ! -s $SRC_GGML/llama-commits ]; then
+    rm -v $SRC_GGML/llama-commits
+    echo "No new commits"
+    exit 0
+fi
+
+if [ -f $SRC_GGML/llama-src.patch ]; then
+    rm -v $SRC_GGML/llama-src.patch
+fi
+
+while read c; do
+    git format-patch -k $c..$c --stdout -- \
+        ggml*.h \
+        ggml*.c \
+        ggml*.cpp \
+        ggml*.m \
+        ggml*.metal \
+        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_GGML/llama-src.patch
+done < $SRC_GGML/llama-commits
+
+rm -v $SRC_GGML/llama-commits
 
 # delete files if empty
 if [ ! -s $SRC_GGML/llama-src.patch ]; then
diff --git a/scripts/sync-llama.last b/scripts/sync-llama.last
index ee730322..e7db4c0e 100644
--- a/scripts/sync-llama.last
+++ b/scripts/sync-llama.last
@@ -1 +1 @@
-951010fa53a0ffe81b7d2e87c4349e0d3cb3d19d
+65e5f6dadbba4b496bba27f573e473c66b446496
diff --git a/scripts/sync-whisper-am.sh b/scripts/sync-whisper-am.sh
index 32323003..57fb9c4b 100755
--- a/scripts/sync-whisper-am.sh
+++ b/scripts/sync-whisper-am.sh
@@ -26,9 +26,20 @@ echo "Syncing whisper.cpp changes since commit $lc"
 
 cd $SRC_WHISPER
 
-git log --oneline $lc..HEAD
+git log --oneline $lc..HEAD | grep -v "(ggml/[0-9]*)" | cut -d' ' -f1 > $SRC_GGML/whisper-commits
 
-git format-patch $lc --stdout -- \
+if [ ! -s $SRC_GGML/whisper-commits ]; then
+    rm -v $SRC_GGML/whisper-commits
+    echo "No new commits"
+    exit 0
+fi
+
+if [ -f $SRC_GGML/whisper-src.patch ]; then
+    rm -v $SRC_GGML/whisper-src.patch
+fi
+
+while read c; do
+    git format-patch -k $c..$c --stdout -- \
     ggml*.h \
     ggml*.c \
     ggml*.cpp \
@@ -43,7 +54,10 @@ git format-patch $lc --stdout -- \
     examples/common-ggml.cpp \
     examples/main/main.cpp \
     examples/quantize/quantize.cpp \
-    > $SRC_GGML/whisper-src.patch
+    >> $SRC_GGML/whisper-src.patch
+done < $SRC_GGML/whisper-commits
+
+rm -v $SRC_GGML/whisper-commits
 
 # delete files if empty
 if [ ! -s $SRC_GGML/whisper-src.patch ]; then
diff --git a/scripts/sync-whisper.last b/scripts/sync-whisper.last
index e78e4dcd..ec18eb9c 100644
--- a/scripts/sync-whisper.last
+++ b/scripts/sync-whisper.last
@@ -1 +1 @@
-37a709f6558c6d9783199e2b8cbb136e1c41d346
+45f050efb176466c378530b06643fdc6a7905206