From: Georgi Gerganov <redacted>
Date: Sun, 16 Jun 2024 09:40:38 +0000 (+0300)
Subject: scripts : update sync
X-Git-Tag: upstream/0.0.1642~582
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=1ba593bdbef06041b8c94e327161e0b9ad4a348a;p=pkg%2Fggml%2Fsources%2Fggml

scripts : update sync
---

diff --git a/scripts/sync-llama-am.sh b/scripts/sync-llama-am.sh
index beb8b959..63a33faa 100755
--- a/scripts/sync-llama-am.sh
+++ b/scripts/sync-llama-am.sh
@@ -106,8 +106,6 @@ if [ -f $SRC_GGML/llama-src.patch ]; then
     # ggml-kompute.h      -> src/ggml-kompute.h
     # ggml-metal.h        -> src/ggml-metal.h
     # ggml-metal.m        -> src/ggml-metal.m
-    # ggml-mpi.h          -> src/ggml-mpi.h
-    # ggml-mpi.c          -> src/ggml-mpi.c
     # ggml-quants.c       -> src/ggml-quants.c
     # ggml-quants.h       -> src/ggml-quants.h
     # ggml-rpc.cpp        -> src/ggml-rpc.cpp
@@ -144,8 +142,6 @@ if [ -f $SRC_GGML/llama-src.patch ]; then
         -e 's/\/ggml-kompute\.h/\/src\/ggml-kompute.h/g' \
         -e 's/\/ggml-metal\.h/\/src\/ggml-metal.h/g' \
         -e 's/\/ggml-metal\.m/\/src\/ggml-metal.m/g' \
-        -e 's/\/ggml-mpi\.h/\/src\/ggml-mpi.h/g' \
-        -e 's/\/ggml-mpi\.c/\/src\/ggml-mpi.c/g' \
         -e 's/\/ggml-quants\.c/\/src\/ggml-quants.c/g' \
         -e 's/\/ggml-quants\.h/\/src\/ggml-quants.h/g' \
         -e 's/\/ggml-rpc\.cpp/\/src\/ggml-rpc.cpp/g' \
diff --git a/scripts/sync-llama.sh b/scripts/sync-llama.sh
index dd60d51f..e97457b3 100755
--- a/scripts/sync-llama.sh
+++ b/scripts/sync-llama.sh
@@ -14,8 +14,6 @@ cp -rpv ../llama.cpp/ggml-kompute.h      src/ggml-kompute.h
 cp -rpv ../llama.cpp/ggml-metal.h        src/ggml-metal.h
 cp -rpv ../llama.cpp/ggml-metal.m        src/ggml-metal.m
 cp -rpv ../llama.cpp/ggml-metal.metal    src/ggml-metal.metal
-#cp -rpv ../llama.cpp/ggml-mpi.h          src/ggml-mpi.h
-#cp -rpv ../llama.cpp/ggml-mpi.c          src/ggml-mpi.c
 cp -rpv ../llama.cpp/ggml-opencl.cpp     src/ggml-opencl.cpp
 cp -rpv ../llama.cpp/ggml-opencl.h       src/ggml-opencl.h
 cp -rpv ../llama.cpp/ggml-quants.c       src/ggml-quants.c
diff --git a/scripts/sync-whisper-am.sh b/scripts/sync-whisper-am.sh
index e3ce104e..49a084b7 100755
--- a/scripts/sync-whisper-am.sh
+++ b/scripts/sync-whisper-am.sh
@@ -110,12 +110,11 @@ if [ -f $SRC_GGML/whisper-src.patch ]; then
     # ggml-kompute.h      -> src/ggml-kompute.h
     # ggml-metal.h        -> src/ggml-metal.h
     # ggml-metal.m        -> src/ggml-metal.m
-    # ggml-mpi.h          -> src/ggml-mpi.h
-    # ggml-mpi.c          -> src/ggml-mpi.c
     # ggml-quants.c       -> src/ggml-quants.c
     # ggml-quants.h       -> src/ggml-quants.h
     # ggml-rpc.cpp        -> src/ggml-rpc.cpp
     # ggml-rpc.h          -> src/ggml-rpc.h
+    # ggml-sycl/*         -> src/ggml-sycl/*
     # ggml-sycl.cpp       -> src/ggml-sycl.cpp
     # ggml-sycl.h         -> src/ggml-sycl.h
     # ggml-vulkan.cpp     -> src/ggml-vulkan.cpp
@@ -153,12 +152,11 @@ if [ -f $SRC_GGML/whisper-src.patch ]; then
         -e 's/\/ggml-kompute\.h/\/src\/ggml-kompute.h/g' \
         -e 's/\/ggml-metal\.h/\/src\/ggml-metal.h/g' \
         -e 's/\/ggml-metal\.m/\/src\/ggml-metal.m/g' \
-        -e 's/\/ggml-mpi\.h/\/src\/ggml-mpi.h/g' \
-        -e 's/\/ggml-mpi\.c/\/src\/ggml-mpi.c/g' \
         -e 's/\/ggml-quants\.c/\/src\/ggml-quants.c/g' \
         -e 's/\/ggml-quants\.h/\/src\/ggml-quants.h/g' \
         -e 's/\/ggml-rpc\.cpp/\/src\/ggml-rpc.cpp/g' \
         -e 's/\/ggml-rpc\.h/\/src\/ggml-rpc.h/g' \
+        -e 's/\/ggml-sycl\//\/src\/ggml-sycl\//g' \
         -e 's/\/ggml-sycl\.cpp/\/src\/ggml-sycl.cpp/g' \
         -e 's/\/ggml-sycl\.h/\/src\/ggml-sycl.h/g' \
         -e 's/\/ggml-vulkan\.cpp/\/src\/ggml-vulkan.cpp/g' \
diff --git a/scripts/sync-whisper.sh b/scripts/sync-whisper.sh
index 05b1c982..8d738c98 100755
--- a/scripts/sync-whisper.sh
+++ b/scripts/sync-whisper.sh
@@ -14,14 +14,13 @@ cp -rpv ../whisper.cpp/ggml-kompute.h                 src/ggml-kompute.h
 cp -rpv ../whisper.cpp/ggml-metal.h                   src/ggml-metal.h
 cp -rpv ../whisper.cpp/ggml-metal.m                   src/ggml-metal.m
 cp -rpv ../whisper.cpp/ggml-metal.metal               src/ggml-metal.metal
-#cp -rpv ../whisper.cpp/ggml-mpi.h                     src/ggml-mpi.h
-#cp -rpv ../whisper.cpp/ggml-mpi.m                     src/ggml-mpi.m
 cp -rpv ../whisper.cpp/ggml-opencl.cpp                src/ggml-opencl.cpp
 cp -rpv ../whisper.cpp/ggml-opencl.h                  src/ggml-opencl.h
 cp -rpv ../whisper.cpp/ggml-quants.c                  src/ggml-quants.c
 cp -rpv ../whisper.cpp/ggml-quants.h                  src/ggml-quants.h
 cp -rpv ../whisper.cpp/ggml-rpc.cpp                   src/ggml-rpc.cpp
 cp -rpv ../whisper.cpp/ggml-rpc.h                     src/ggml-rpc.h
+cp -rpv ../whisper.cpp/ggml-sycl/*                    src/ggml-sycl/
 cp -rpv ../whisper.cpp/ggml-sycl.cpp                  src/ggml-sycl.cpp
 cp -rpv ../whisper.cpp/ggml-sycl.h                    src/ggml-sycl.h
 cp -rpv ../whisper.cpp/ggml-vulkan.cpp                src/ggml-vulkan.cpp