Skip to content

Commit ab62fc3

Browse files
committed
scripts : fix sync order + metal sed
1 parent 5f66ebc commit ab62fc3

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

scripts/sync-ggml-am.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ echo "Syncing ggml changes since commit $lc"
2727
cd $SRC_GGML
2828

2929
git log --oneline $lc..HEAD
30-
git log --oneline $lc..HEAD | grep -v "(llama/[0-9]*)" | cut -d' ' -f1 > $SRC_LLAMA/ggml-commits
30+
git log --oneline $lc..HEAD --reverse | grep -v "(llama/[0-9]*)" | cut -d' ' -f1 > $SRC_LLAMA/ggml-commits
3131

3232
if [ ! -s $SRC_LLAMA/ggml-commits ]; then
3333
rm -v $SRC_LLAMA/ggml-commits
@@ -87,7 +87,6 @@ if [ -f $SRC_LLAMA/ggml-src.patch ]; then
8787
# src/ggml-impl.h -> ggml-impl.h
8888
# src/ggml-metal.h -> ggml-metal.h
8989
# src/ggml-metal.m -> ggml-metal.m
90-
# src/ggml-metal.metal -> ggml-metal.metal
9190
# src/ggml-mpi.h -> ggml-mpi.h
9291
# src/ggml-mpi.c -> ggml-mpi.c
9392
# src/ggml-opencl.cpp -> ggml-opencl.cpp
@@ -114,7 +113,6 @@ if [ -f $SRC_LLAMA/ggml-src.patch ]; then
114113
-e 's/src\/ggml-impl\.h/ggml-impl.h/g' \
115114
-e 's/src\/ggml-metal\.h/ggml-metal.h/g' \
116115
-e 's/src\/ggml-metal\.m/ggml-metal.m/g' \
117-
-e 's/src\/ggml-metal\.metal/ggml-metal.metal/g' \
118116
-e 's/src\/ggml-mpi\.h/ggml-mpi.h/g' \
119117
-e 's/src\/ggml-mpi\.c/ggml-mpi.c/g' \
120118
-e 's/src\/ggml-opencl\.cpp/ggml-opencl.cpp/g' \

0 commit comments

Comments
 (0)