scripts : sync gguf code

diff --git a/scripts/sync-llama-am.sh b/scripts/sync-llama-am.sh
index ecd910cfef8c5335473f992902b58160e2e229c0..22f3198ffec846be443c5f5220f09c67ad1bf7ac 100755 (executable)
--- a/scripts/sync-llama-am.sh
+++ b/scripts/sync-llama-am.sh
@@ -75,6 +75,7 @@ while read c; do
         ggml/cmake/ggml-config.cmake.in \
         ggml/src/ggml-cpu/cmake/FindSIMD.cmake \
         ggml/src/ggml* \
+        ggml/src/gguf* \
         ggml/include/ggml*.h \
         ggml/include/gguf*.h \
         tests/test-opt.cpp \
@@ -118,6 +119,7 @@ if [ -f $SRC_GGML/llama-src.patch ]; then
     # ggml/src/ggml-cpu/cmake/FindSIMD.cmake -> src/ggml-cpu/cmake/FindSIMD.cmake
     #
     # ggml/src/ggml* -> src/ggml*
+    # ggml/src/gguf* -> src/gguf*
     #
     # ggml/include/ggml*.h -> include/ggml*.h
     # ggml/include/gguf*.h -> include/gguf*.h
@@ -139,6 +141,7 @@ if [ -f $SRC_GGML/llama-src.patch ]; then
         -e 's/(^[[:space:]]| [ab]\/)ggml\/cmake\/ggml-config\.cmake\.in/\1cmake\/ggml-config\.cmake\.in/g' \
         -e 's/(^[[:space:]]| [ab]\/)ggml\/src\/ggml-cpu\/cmake\/FindSIMD\.cmake/\1src\/ggml-cpu\/cmake\/FindSIMD\.cmake/g' \
         -e 's/(^[[:space:]]| [ab]\/)ggml\/src\/ggml(.*)/\1src\/ggml\2/g' \
+        -e 's/(^[[:space:]]| [ab]\/)ggml\/src\/gguf(.*)/\1src\/gguf\2/g' \
         -e 's/(^[[:space:]]| [ab]\/)ggml\/include\/ggml(.*)\.h/\1include\/ggml\2.h/g' \
         -e 's/(^[[:space:]]| [ab]\/)ggml\/include\/gguf(.*)\.h/\1include\/gguf\2.h/g' \
         -e 's/(^[[:space:]]| [ab]\/)tests\/test-opt\.cpp/\1tests\/test-opt.cpp/g' \

diff --git a/scripts/sync-llama.sh b/scripts/sync-llama.sh
index 416bd90207d42e62972d58932053d0c42b0765ea..33e737358c450a7490056ee63bd89d4064c88671 100755 (executable)
--- a/scripts/sync-llama.sh
+++ b/scripts/sync-llama.sh
@@ -7,6 +7,7 @@ cp -rpv ../llama.cpp/ggml/cmake/*              cmake/
 cp -rpv ../llama.cpp/ggml/src/ggml-cpu/cmake/* src/ggml-cpu/cmake/
 
 cp -rpv ../llama.cpp/ggml/src/ggml* src/
+cp -rpv ../llama.cpp/ggml/src/gguf* src/
 
 cp -rpv ../llama.cpp/ggml/include/ggml*.h include/
 cp -rpv ../llama.cpp/ggml/include/gguf*.h include/

diff --git a/scripts/sync-whisper-am.sh b/scripts/sync-whisper-am.sh
index 8fad4368a7915d66d795c4619fd528da90b02455..f1d487bd56044a767044870105700b3c4a349faf 100755 (executable)
--- a/scripts/sync-whisper-am.sh
+++ b/scripts/sync-whisper-am.sh
@@ -57,6 +57,7 @@ while read c; do
         ggml/src/CMakeLists.txt \
         ggml/cmake/FindSIMD.cmake \
         ggml/src/ggml* \
+        ggml/src/gguf* \
         ggml/include/ggml*.h \
         ggml/include/gguf*.h \
         examples/common-ggml.h \
@@ -93,6 +94,7 @@ if [ -f $SRC_GGML/whisper-src.patch ]; then
     # ggml/cmake/FindSIMD.cmake -> cmake/FindSIMD.cmake
     #
     # ggml/src/ggml* -> src/ggml*
+    # ggml/src/gguf* -> src/gguf*
     #
     # ggml/include/ggml*.h -> include/ggml*.h
     # ggml/include/gguf*.h -> include/gguf*.h
@@ -110,6 +112,7 @@ if [ -f $SRC_GGML/whisper-src.patch ]; then
         -e 's/\/ggml\/src\/CMakeLists\.txt/\/src\/CMakeLists.txt/g' \
         -e 's/\/ggml\/cmake\/FindSIMD\.cmake/\/cmake\/FindSIMD.cmake/g' \
         -e 's/\/ggml\/src\/ggml(.*)/\/src\/ggml\1/g' \
+        -e 's/\/ggml\/src\/gguf(.*)/\/src\/gguf\1/g' \
         -e 's/\/ggml\/include\/ggml(.*)\.h/\/include\/ggml\1.h/g' \
         -e 's/\/ggml\/include\/gguf(.*)\.h/\/include\/gguf\1.h/g' \
         -e 's/\/examples\/common\.h/\/examples\/common.h/g' \

diff --git a/scripts/sync-whisper.sh b/scripts/sync-whisper.sh
index b2a853b048ee8db084bea2caa73f896c5527aaae..0221fa37ea363a8e1b6dbe64d56911f358bdfe5b 100755 (executable)
--- a/scripts/sync-whisper.sh
+++ b/scripts/sync-whisper.sh
@@ -5,6 +5,7 @@ cp -rpv ../whisper.cpp/ggml/src/CMakeLists.txt   src/CMakeLists.txt
 cp -rpv ../whisper.cpp/ggml/cmake/FindSIMD.cmake cmake/FindSIMD.cmake
 
 cp -rpv ../whisper.cpp/ggml/src/ggml* src/
+cp -rpv ../whisper.cpp/ggml/src/gguf* src/
 
 cp -rpv ../whisper.cpp/ggml/include/ggml*.h include/
 cp -rpv ../whisper.cpp/ggml/include/gguf*.h include/