From fd1d48a2ebfcca489d7eebd9247a5df5b414a55c Mon Sep 17 00:00:00 2001 From: Georgi Gerganov Date: Wed, 26 Jun 2024 11:22:32 +0300 Subject: [PATCH] scripts : fix sync paths [no ci] --- scripts/sync-ggml-am.sh | 24 ++++++++++++------------ scripts/sync-ggml.sh | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/scripts/sync-ggml-am.sh b/scripts/sync-ggml-am.sh index 35104e8e0..5de4f7930 100755 --- a/scripts/sync-ggml-am.sh +++ b/scripts/sync-ggml-am.sh @@ -116,15 +116,15 @@ if [ -f $SRC_LLAMA/ggml-src.patch ]; then # src/ggml-sycl.cpp -> ggml/src/ggml-sycl.cpp # src/ggml-vulkan.cpp -> ggml/src/ggml-vulkan.cpp # - # include/ggml/ggml.h -> ggml/include/ggml.h - # include/ggml/ggml-alloc.h -> ggml/include/ggml-alloc.h - # include/ggml/ggml-backend.h -> ggml/include/ggml-backend.h - # include/ggml-cuda.h -> ggml/include/ggml-cuda.h - # include/ggml-kompute.h -> ggml/include/ggml-kompute.h - # include/ggml-metal.h -> ggml/include/ggml-metal.h - # include/ggml-rpc.h -> ggml/include/ggml-rpc.h - # include/ggml-sycl.h -> ggml/include/ggml-sycl.h - # include/ggml-vulkan.h -> ggml/include/ggml-vulkan.h + # include/ggml.h -> ggml/include/ggml.h + # include/ggml-alloc.h -> ggml/include/ggml-alloc.h + # include/ggml-backend.h -> ggml/include/ggml-backend.h + # include/ggml-cuda.h -> ggml/include/ggml-cuda.h + # include/ggml-kompute.h -> ggml/include/ggml-kompute.h + # include/ggml-metal.h -> ggml/include/ggml-metal.h + # include/ggml-rpc.h -> ggml/include/ggml-rpc.h + # include/ggml-sycl.h -> ggml/include/ggml-sycl.h + # include/ggml-vulkan.h -> ggml/include/ggml-vulkan.h # # tests/test-opt.cpp -> tests/test-opt.cpp # tests/test-grad0.cpp -> tests/test-grad0.cpp @@ -154,15 +154,15 @@ if [ -f $SRC_LLAMA/ggml-src.patch ]; then -e 's/src\/ggml-rpc\.cpp/ggml/src/ggml-rpc.cpp/g' \ -e 's/src\/ggml-sycl\.cpp/ggml/src/ggml-sycl.cpp/g' \ -e 's/src\/ggml-vulkan\.cpp/ggml/src/ggml-vulkan.cpp/g' \ + -e 's/include\/ggml\.h/ggml/include/ggml.h/g' \ + -e 's/include\/ggml-alloc\.h/ggml/include/ggml-alloc.h/g' \ + -e 's/include\/ggml-backend\.h/ggml/include/ggml-backend.h/g' \ -e 's/include\/ggml-cuda\.h/ggml/include/ggml-cuda.h/g' \ -e 's/include\/ggml-kompute\.h/ggml/include/ggml-kompute.h/g' \ -e 's/include\/ggml-metal\.h/ggml/include/ggml-metal.h/g' \ -e 's/include\/ggml-rpc\.h/ggml/include/ggml-rpc.h/g' \ -e 's/include\/ggml-sycl\.h/ggml/include/ggml-sycl.h/g' \ -e 's/include\/ggml-vulkan\.h/ggml/include/ggml-vulkan.h/g' \ - -e 's/include\/ggml\/ggml\.h/ggml/include/ggml.h/g' \ - -e 's/include\/ggml\/ggml-alloc\.h/ggml/include/ggml-alloc.h/g' \ - -e 's/include\/ggml\/ggml-backend\.h/ggml/include/ggml-backend.h/g' \ -e 's/tests\/test-opt\.cpp/tests\/test-opt.cpp/g' \ -e 's/tests\/test-grad0\.cpp/tests\/test-grad0.cpp/g' \ -e 's/tests\/test-quantize-fns\.cpp/tests\/test-quantize-fns.cpp/g' \ diff --git a/scripts/sync-ggml.sh b/scripts/sync-ggml.sh index 927554de1..5bea8c9b2 100755 --- a/scripts/sync-ggml.sh +++ b/scripts/sync-ggml.sh @@ -1,8 +1,8 @@ #!/bin/bash -cp -rpv ../ggml/CMakeLists.txt ./ggml/CMakeLists.txt -cp -rpv ../ggml/src/CMakeLists.txt ./ggml/src/CMakeLists.txt -cp -rpv ../ggml/cmake/FindSIMD.cmake.txt ./ggml/cmake/FindSIMD.cmake +cp -rpv ../ggml/CMakeLists.txt ./ggml/CMakeLists.txt +cp -rpv ../ggml/src/CMakeLists.txt ./ggml/src/CMakeLists.txt +cp -rpv ../ggml/cmake/FindSIMD.cmake ./ggml/cmake/FindSIMD.cmake cp -rpv ../ggml/src/ggml.c ./ggml/src/ggml.c cp -rpv ../ggml/src/ggml-alloc.c ./ggml/src/ggml-alloc.c