ggerganov commited on
Commit
1785412
·
1 Parent(s): 57c0e54

scripts : fix sync order + metal sed

Browse files
Files changed (1) hide show
  1. extra/sync-ggml-am.sh +9 -8
extra/sync-ggml-am.sh CHANGED
@@ -27,7 +27,7 @@ echo "Syncing ggml changes since commit $lc"
27
  cd $SRC_GGML
28
 
29
  git log --oneline $lc..HEAD
30
- git log --oneline $lc..HEAD | grep -v "(whisper/[0-9]*)" | cut -d' ' -f1 > $SRC_WHISPER/ggml-commits
31
 
32
  if [ ! -s $SRC_WHISPER/ggml-commits ]; then
33
  rm -v $SRC_WHISPER/ggml-commits
@@ -48,11 +48,14 @@ while read c; do
48
  src/ggml*.m \
49
  src/ggml*.metal \
50
  src/ggml*.cu \
51
- tests/test-opt.cpp \
52
- tests/test-grad0.cpp \
53
- tests/test-quantize-fns.cpp \
54
- tests/test-quantize-perf.cpp \
55
- tests/test-backend-ops.cpp \
 
 
 
56
  >> $SRC_WHISPER/ggml-src.patch
57
  done < $SRC_WHISPER/ggml-commits
58
 
@@ -87,7 +90,6 @@ if [ -f $SRC_WHISPER/ggml-src.patch ]; then
87
  # src/ggml-impl.h -> ggml-impl.h
88
  # src/ggml-metal.h -> ggml-metal.h
89
  # src/ggml-metal.m -> ggml-metal.m
90
- # src/ggml-metal.metal -> ggml-metal.metal
91
  # src/ggml-mpi.h -> ggml-mpi.h
92
  # src/ggml-mpi.c -> ggml-mpi.c
93
  # src/ggml-opencl.cpp -> ggml-opencl.cpp
@@ -118,7 +120,6 @@ if [ -f $SRC_WHISPER/ggml-src.patch ]; then
118
  -e 's/src\/ggml-impl\.h/ggml-impl.h/g' \
119
  -e 's/src\/ggml-metal\.h/ggml-metal.h/g' \
120
  -e 's/src\/ggml-metal\.m/ggml-metal.m/g' \
121
- -e 's/src\/ggml-metal\.metal/ggml-metal.metal/g' \
122
  -e 's/src\/ggml-mpi\.h/ggml-mpi.h/g' \
123
  -e 's/src\/ggml-mpi\.c/ggml-mpi.c/g' \
124
  -e 's/src\/ggml-opencl\.cpp/ggml-opencl.cpp/g' \
 
27
  cd $SRC_GGML
28
 
29
  git log --oneline $lc..HEAD
30
+ git log --oneline $lc..HEAD --reverse | grep -v "(whisper/[0-9]*)" | cut -d' ' -f1 > $SRC_WHISPER/ggml-commits
31
 
32
  if [ ! -s $SRC_WHISPER/ggml-commits ]; then
33
  rm -v $SRC_WHISPER/ggml-commits
 
48
  src/ggml*.m \
49
  src/ggml*.metal \
50
  src/ggml*.cu \
51
+ examples/common.h \
52
+ examples/common.cpp \
53
+ examples/common-ggml.h \
54
+ examples/common-ggml.cpp \
55
+ examples/whisper/whisper.h \
56
+ examples/whisper/whisper.cpp \
57
+ examples/whisper/main.cpp \
58
+ examples/whisper/quantize.cpp \
59
  >> $SRC_WHISPER/ggml-src.patch
60
  done < $SRC_WHISPER/ggml-commits
61
 
 
90
  # src/ggml-impl.h -> ggml-impl.h
91
  # src/ggml-metal.h -> ggml-metal.h
92
  # src/ggml-metal.m -> ggml-metal.m
 
93
  # src/ggml-mpi.h -> ggml-mpi.h
94
  # src/ggml-mpi.c -> ggml-mpi.c
95
  # src/ggml-opencl.cpp -> ggml-opencl.cpp
 
120
  -e 's/src\/ggml-impl\.h/ggml-impl.h/g' \
121
  -e 's/src\/ggml-metal\.h/ggml-metal.h/g' \
122
  -e 's/src\/ggml-metal\.m/ggml-metal.m/g' \
 
123
  -e 's/src\/ggml-mpi\.h/ggml-mpi.h/g' \
124
  -e 's/src\/ggml-mpi\.c/ggml-mpi.c/g' \
125
  -e 's/src\/ggml-opencl\.cpp/ggml-opencl.cpp/g' \