From: Georgi Gerganov <redacted>
Date: Tue, 14 Jan 2025 07:29:27 +0000 (+0200)
Subject: scripts : sync gguf
X-Git-Tag: upstream/0.0.1642~3
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=404b00257f196997f6010df4ba73bb4bcce30e8f;p=pkg%2Fggml%2Fsources%2Fggml

scripts : sync gguf
---

diff --git a/scripts/sync-llama-am.sh b/scripts/sync-llama-am.sh
index 60261b13..155914a9 100755
--- a/scripts/sync-llama-am.sh
+++ b/scripts/sync-llama-am.sh
@@ -72,6 +72,7 @@ while read c; do
         ggml/src/ggml*.h \
         ggml/src/ggml*.c \
         ggml/src/ggml*.cpp \
+        ggml/src/gguf*.cpp \
         ggml/src/ggml-blas/* \
         ggml/src/ggml-cann/* \
         ggml/src/ggml-cpu/* \
@@ -122,6 +123,7 @@ if [ -f $SRC_GGML/llama-src.patch ]; then
     # ggml/src/ggml*.c          -> src/ggml*.c
     # ggml/src/ggml*.cpp        -> src/ggml*.cpp
     # ggml/src/ggml*.h          -> src/ggml*.h
+    # ggml/src/gguf*.cpp        -> src/gguf*.h
     # ggml/src/ggml-blas/*      -> src/ggml-blas/*
     # ggml/src/ggml-cann/*      -> src/ggml-cann/*
     # ggml/src/ggml-cpu/*       -> src/ggml-cpu/*
@@ -136,6 +138,7 @@ if [ -f $SRC_GGML/llama-src.patch ]; then
     # ggml/src/ggml-vulkan/*    -> src/ggml-vulkan/*
     #
     # ggml/include/ggml*.h -> include/ggml*.h
+    # ggml/include/gguf*.h -> include/gguf*.h
     #
     # tests/test-opt.cpp           -> tests/test-opt.cpp
     # tests/test-quantize-fns.cpp  -> tests/test-quantize-fns.cpp
@@ -151,6 +154,7 @@ if [ -f $SRC_GGML/llama-src.patch ]; then
         -e 's/\/ggml\/src\/ggml(.*)\.c/\/src\/ggml\1.c/g' \
         -e 's/\/ggml\/src\/ggml(.*)\.cpp/\/src\/ggml\1.cpp/g' \
         -e 's/\/ggml\/src\/ggml(.*)\.h/\/src\/ggml\1.h/g' \
+        -e 's/\/ggml\/src\/gguf(.*)\.cpp/\/src\/gguf\1.cpp/g' \
         -e 's/\/ggml\/src\/ggml-blas\//\/src\/ggml-blas\//g' \
         -e 's/\/ggml\/src\/ggml-cann\//\/src\/ggml-cann\//g' \
         -e 's/\/ggml\/src\/ggml-cpu\//\/src\/ggml-cpu\//g' \
@@ -164,6 +168,7 @@ if [ -f $SRC_GGML/llama-src.patch ]; then
         -e 's/\/ggml\/src\/ggml-sycl\//\/src\/ggml-sycl\//g' \
         -e 's/\/ggml\/src\/ggml-vulkan\//\/src\/ggml-vulkan\//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/\/tests\/test-opt\.cpp/\/tests\/test-opt.cpp/g' \
         -e 's/\/tests\/test-quantize-fns\.cpp/\/tests\/test-quantize-fns.cpp/g' \
         -e 's/\/tests\/test-quantize-perf\.cpp/\/tests\/test-quantize-perf.cpp/g' \
diff --git a/scripts/sync-llama.sh b/scripts/sync-llama.sh
index 92d094b3..dba29c90 100755
--- a/scripts/sync-llama.sh
+++ b/scripts/sync-llama.sh
@@ -7,6 +7,7 @@ cp -rpv ../llama.cpp/ggml/cmake/FindSIMD.cmake cmake/FindSIMD.cmake
 cp -rpv ../llama.cpp/ggml/src/ggml*.c          src/
 cp -rpv ../llama.cpp/ggml/src/ggml*.cpp        src/
 cp -rpv ../llama.cpp/ggml/src/ggml*.h          src/
+cp -rpv ../llama.cpp/ggml/src/gguf*.cpp        src/
 cp -rpv ../llama.cpp/ggml/src/ggml-blas/*      src/ggml-blas/
 cp -rpv ../llama.cpp/ggml/src/ggml-cann/*      src/ggml-cann/
 cp -rpv ../llama.cpp/ggml/src/ggml-cpu/*       src/ggml-cpu/
@@ -21,6 +22,7 @@ cp -rpv ../llama.cpp/ggml/src/ggml-sycl/*      src/ggml-sycl/
 cp -rpv ../llama.cpp/ggml/src/ggml-vulkan/*    src/ggml-vulkan/
 
 cp -rpv ../llama.cpp/ggml/include/ggml*.h include/
+cp -rpv ../llama.cpp/ggml/include/gguf*.h include/
 
 cp -rpv ../llama.cpp/tests/test-opt.cpp           tests/test-opt.cpp
 cp -rpv ../llama.cpp/tests/test-quantize-fns.cpp  tests/test-quantize-fns.cpp
diff --git a/scripts/sync-whisper-am.sh b/scripts/sync-whisper-am.sh
index 8e21dbeb..a83914e1 100755
--- a/scripts/sync-whisper-am.sh
+++ b/scripts/sync-whisper-am.sh
@@ -59,6 +59,7 @@ while read c; do
         ggml/src/ggml*.h \
         ggml/src/ggml*.c \
         ggml/src/ggml*.cpp \
+        ggml/src/gguf*.cpp \
         ggml/src/ggml-blas/* \
         ggml/src/ggml-cann/* \
         ggml/src/ggml-cpu/* \
@@ -72,6 +73,7 @@ while read c; do
         ggml/src/ggml-sycl/* \
         ggml/src/ggml-vulkan/* \
         ggml/include/ggml*.h \
+        ggml/include/gguf*.h \
         examples/common.h \
         examples/common.cpp \
         examples/common-ggml.h \
@@ -110,6 +112,7 @@ if [ -f $SRC_GGML/whisper-src.patch ]; then
     # ggml/src/ggml*.c          -> src/ggml*.c
     # ggml/src/ggml*.cpp        -> src/ggml*.cpp
     # ggml/src/ggml*.h          -> src/ggml*.h
+    # ggml/src/gguf*.cpp        -> src/gguf*.cpp
     # ggml/src/ggml-blas/*      -> src/ggml-blas/*
     # ggml/src/ggml-cann/*      -> src/ggml-cann/*
     # ggml/src/ggml-cpu/*       -> src/ggml-cpu/*
@@ -124,6 +127,7 @@ if [ -f $SRC_GGML/whisper-src.patch ]; then
     # ggml/src/ggml-vulkan/*    -> src/ggml-vulkan/*
     #
     # ggml/include/ggml*.h -> include/ggml*.h
+    # ggml/include/gguf*.h -> include/gguf*.h
     #
     # examples/common.h        -> examples/common.h
     # examples/common.cpp      -> examples/common.cpp
@@ -140,6 +144,7 @@ if [ -f $SRC_GGML/whisper-src.patch ]; then
         -e 's/\/ggml\/src\/ggml(.*)\.c/\/src\/ggml\1.c/g' \
         -e 's/\/ggml\/src\/ggml(.*)\.cpp/\/src\/ggml\1.cpp/g' \
         -e 's/\/ggml\/src\/ggml(.*)\.h/\/src\/ggml\1.h/g' \
+        -e 's/\/ggml\/src\/gguf(.*)\.cpp/\/src\/gguf\1.cpp/g' \
         -e 's/\/ggml\/src\/ggml-blas\//\/src\/ggml-blas\//g' \
         -e 's/\/ggml\/src\/ggml-cann\//\/src\/ggml-cann\//g' \
         -e 's/\/ggml\/src\/ggml-cpu\//\/src\/ggml-cpu\//g' \
@@ -153,6 +158,7 @@ if [ -f $SRC_GGML/whisper-src.patch ]; then
         -e 's/\/ggml\/src\/ggml-sycl\//\/src\/ggml-sycl\//g' \
         -e 's/\/ggml\/src\/ggml-vulkan\//\/src\/ggml-vulkan\//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' \
         -e 's/\/examples\/common\.cpp/\/examples\/common.cpp/g' \
         -e 's/\/examples\/common-ggml\.h/\/examples\/common-ggml.h/g' \
diff --git a/scripts/sync-whisper.sh b/scripts/sync-whisper.sh
index 57dee2b2..2f63dfc8 100755
--- a/scripts/sync-whisper.sh
+++ b/scripts/sync-whisper.sh
@@ -7,6 +7,7 @@ cp -rpv ../whisper.cpp/ggml/cmake/FindSIMD.cmake cmake/FindSIMD.cmake
 cp -rpv ../whisper.cpp/ggml/src/ggml*.c          src/
 cp -rpv ../whisper.cpp/ggml/src/ggml*.cpp        src/
 cp -rpv ../whisper.cpp/ggml/src/ggml*.h          src/
+cp -rpv ../whisper.cpp/ggml/src/gguf*.cpp        src/
 cp -rpv ../whisper.cpp/ggml/src/ggml-blas/*      src/ggml-blas/
 cp -rpv ../whisper.cpp/ggml/src/ggml-cann/*      src/ggml-cann/
 cp -rpv ../whisper.cpp/ggml/src/ggml-cpu/*       src/ggml-cpu/
@@ -21,6 +22,7 @@ cp -rpv ../whisper.cpp/ggml/src/ggml-sycl/*      src/ggml-sycl/
 cp -rpv ../whisper.cpp/ggml/src/ggml-vulkan/*    src/ggml-vulkan/
 
 cp -rpv ../whisper.cpp/ggml/include/ggml*.h include/
+cp -rpv ../whisper.cpp/ggml/include/gguf*.h include/
 
 cp -rpv ../whisper.cpp/examples/common.h        examples/common.h
 cp -rpv ../whisper.cpp/examples/common.cpp      examples/common.cpp