scripts : update sync scripts

diff --git a/scripts/sync-llama-am.sh b/scripts/sync-llama-am.sh
index d4104cbaf7ead8fbc9d6cf337ea26c0101c36667..12c15dda87582aef414fb14c3cf7a3b8c25e598b 100755 (executable)
--- a/scripts/sync-llama-am.sh
+++ b/scripts/sync-llama-am.sh
@@ -74,22 +74,7 @@ while read c; do
         ggml/cmake/common.cmake \
         ggml/cmake/ggml-config.cmake.in \
         ggml/src/ggml-cpu/cmake/FindSIMD.cmake \
-        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/* \
-        ggml/src/ggml-cuda/* \
-        ggml/src/ggml-hip/* \
-        ggml/src/ggml-kompute/* \
-        ggml/src/ggml-metal/* \
-        ggml/src/ggml-musa/* \
-        ggml/src/ggml-opencl/* \
-        ggml/src/ggml-rpc/* \
-        ggml/src/ggml-sycl/* \
-        ggml/src/ggml-vulkan/* \
+        ggml/src/ggml* \
         ggml/include/ggml*.h \
         ggml/include/gguf*.h \
         tests/test-opt.cpp \
@@ -132,22 +117,7 @@ if [ -f $SRC_GGML/llama-src.patch ]; then
     # ggml/cmake/ggml-config.cmake.in        -> cmake/ggml-config.cmake.in
     # ggml/src/ggml-cpu/cmake/FindSIMD.cmake -> src/ggml-cpu/cmake/FindSIMD.cmake
     #
-    # 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/*
-    # ggml/src/ggml-cuda/*      -> src/ggml-cuda/*
-    # ggml/src/ggml-hip/*       -> src/ggml-hip/*
-    # ggml/src/ggml-kompute/*   -> src/ggml-kompute/*
-    # ggml/src/ggml-metal/*     -> src/ggml-metal/*
-    # ggml/src/ggml-musa/*      -> src/ggml-musa/*
-    # ggml/src/ggml-opencl/*    -> src/ggml-opencl/*
-    # ggml/src/ggml-rpc/*       -> src/ggml-rpc/*
-    # ggml/src/ggml-sycl/*      -> src/ggml-sycl/*
-    # ggml/src/ggml-vulkan/*    -> src/ggml-vulkan/*
+    # ggml/src/ggml* -> src/ggml*
     #
     # ggml/include/ggml*.h -> include/ggml*.h
     # ggml/include/gguf*.h -> include/gguf*.h
@@ -168,22 +138,7 @@ if [ -f $SRC_GGML/llama-src.patch ]; then
         -e 's/([[:space:]]| [ab]\/)ggml\/cmake\/common\.cmake/\1cmake\/common\.cmake/g' \
         -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(.*)\.c/\1src\/ggml\2.c/g' \
-        -e 's/([[:space:]]| [ab]\/)ggml\/src\/ggml(.*)\.cpp/\1src\/ggml\2.cpp/g' \
-        -e 's/([[:space:]]| [ab]\/)ggml\/src\/ggml(.*)\.h/\1src\/ggml\2.h/g' \
-        -e 's/([[:space:]]| [ab]\/)ggml\/src\/gguf(.*)\.cpp/\1src\/gguf\2.cpp/g' \
-        -e 's/([[:space:]]| [ab]\/)ggml\/src\/ggml-blas\//\1src\/ggml-blas\//g' \
-        -e 's/([[:space:]]| [ab]\/)ggml\/src\/ggml-cann\//\1src\/ggml-cann\//g' \
-        -e 's/([[:space:]]| [ab]\/)ggml\/src\/ggml-cpu\//\1src\/ggml-cpu\//g' \
-        -e 's/([[:space:]]| [ab]\/)ggml\/src\/ggml-cuda\//\1src\/ggml-cuda\//g' \
-        -e 's/([[:space:]]| [ab]\/)ggml\/src\/ggml-hip\//\1src\/ggml-hip\//g' \
-        -e 's/([[:space:]]| [ab]\/)ggml\/src\/ggml-kompute\//\1src\/ggml-kompute\//g' \
-        -e 's/([[:space:]]| [ab]\/)ggml\/src\/ggml-metal\//\1src\/ggml-metal\//g' \
-        -e 's/([[:space:]]| [ab]\/)ggml\/src\/ggml-musa\//\1src\/ggml-musa\//g' \
-        -e 's/([[:space:]]| [ab]\/)ggml\/src\/ggml-opencl\//\1src\/ggml-opencl\//g' \
-        -e 's/([[:space:]]| [ab]\/)ggml\/src\/ggml-rpc\//\1src\/ggml-rpc\//g' \
-        -e 's/([[:space:]]| [ab]\/)ggml\/src\/ggml-sycl\//\1src\/ggml-sycl\//g' \
-        -e 's/([[:space:]]| [ab]\/)ggml\/src\/ggml-vulkan\//\1src\/ggml-vulkan\//g' \
+        -e 's/([[:space:]]| [ab]\/)ggml\/src\/ggml(.*)/\1src\/ggml\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 7c6d02725f674c7e1b063dd7a63ade95f52d65c8..416bd90207d42e62972d58932053d0c42b0765ea 100755 (executable)
--- a/scripts/sync-llama.sh
+++ b/scripts/sync-llama.sh
@@ -6,22 +6,7 @@ cp -rpv ../llama.cpp/ggml/src/CMakeLists.txt   src/CMakeLists.txt
 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*.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/
-cp -rpv ../llama.cpp/ggml/src/ggml-cuda/*      src/ggml-cuda/
-cp -rpv ../llama.cpp/ggml/src/ggml-hip/*       src/ggml-hip/
-cp -rpv ../llama.cpp/ggml/src/ggml-kompute/*   src/ggml-kompute/
-cp -rpv ../llama.cpp/ggml/src/ggml-metal/*     src/ggml-metal/
-cp -rpv ../llama.cpp/ggml/src/ggml-musa/*      src/ggml-musa/
-cp -rpv ../llama.cpp/ggml/src/ggml-opencl/*    src/ggml-opencl/
-cp -rpv ../llama.cpp/ggml/src/ggml-rpc/*       src/ggml-rpc/
-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/src/ggml* src/
 
 cp -rpv ../llama.cpp/ggml/include/ggml*.h include/
 cp -rpv ../llama.cpp/ggml/include/gguf*.h include/