From 620a2238149a8686f7018a69a31c8d82fa747f62 Mon Sep 17 00:00:00 2001 From: Georgi Gerganov Date: Wed, 3 Jan 2024 11:42:42 +0200 Subject: [PATCH] scripts : fix sync order + metal sed --- extra/sync-ggml-am.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/extra/sync-ggml-am.sh b/extra/sync-ggml-am.sh index 0b8e55a..25f5372 100755 --- a/extra/sync-ggml-am.sh +++ b/extra/sync-ggml-am.sh @@ -27,7 +27,7 @@ echo "Syncing ggml changes since commit $lc" cd $SRC_GGML git log --oneline $lc..HEAD -git log --oneline $lc..HEAD | grep -v "(whisper/[0-9]*)" | cut -d' ' -f1 > $SRC_WHISPER/ggml-commits +git log --oneline $lc..HEAD --reverse | grep -v "(whisper/[0-9]*)" | cut -d' ' -f1 > $SRC_WHISPER/ggml-commits if [ ! -s $SRC_WHISPER/ggml-commits ]; then rm -v $SRC_WHISPER/ggml-commits @@ -48,11 +48,14 @@ while read c; do 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 \ + examples/common.h \ + examples/common.cpp \ + examples/common-ggml.h \ + examples/common-ggml.cpp \ + examples/whisper/whisper.h \ + examples/whisper/whisper.cpp \ + examples/whisper/main.cpp \ + examples/whisper/quantize.cpp \ >> $SRC_WHISPER/ggml-src.patch done < $SRC_WHISPER/ggml-commits @@ -87,7 +90,6 @@ if [ -f $SRC_WHISPER/ggml-src.patch ]; then # src/ggml-impl.h -> ggml-impl.h # src/ggml-metal.h -> ggml-metal.h # src/ggml-metal.m -> ggml-metal.m - # src/ggml-metal.metal -> ggml-metal.metal # src/ggml-mpi.h -> ggml-mpi.h # src/ggml-mpi.c -> ggml-mpi.c # src/ggml-opencl.cpp -> ggml-opencl.cpp @@ -118,7 +120,6 @@ if [ -f $SRC_WHISPER/ggml-src.patch ]; then -e 's/src\/ggml-impl\.h/ggml-impl.h/g' \ -e 's/src\/ggml-metal\.h/ggml-metal.h/g' \ -e 's/src\/ggml-metal\.m/ggml-metal.m/g' \ - -e 's/src\/ggml-metal\.metal/ggml-metal.metal/g' \ -e 's/src\/ggml-mpi\.h/ggml-mpi.h/g' \ -e 's/src\/ggml-mpi\.c/ggml-mpi.c/g' \ -e 's/src\/ggml-opencl\.cpp/ggml-opencl.cpp/g' \