From: Georgi Gerganov <redacted>
Date: Wed, 3 Jan 2024 09:24:48 +0000 (+0200)
Subject: scripts : fix sync order + metal sed
X-Git-Tag: upstream/0.0.1642~1138
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=1aa9011056589c0866a2b0056ee46b022aa5c553;p=pkg%2Fggml%2Fsources%2Fggml

scripts : fix sync order + metal sed
---

diff --git a/scripts/sync-llama-am.sh b/scripts/sync-llama-am.sh
index 422a0e6b..c3caebdf 100755
--- a/scripts/sync-llama-am.sh
+++ b/scripts/sync-llama-am.sh
@@ -27,7 +27,7 @@ echo "Syncing llama.cpp changes since commit $lc"
 cd $SRC_LLAMA
 
 git log --oneline $lc..HEAD
-git log --oneline $lc..HEAD | grep -v "(ggml/[0-9]*)" | grep -v "(whisper/[0-9]*)" | cut -d' ' -f1 > $SRC_GGML/llama-commits
+git log --oneline $lc..HEAD --reverse | grep -v "(ggml/[0-9]*)" | grep -v "(whisper/[0-9]*)" | cut -d' ' -f1 > $SRC_GGML/llama-commits
 
 if [ ! -s $SRC_GGML/llama-commits ]; then
     rm -v $SRC_GGML/llama-commits
@@ -86,7 +86,6 @@ if [ -f $SRC_GGML/llama-src.patch ]; then
     # ggml-impl.h         -> src/ggml-impl.h
     # ggml-metal.h        -> src/ggml-metal.h
     # ggml-metal.m        -> src/ggml-metal.m
-    # ggml-metal.metal    -> src/ggml-metal.metal
     # ggml-mpi.h          -> src/ggml-mpi.h
     # ggml-mpi.c          -> src/ggml-mpi.c
     # ggml-opencl.cpp     -> src/ggml-opencl.cpp
@@ -113,7 +112,6 @@ if [ -f $SRC_GGML/llama-src.patch ]; then
         -e 's/\/ggml-impl\.h/\/src\/ggml-impl.h/g' \
         -e 's/\/ggml-metal\.h/\/src\/ggml-metal.h/g' \
         -e 's/\/ggml-metal\.m/\/src\/ggml-metal.m/g' \
-        -e 's/\/ggml-metal\.metal/\/src\/ggml-metal.metal/g' \
         -e 's/\/ggml-mpi\.h/\/src\/ggml-mpi.h/g' \
         -e 's/\/ggml-mpi\.c/\/src\/ggml-mpi.c/g' \
         -e 's/\/ggml-opencl\.cpp/\/src\/ggml-opencl.cpp/g' \
diff --git a/scripts/sync-whisper-am.sh b/scripts/sync-whisper-am.sh
index 190d2225..bdc4d176 100755
--- a/scripts/sync-whisper-am.sh
+++ b/scripts/sync-whisper-am.sh
@@ -27,7 +27,7 @@ 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]*)" | grep -v "(llama/[0-9]*)" | cut -d' ' -f1 > $SRC_GGML/whisper-commits
+git log --oneline $lc..HEAD --reverse | grep -v "(ggml/[0-9]*)" | grep -v "(llama/[0-9]*)" | cut -d' ' -f1 > $SRC_GGML/whisper-commits
 
 if [ ! -s $SRC_GGML/whisper-commits ]; then
     rm -v $SRC_GGML/whisper-commits
@@ -89,7 +89,6 @@ if [ -f $SRC_GGML/whisper-src.patch ]; then
     # ggml-impl.h         -> src/ggml-impl.h
     # ggml-metal.h        -> src/ggml-metal.h
     # ggml-metal.m        -> src/ggml-metal.m
-    # ggml-metal.metal    -> src/ggml-metal.metal
     # ggml-mpi.h          -> src/ggml-mpi.h
     # ggml-mpi.c          -> src/ggml-mpi.c
     # ggml-opencl.cpp     -> src/ggml-opencl.cpp
@@ -120,7 +119,6 @@ if [ -f $SRC_GGML/whisper-src.patch ]; then
         -e 's/\/ggml-impl\.h/\/src\/ggml-impl.h/g' \
         -e 's/\/ggml-metal\.h/\/src\/ggml-metal.h/g' \
         -e 's/\/ggml-metal\.m/\/src\/ggml-metal.m/g' \
-        -e 's/\/ggml-metal\.metal/\/src\/ggml-metal.metal/g' \
         -e 's/\/ggml-mpi\.h/\/src\/ggml-mpi.h/g' \
         -e 's/\/ggml-mpi\.c/\/src\/ggml-mpi.c/g' \
         -e 's/\/ggml-opencl\.cpp/\/src\/ggml-opencl.cpp/g' \