scripts : update sync-llama-am.sh

diff --git a/scripts/sync-llama-am.sh b/scripts/sync-llama-am.sh
index 07a3805cad0479e5fdca49589b1532e74438a4f4..d4104cbaf7ead8fbc9d6cf337ea26c0101c36667 100755 (executable)
--- a/scripts/sync-llama-am.sh
+++ b/scripts/sync-llama-am.sh
@@ -161,37 +161,37 @@ if [ -f $SRC_GGML/llama-src.patch ]; then
     # scripts/gen-authors.sh -> scripts/gen-authors.sh
 
     cat llama-src.patch | sed -E \
-        -e 's/\/ggml\/CMakeLists\.txt/\/CMakeLists.txt/g' \
-        -e 's/\/ggml\/src\/CMakeLists\.txt/\/src\/CMakeLists.txt/g' \
-        -e 's/\/ggml\/cmake\/BuildTypes\.cmake/\/cmake\/BuildTypes\.cmake/g' \
-        -e 's/\/ggml\/cmake\/GitVars\.cmake/\/cmake\/GitVars\.cmake/g' \
-        -e 's/\/ggml\/cmake\/common\.cmake/\/cmake\/common\.cmake/g' \
-        -e 's/\/ggml\/cmake\/ggml-config\.cmake\.in/\/cmake\/ggml-config\.cmake\.in/g' \
-        -e 's/\/ggml\/src\/ggml-cpu\/cmake\/FindSIMD\.cmake/\/src\/ggml-cpu\/cmake\/FindSIMD\.cmake/g' \
-        -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\/gguf(.*)\.cpp/\/src\/gguf\1.cpp/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-opencl\//\/src\/ggml-opencl\//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\/ggml-vulkan\//\/src\/ggml-vulkan\//g' \
-        -e 's/\/ggml\/include\/ggml(.*)\.h/\/include\/ggml\1.h/g' \
-        -e 's/\/ggml\/include\/gguf(.*)\.h/\/include\/gguf\1.h/g' \
-        -e 's/\/tests\/test-opt\.cpp/\/tests\/test-opt.cpp/g' \
-        -e 's/\/tests\/test-quantize-fns\.cpp/\/tests\/test-quantize-fns.cpp/g' \
-        -e 's/\/tests\/test-quantize-perf\.cpp/\/tests\/test-quantize-perf.cpp/g' \
-        -e 's/\/tests\/test-backend-ops\.cpp/\/tests\/test-backend-ops.cpp/g' \
-        -e 's/\/LICENSE/\/LICENSE/g' \
-        -e 's/\/scripts\/gen-authors\.sh/\/scripts\/gen-authors.sh/g' \
+        -e 's/([[:space:]]| [ab]\/)ggml\/CMakeLists\.txt/\1CMakeLists.txt/g' \
+        -e 's/([[:space:]]| [ab]\/)ggml\/src\/CMakeLists\.txt/\1src\/CMakeLists.txt/g' \
+        -e 's/([[:space:]]| [ab]\/)ggml\/cmake\/BuildTypes\.cmake/\1cmake\/BuildTypes\.cmake/g' \
+        -e 's/([[:space:]]| [ab]\/)ggml\/cmake\/GitVars\.cmake/\1cmake\/GitVars\.cmake/g' \
+        -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\/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' \
+        -e 's/([[:space:]]| [ab]\/)tests\/test-quantize-fns\.cpp/\1tests\/test-quantize-fns.cpp/g' \
+        -e 's/([[:space:]]| [ab]\/)tests\/test-quantize-perf\.cpp/\1tests\/test-quantize-perf.cpp/g' \
+        -e 's/([[:space:]]| [ab]\/)tests\/test-backend-ops\.cpp/\1tests\/test-backend-ops.cpp/g' \
+        -e 's/([[:space:]]| [ab]\/)LICENSE/\1LICENSE/g' \
+        -e 's/([[:space:]]| [ab]\/)scripts\/gen-authors\.sh/\1scripts\/gen-authors.sh/g' \
         > llama-src.patch.tmp
     mv llama-src.patch.tmp llama-src.patch