ggerganov commited on
Commit
129841d
·
1 Parent(s): f89bcc9

scripts : update sync

Browse files
Files changed (2) hide show
  1. scripts/sync-ggml-am.sh +16 -3
  2. scripts/sync-ggml.sh +2 -0
scripts/sync-ggml-am.sh CHANGED
@@ -55,7 +55,11 @@ while read c; do
55
  git format-patch -k $c~1..$c --stdout -- \
56
  CMakeLists.txt \
57
  src/CMakeLists.txt \
58
- cmake/FindSIMD.cmake \
 
 
 
 
59
  src/ggml*.h \
60
  src/ggml*.c \
61
  src/ggml*.cpp \
@@ -107,7 +111,12 @@ if [ -f $SRC_WHISPER/ggml-src.patch ]; then
107
  #
108
  # CMakelists.txt -> ggml/CMakeLists.txt
109
  # src/CMakeLists.txt -> ggml/src/CMakeLists.txt
110
- # cmake/FindSIMD.cmake -> ggml/cmake/FindSIMD.cmake
 
 
 
 
 
111
  #
112
  # src/ggml*.c -> ggml/src/ggml*.c
113
  # src/ggml*.cpp -> ggml/src/ggml*.cpp
@@ -140,7 +149,11 @@ if [ -f $SRC_WHISPER/ggml-src.patch ]; then
140
  cat ggml-src.patch | sed -E \
141
  -e 's/(^[[:space:]]| [ab]\/)CMakeLists.txt/\1ggml\/CMakeLists.txt/g' \
142
  -e 's/(^[[:space:]]| [ab]\/)src\/CMakeLists.txt/\1ggml\/src\/CMakeLists.txt/g' \
143
- -e 's/(^[[:space:]]| [ab]\/)cmake\/FindSIMD.cmake/\1ggml\/cmake\/FindSIMD.cmake/g' \
 
 
 
 
144
  -e 's/([[:space:]]| [ab]\/)src\/ggml(.*)\.c/\1ggml\/src\/ggml\2.c/g' \
145
  -e 's/([[:space:]]| [ab]\/)src\/ggml(.*)\.cpp/\1ggml\/src\/ggml\2.cpp/g' \
146
  -e 's/([[:space:]]| [ab]\/)src\/ggml(.*)\.h/\1ggml\/src\/ggml\2.h/g' \
 
55
  git format-patch -k $c~1..$c --stdout -- \
56
  CMakeLists.txt \
57
  src/CMakeLists.txt \
58
+ cmake/BuildTypes.cmake \
59
+ cmake/GitVars.cmake \
60
+ cmake/common.cmake \
61
+ cmake/ggml-config.cmake.in \
62
+ src/ggml-cpu/cmake/FindSIMD.cmake \
63
  src/ggml*.h \
64
  src/ggml*.c \
65
  src/ggml*.cpp \
 
111
  #
112
  # CMakelists.txt -> ggml/CMakeLists.txt
113
  # src/CMakeLists.txt -> ggml/src/CMakeLists.txt
114
+ #
115
+ # cmake/BuildTypes.cmake -> ggml/cmake/BuildTypes.cmake
116
+ # cmake/GitVars.cmake -> ggml/cmake/GitVars.cmake
117
+ # cmake/common.cmake -> ggml/cmake/common.cmake
118
+ # cmake/ggml-config.cmake.in -> ggml/cmake/ggml-config.cmake.in
119
+ # src/ggml-cpu/cmake/FindSIMD.cmake -> ggml/src/ggml-cpu/cmake/FindSIMD.cmake
120
  #
121
  # src/ggml*.c -> ggml/src/ggml*.c
122
  # src/ggml*.cpp -> ggml/src/ggml*.cpp
 
149
  cat ggml-src.patch | sed -E \
150
  -e 's/(^[[:space:]]| [ab]\/)CMakeLists.txt/\1ggml\/CMakeLists.txt/g' \
151
  -e 's/(^[[:space:]]| [ab]\/)src\/CMakeLists.txt/\1ggml\/src\/CMakeLists.txt/g' \
152
+ -e 's/(^[[:space:]]| [ab]\/)cmake\/BuildTypes.cmake/\1ggml\/cmake\/BuildTypes.cmake/g' \
153
+ -e 's/(^[[:space:]]| [ab]\/)cmake\/GitVars.cmake/\1ggml\/cmake\/GitVars.cmake/g' \
154
+ -e 's/(^[[:space:]]| [ab]\/)cmake\/common.cmake/\1ggml\/cmake\/common.cmake/g' \
155
+ -e 's/(^[[:space:]]| [ab]\/)cmake\/ggml-config.cmake.in/\1ggml\/cmake\/ggml-config.cmake.in/g' \
156
+ -e 's/(^[[:space:]]| [ab]\/)src\/ggml-cpu\/cmake\/FindSIMD.cmake/\1ggml\/src\/ggml-cpu\/cmake\/FindSIMD.cmake/g' \
157
  -e 's/([[:space:]]| [ab]\/)src\/ggml(.*)\.c/\1ggml\/src\/ggml\2.c/g' \
158
  -e 's/([[:space:]]| [ab]\/)src\/ggml(.*)\.cpp/\1ggml\/src\/ggml\2.cpp/g' \
159
  -e 's/([[:space:]]| [ab]\/)src\/ggml(.*)\.h/\1ggml\/src\/ggml\2.h/g' \
scripts/sync-ggml.sh CHANGED
@@ -2,7 +2,9 @@
2
 
3
  cp -rpv ../ggml/CMakeLists.txt ./ggml/CMakeLists.txt
4
  cp -rpv ../ggml/src/CMakeLists.txt ./ggml/src/CMakeLists.txt
 
5
  cp -rpv ../ggml/cmake/* ./ggml/cmake/
 
6
 
7
  cp -rpv ../ggml/src/ggml*.c ./ggml/src/
8
  cp -rpv ../ggml/src/ggml*.cpp ./ggml/src/
 
2
 
3
  cp -rpv ../ggml/CMakeLists.txt ./ggml/CMakeLists.txt
4
  cp -rpv ../ggml/src/CMakeLists.txt ./ggml/src/CMakeLists.txt
5
+
6
  cp -rpv ../ggml/cmake/* ./ggml/cmake/
7
+ cp -rpv ../ggml/src/ggml-cpu/cmake/* ./ggml/src/ggml-cpu/cmake/
8
 
9
  cp -rpv ../ggml/src/ggml*.c ./ggml/src/
10
  cp -rpv ../ggml/src/ggml*.cpp ./ggml/src/