From: Georgi Gerganov <redacted>
Date: Sat, 26 Oct 2024 06:39:48 +0000 (+0300)
Subject: scripts : fix sync scripts (amx)
X-Git-Tag: upstream/0.0.1642~269
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=f879e97d806b5ff15f0e67fd277fa2c81c024be8;p=pkg%2Fggml%2Fsources%2Fggml

scripts : fix sync scripts (amx)
---

diff --git a/scripts/sync-llama-am.sh b/scripts/sync-llama-am.sh
index bea88da5..b0feb0af 100755
--- a/scripts/sync-llama-am.sh
+++ b/scripts/sync-llama-am.sh
@@ -76,6 +76,7 @@ while read c; do
         ggml/src/ggml*.m \
         ggml/src/ggml*.metal \
         ggml/src/ggml*.cu \
+        ggml/src/ggml-amx/* \
         ggml/src/ggml-cann/* \
         ggml/src/ggml-cuda/* \
         ggml/src/ggml-sycl/* \
@@ -121,6 +122,8 @@ if [ -f $SRC_GGML/llama-src.patch ]; then
     # 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-amx/*          -> src/ggml-amx/*
+    # ggml/src/ggml-amx.cpp        -> src/ggml-amx.cpp
     # ggml/src/ggml-backend-impl.h -> src/ggml-backend-impl.h
     # ggml/src/ggml-backend.cpp    -> src/ggml-backend.cpp
     # ggml/src/ggml-blas.cpp       -> src/ggml-blas.cpp
@@ -142,6 +145,7 @@ if [ -f $SRC_GGML/llama-src.patch ]; then
     #
     # ggml/include/ggml.h         -> include/ggml.h
     # ggml/include/ggml-alloc.h   -> include/ggml-alloc.h
+    # ggml/include/ggml-amx.h     -> include/ggml-amx.h
     # ggml/include/ggml-backend.h -> include/ggml-backend.h
     # ggml/include/ggml-blas.h    -> include/ggml-blas.h
     # ggml/include/ggml-cann.h    -> include/ggml-cann.h
@@ -169,6 +173,8 @@ if [ -f $SRC_GGML/llama-src.patch ]; then
         -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-amx\//\/src\/ggml-amx\//g' \
+        -e 's/\/ggml\/src\/ggml-amx\.cpp/\/src\/ggml-amx.cpp/g' \
         -e 's/\/ggml\/src\/ggml-backend-impl\.h/\/src\/ggml-backend-impl.h/g' \
         -e 's/\/ggml\/src\/ggml-backend\.cpp/\/src\/ggml-backend.cpp/g' \
         -e 's/\/ggml\/src\/ggml-blas\.cpp/\/src\/ggml-blas.cpp/g' \
@@ -189,6 +195,7 @@ if [ -f $SRC_GGML/llama-src.patch ]; then
         -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-amx\.h/\/include\/ggml-amx.h/g' \
         -e 's/\/ggml\/include\/ggml-backend\.h/\/include\/ggml-backend.h/g' \
         -e 's/\/ggml\/include\/ggml-blas\.h/\/include\/ggml-blas.h/g' \
         -e 's/\/ggml\/include\/ggml-cann\.h/\/include\/ggml-cann.h/g' \
diff --git a/scripts/sync-llama.sh b/scripts/sync-llama.sh
index 289dc311..b3648142 100755
--- a/scripts/sync-llama.sh
+++ b/scripts/sync-llama.sh
@@ -8,6 +8,8 @@ cp -rpv ../llama.cpp/ggml/src/ggml.c              src/ggml.c
 cp -rpv ../llama.cpp/ggml/src/ggml-aarch64.c      src/ggml-aarch64.c
 cp -rpv ../llama.cpp/ggml/src/ggml-aarch64.h      src/ggml-aarch64.h
 cp -rpv ../llama.cpp/ggml/src/ggml-alloc.c        src/ggml-alloc.c
+cp -rpv ../llama.cpp/ggml/src/ggml-amx/*          src/ggml-amx/
+cp -rpv ../llama.cpp/ggml/src/ggml-amx.cpp        src/ggml-amx.cpp
 cp -rpv ../llama.cpp/ggml/src/ggml-backend-impl.h src/ggml-backend-impl.h
 cp -rpv ../llama.cpp/ggml/src/ggml-backend.cpp    src/ggml-backend.cpp
 cp -rpv ../llama.cpp/ggml/src/ggml-blas.cpp       src/ggml-blas.cpp
@@ -30,6 +32,7 @@ cp -rpv ../llama.cpp/ggml/src/vulkan-shaders/*    src/vulkan-shaders/
 
 cp -rpv ../llama.cpp/ggml/include/ggml.h         include/ggml.h
 cp -rpv ../llama.cpp/ggml/include/ggml-alloc.h   include/ggml-alloc.h
+cp -rpv ../llama.cpp/ggml/include/ggml-amx.h     include/ggml-amx.h
 cp -rpv ../llama.cpp/ggml/include/ggml-backend.h include/ggml-backend.h
 cp -rpv ../llama.cpp/ggml/include/ggml-blas.h    include/ggml-blas.h
 cp -rpv ../llama.cpp/ggml/include/ggml-cann.h    include/ggml-cann.h
diff --git a/scripts/sync-whisper-am.sh b/scripts/sync-whisper-am.sh
index 2fbf3c66..2ede7af0 100755
--- a/scripts/sync-whisper-am.sh
+++ b/scripts/sync-whisper-am.sh
@@ -62,6 +62,7 @@ while read c; do
         ggml/src/ggml*.m \
         ggml/src/ggml*.metal \
         ggml/src/ggml*.cu \
+        ggml/src/ggml-amx/* \
         ggml/src/ggml-cann/* \
         ggml/src/ggml-cuda/* \
         ggml/src/ggml-sycl/* \
@@ -106,6 +107,8 @@ if [ -f $SRC_GGML/whisper-src.patch ]; then
     # 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-amx/*          -> src/ggml-amx/*
+    # ggml/src/ggml-amx.cpp        -> src/ggml-amx.cpp
     # ggml/src/ggml-backend-impl.h -> src/ggml-backend-impl.h
     # ggml/src/ggml-backend.cpp    -> src/ggml-backend.cpp
     # ggml/src/ggml-blas.cpp       -> src/ggml-blas.cpp
@@ -127,6 +130,7 @@ if [ -f $SRC_GGML/whisper-src.patch ]; then
     #
     # ggml/include/ggml.h         -> include/ggml.h
     # ggml/include/ggml-alloc.h   -> include/ggml-alloc.h
+    # ggml/include/ggml-amx.h     -> include/ggml-amx.h
     # ggml/include/ggml-backend.h -> include/ggml-backend.h
     # ggml/include/ggml-blas.h    -> include/ggml-blas.h
     # ggml/include/ggml-cann.h    -> include/ggml-cann.h
@@ -153,6 +157,8 @@ if [ -f $SRC_GGML/whisper-src.patch ]; then
         -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-amx\//\/src\/ggml-amx\//g' \
+        -e 's/\/ggml\/src\/ggml-amx\.cpp/\/src\/ggml-amx.cpp/g' \
         -e 's/\/ggml\/src\/ggml-backend-impl\.h/\/src\/ggml-backend-impl.h/g' \
         -e 's/\/ggml\/src\/ggml-backend\.cpp/\/src\/ggml-backend.cpp/g' \
         -e 's/\/ggml\/src\/ggml-blas\.cpp/\/src\/ggml-blas.cpp/g' \
@@ -173,6 +179,7 @@ if [ -f $SRC_GGML/whisper-src.patch ]; then
         -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-amx\.h/\/include\/ggml-amx.h/g' \
         -e 's/\/ggml\/include\/ggml-backend\.h/\/include\/ggml-backend.h/g' \
         -e 's/\/ggml\/include\/ggml-blas\.h/\/include\/ggml-blas.h/g' \
         -e 's/\/ggml\/include\/ggml-cann\.h/\/include\/ggml-cann.h/g' \
diff --git a/scripts/sync-whisper.sh b/scripts/sync-whisper.sh
index 123358c6..4dd5f2c3 100755
--- a/scripts/sync-whisper.sh
+++ b/scripts/sync-whisper.sh
@@ -8,6 +8,8 @@ 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-amx/*          src/ggml-amx/
+cp -rpv ../whisper.cpp/ggml/src/ggml-amx.cpp        src/ggml-amx.cpp
 cp -rpv ../whisper.cpp/ggml/src/ggml-backend-impl.h src/ggml-backend-impl.h
 cp -rpv ../whisper.cpp/ggml/src/ggml-backend.cpp    src/ggml-backend.cpp
 cp -rpv ../whisper.cpp/ggml/src/ggml-blas.cpp       src/ggml-blas.cpp
@@ -30,6 +32,7 @@ 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
+cp -rpv ../whisper.cpp/ggml/include/ggml-amx.h     include/ggml-amx.h
 cp -rpv ../whisper.cpp/ggml/include/ggml-backend.h include/ggml-backend.h
 cp -rpv ../whisper.cpp/ggml/include/ggml-blas.h    include/ggml-blas.h
 cp -rpv ../whisper.cpp/ggml/include/ggml-cann.h    include/ggml-cann.h