scripts : update whisper sync

ggerganov · Dec 8, 2024 · a1e690a · a1e690a
1 parent a5960e8
commit a1e690a
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 13 deletions.
diff --git a/scripts/sync-whisper-am.sh b/scripts/sync-whisper-am.sh
@@ -59,13 +59,17 @@ while read c; do
         ggml/src/ggml*.h \
         ggml/src/ggml*.c \
         ggml/src/ggml*.cpp \
-        ggml/src/ggml*.m \
-        ggml/src/ggml*.metal \
-        ggml/src/ggml*.cu \
+        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-rpc/* \
         ggml/src/ggml-sycl/* \
-        ggml/src/vulkan-shaders/* \
+        ggml/src/ggml-vulkan/* \
         ggml/include/ggml*.h \
         examples/common.h \
         examples/common.cpp \
@@ -105,12 +109,17 @@ 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/ggml*.cu         -> src/ggml*.cu
-    # ggml/src/ggml*.m          -> src/ggml*.m
+    # 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-rpc/*       -> src/ggml-rpc/*
     # ggml/src/ggml-sycl/*      -> src/ggml-sycl/*
-    # ggml/src/vulkan-shaders/* -> src/vulkan-shaders/*
+    # ggml/src/ggml-vulkan/*    -> src/ggml-vulkan/*
     #
     # ggml/include/ggml*.h -> include/ggml*.h
     #
@@ -129,12 +138,17 @@ 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\/ggml(.*)\.cu/\/src\/ggml\1.cu/g' \
-        -e 's/\/ggml\/src\/ggml(.*)\.m/\/src\/ggml\1.m/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' \
         -e 's/\/ggml\/src\/ggml-cuda\//\/src\/ggml-cuda\//g' \
+        -e 's/\/ggml\/src\/ggml-hip\//\/src\/ggml-hip\//g' \
+        -e 's/\/ggml\/src\/ggml-kompute\//\/src\/ggml-kompute\//g' \
+        -e 's/\/ggml\/src\/ggml-metal\//\/src\/ggml-metal\//g' \
+        -e 's/\/ggml\/src\/ggml-musa\//\/src\/ggml-musa\//g' \
+        -e 's/\/ggml\/src\/ggml-rpc\//\/src\/ggml-rpc\//g' \
         -e 's/\/ggml\/src\/ggml-sycl\//\/src\/ggml-sycl\//g' \
-        -e 's/\/ggml\/src\/vulkan-shaders\//\/src\/vulkan-shaders\//g' \
+        -e 's/\/ggml\/src\/ggml-vulkan\//\/src\/ggml-vulkan\//g' \
         -e 's/\/ggml\/include\/ggml(.*)\.h/\/include\/ggml\1.h/g' \
         -e 's/\/examples\/common\.h/\/examples\/common.h/g' \
         -e 's/\/examples\/common\.cpp/\/examples\/common.cpp/g' \

diff --git a/scripts/sync-whisper.sh b/scripts/sync-whisper.sh
@@ -7,12 +7,17 @@ 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/ggml*.cu         src/
-cp -rpv ../whisper.cpp/ggml/src/ggml*.m          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/
 cp -rpv ../whisper.cpp/ggml/src/ggml-cuda/*      src/ggml-cuda/
+cp -rpv ../whisper.cpp/ggml/src/ggml-hip/*       src/ggml-hip/
+cp -rpv ../whisper.cpp/ggml/src/ggml-kompute/*   src/ggml-kompute/
+cp -rpv ../whisper.cpp/ggml/src/ggml-metal/*     src/ggml-metal/
+cp -rpv ../whisper.cpp/ggml/src/ggml-musa/*      src/ggml-musa/
+cp -rpv ../whisper.cpp/ggml/src/ggml-rpc/*       src/ggml-rpc/
 cp -rpv ../whisper.cpp/ggml/src/ggml-sycl/*      src/ggml-sycl/
-cp -rpv ../whisper.cpp/ggml/src/vulkan-shaders/* src/vulkan-shaders/
+cp -rpv ../whisper.cpp/ggml/src/ggml-vulkan/*    src/ggml-vulkan/
 
 cp -rpv ../whisper.cpp/ggml/include/ggml*.h include/