From: Georgi Gerganov <redacted>
Date: Thu, 8 Aug 2024 10:51:09 +0000 (+0300)
Subject: scripts : update sync scripts (#0)
X-Git-Tag: upstream/0.0.1642~457
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=3058ec3892b6516df08cf6fbb127a1b0b6409afb;p=pkg%2Fggml%2Fsources%2Fggml

scripts : update sync scripts (#0)
---

diff --git a/scripts/sync-llama-am.sh b/scripts/sync-llama-am.sh
index 47ab955d..3370f91f 100755
--- a/scripts/sync-llama-am.sh
+++ b/scripts/sync-llama-am.sh
@@ -108,7 +108,6 @@ if [ -f $SRC_GGML/llama-src.patch ]; then
     # ggml/src/ggml-backend-impl.h -> src/ggml-backend-impl.h
     # ggml/src/ggml-backend.c      -> src/ggml-backend.c
     # ggml/src/ggml-blas.cpp       -> src/ggml-blas.cpp
-    # ggml/src/ggml-blas.h         -> src/ggml-blas.h
     # ggml/src/ggml-common.h       -> src/ggml-common.h
     # ggml/src/ggml-cuda/*         -> src/ggml-cuda/*
     # ggml/src/ggml-cuda.cu        -> src/ggml-cuda.cu
@@ -154,7 +153,6 @@ if [ -f $SRC_GGML/llama-src.patch ]; then
         -e 's/\/ggml\/src\/ggml-backend-impl\.h/\/src\/ggml-backend-impl.h/g' \
         -e 's/\/ggml\/src\/ggml-backend\.c/\/src\/ggml-backend.c/g' \
         -e 's/\/ggml\/src\/ggml-blas\.cpp/\/src\/ggml-blas.cpp/g' \
-        -e 's/\/ggml\/src\/ggml-blas\.h/\/src\/ggml-blas.h/g' \
         -e 's/\/ggml\/src\/ggml-common\.h/\/src\/ggml-common.h/g' \
         -e 's/\/ggml\/src\/ggml-cuda\//\/src\/ggml-cuda\//g' \
         -e 's/\/ggml\/src\/ggml-cuda\.cu/\/src\/ggml-cuda.cu/g' \
diff --git a/scripts/sync-llama.sh b/scripts/sync-llama.sh
index a62d76a4..b2ea101f 100755
--- a/scripts/sync-llama.sh
+++ b/scripts/sync-llama.sh
@@ -25,7 +25,6 @@ cp -rpv ../llama.cpp/ggml/src/ggml-rpc.cpp        src/ggml-rpc.cpp
 cp -rpv ../llama.cpp/ggml/src/ggml-sycl/*         src/ggml-sycl/
 cp -rpv ../llama.cpp/ggml/src/ggml-sycl.cpp       src/ggml-sycl.cpp
 cp -rpv ../llama.cpp/ggml/src/ggml-vulkan.cpp     src/ggml-vulkan.cpp
-cp -rpv ../llama.cpp/ggml/src/ggml-vulkan.cpp     src/ggml-vulkan.cpp
 cp -rpv ../llama.cpp/ggml/src/vulkan-shaders/*    src/vulkan-shaders/
 
 cp -rpv ../llama.cpp/ggml/include/ggml.h         include/ggml.h
diff --git a/scripts/sync-whisper-am.sh b/scripts/sync-whisper-am.sh
index c46790d4..0568c7b2 100755
--- a/scripts/sync-whisper-am.sh
+++ b/scripts/sync-whisper-am.sh
@@ -100,11 +100,12 @@ if [ -f $SRC_GGML/whisper-src.patch ]; then
     # ggml/cmake/FindSIMD.cmake -> cmake/FindSIMD.cmake
     #
     # ggml/src/ggml.c              -> src/ggml.c
+    # ggml/src/ggml-aarch64.c      -> src/ggml-aarch64.c
+    # ggml/src/ggml-aarch64.h      -> src/ggml-aarch64.h
     # ggml/src/ggml-alloc.c        -> src/ggml-alloc.c
     # ggml/src/ggml-backend-impl.h -> src/ggml-backend-impl.h
     # ggml/src/ggml-backend.c      -> src/ggml-backend.c
     # ggml/src/ggml-blas.cpp       -> src/ggml-blas.cpp
-    # ggml/src/ggml-blas.h         -> src/ggml-blas.h
     # ggml/src/ggml-common.h       -> src/ggml-common.h
     # ggml/src/ggml-cuda/*         -> src/ggml-cuda/*
     # ggml/src/ggml-cuda.cu        -> src/ggml-cuda.cu
@@ -117,6 +118,7 @@ if [ -f $SRC_GGML/whisper-src.patch ]; then
     # ggml/src/ggml-sycl/*         -> src/ggml-sycl/*
     # ggml/src/ggml-sycl.cpp       -> src/ggml-sycl.cpp
     # ggml/src/ggml-vulkan.cpp     -> src/ggml-vulkan.cpp
+    # ggml/src/vulkan-shaders/*    -> src/vulkan-shaders/*
     #
     # ggml/include/ggml.h         -> include/ggml.h
     # ggml/include/ggml-alloc.h   -> include/ggml-alloc.h
@@ -142,11 +144,12 @@ 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\.c/\/src\/ggml.c/g' \
+        -e 's/\/ggml\/src\/ggml-aarch64\.c/\/src\/ggml-aarch64.c/g' \
+        -e 's/\/ggml\/src\/ggml-aarch64\.h/\/src\/ggml-aarch64.h/g' \
         -e 's/\/ggml\/src\/ggml-alloc\.c/\/src\/ggml-alloc.c/g' \
         -e 's/\/ggml\/src\/ggml-backend-impl\.h/\/src\/ggml-backend-impl.h/g' \
         -e 's/\/ggml\/src\/ggml-backend\.c/\/src\/ggml-backend.c/g' \
         -e 's/\/ggml\/src\/ggml-blas\.cpp/\/src\/ggml-blas.cpp/g' \
-        -e 's/\/ggml\/src\/ggml-blas\.h/\/src\/ggml-blas.h/g' \
         -e 's/\/ggml\/src\/ggml-common\.h/\/src\/ggml-common.h/g' \
         -e 's/\/ggml\/src\/ggml-cuda\//\/src\/ggml-cuda\//g' \
         -e 's/\/ggml\/src\/ggml-cuda\.cu/\/src\/ggml-cuda.cu/g' \
@@ -159,6 +162,7 @@ if [ -f $SRC_GGML/whisper-src.patch ]; then
         -e 's/\/ggml\/src\/ggml-sycl\//\/src\/ggml-sycl\//g' \
         -e 's/\/ggml\/src\/ggml-sycl\.cpp/\/src\/ggml-sycl.cpp/g' \
         -e 's/\/ggml\/src\/ggml-vulkan\.cpp/\/src\/ggml-vulkan.cpp/g' \
+        -e 's/\/ggml\/src\/vulkan-shaders\//\/src\/vulkan-shaders\//g' \
         -e 's/\/ggml\/include\/ggml\.h/\/include\/ggml.h/g' \
         -e 's/\/ggml\/include\/ggml-alloc\.h/\/include\/ggml-alloc.h/g' \
         -e 's/\/ggml\/include\/ggml-backend\.h/\/include\/ggml-backend.h/g' \
diff --git a/scripts/sync-whisper.sh b/scripts/sync-whisper.sh
index b78e66ad..18f9740d 100755
--- a/scripts/sync-whisper.sh
+++ b/scripts/sync-whisper.sh
@@ -5,6 +5,8 @@ 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.c              src/ggml.c
+cp -rpv ../whisper.cpp/ggml/src/ggml-aarch64.c      src/ggml-aarch64.c
+cp -rpv ../whisper.cpp/ggml/src/ggml-aarch64.h      src/ggml-aarch64.h
 cp -rpv ../whisper.cpp/ggml/src/ggml-alloc.c        src/ggml-alloc.c
 cp -rpv ../whisper.cpp/ggml/src/ggml-backend-impl.h src/ggml-backend-impl.h
 cp -rpv ../whisper.cpp/ggml/src/ggml-backend.c      src/ggml-backend.c
@@ -23,6 +25,7 @@ cp -rpv ../whisper.cpp/ggml/src/ggml-rpc.cpp        src/ggml-rpc.cpp
 cp -rpv ../whisper.cpp/ggml/src/ggml-sycl/*         src/ggml-sycl/
 cp -rpv ../whisper.cpp/ggml/src/ggml-sycl.cpp       src/ggml-sycl.cpp
 cp -rpv ../whisper.cpp/ggml/src/ggml-vulkan.cpp     src/ggml-vulkan.cpp
+cp -rpv ../whisper.cpp/ggml/src/vulkan-shaders/*    src/vulkan-shaders/
 
 cp -rpv ../whisper.cpp/ggml/include/ggml.h         include/ggml.h
 cp -rpv ../whisper.cpp/ggml/include/ggml-alloc.h   include/ggml-alloc.h