scripts : sync-ggml-am.sh option to skip commits

diff --git a/scripts/sync-ggml-am.sh b/scripts/sync-ggml-am.sh
index 248cf10235e368ab126bb90a395042bd2e36da88..6b2514a11905effdc4ccf7bfd222050387681700 100755 (executable)
--- a/scripts/sync-ggml-am.sh
+++ b/scripts/sync-ggml-am.sh
@@ -5,7 +5,7 @@
 # Usage:
 #
 #   $ cd /path/to/llama.cpp
-#   $ ./scripts/sync-ggml-am.sh
+#   $ ./scripts/sync-ggml-am.sh -skip hash0,hash1,hash2...
 #
 
 set -e
@@ -24,6 +24,11 @@ fi
 lc=$(cat $SRC_LLAMA/scripts/sync-ggml.last)
 echo "Syncing ggml changes since commit $lc"
 
+to_skip=""
+if [ "$1" == "-skip" ]; then
+    to_skip=$2
+fi
+
 cd $SRC_GGML
 
 git log --oneline $lc..HEAD
@@ -40,6 +45,13 @@ if [ -f $SRC_LLAMA/ggml-src.patch ]; then
 fi
 
 while read c; do
+    if [ -n "$to_skip" ]; then
+        if [[ $to_skip == *"$c"* ]]; then
+            echo "Skipping $c"
+            continue
+        fi
+    fi
+
     git format-patch -k $c~1..$c --stdout -- \
         include/ggml/ggml*.h \
         src/ggml*.h \

diff --git a/scripts/sync-ggml.last b/scripts/sync-ggml.last
index 753d227a76a80cded967a3be5a5c36627cef49ad..be9e408fbeb39b617794dfa8d1ab9480ca0dd33a 100644 (file)
--- a/scripts/sync-ggml.last
+++ b/scripts/sync-ggml.last
@@ -1 +1 @@
-1890780da4ea10db88736fcde85f285abf6c64b0
+b306d6e996ec0ace77118fa5098822cdc7f9c88f