From: Georgi Gerganov Date: Fri, 15 Nov 2024 19:21:38 +0000 (+0200) Subject: scripts : update sync llama.cpp X-Git-Tag: upstream/0.0.1642~203 X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=6039bd4e6ec27f28a562fa1f6be6dd5fe7bd574a;p=pkg%2Fggml%2Fsources%2Fggml scripts : update sync llama.cpp --- diff --git a/scripts/sync-llama-am.sh b/scripts/sync-llama-am.sh index f651c6eb..16602f28 100755 --- a/scripts/sync-llama-am.sh +++ b/scripts/sync-llama-am.sh @@ -66,24 +66,26 @@ while read c; do fi fi + #ggml/src/CMakeLists.txt \ git format-patch -U${ctx} -k $c~1..$c --stdout -- \ ggml/CMakeLists.txt \ - ggml/src/CMakeLists.txt \ - ggml/cmake/FindSIMD.cmake \ 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-amx/* \ + 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 \ tests/test-opt.cpp \ - tests/test-grad0.cpp \ tests/test-quantize-fns.cpp \ tests/test-quantize-perf.cpp \ tests/test-backend-ops.cpp \ @@ -116,23 +118,27 @@ if [ -f $SRC_GGML/llama-src.patch ]; then # # ggml/CMakelists.txt -> CMakeLists.txt # ggml/src/CMakelists.txt -> src/CMakeLists.txt - # ggml/cmake/FindSIMD.cmake -> cmake/FindSIMD.cmake + # ggml/cmake/FindSIMD.cmake -> src/ggml-cpu/cmake/FindSIMD.cmake (FIXME) # # 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-amx/* -> src/ggml-amx/* + # 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 # # tests/test-opt.cpp -> tests/test-opt.cpp - # tests/test-grad0.cpp -> tests/test-grad0.cpp # tests/test-quantize-fns.cpp -> tests/test-quantize-fns.cpp # tests/test-quantize-perf.cpp -> tests/test-quantize-perf.cpp # tests/test-backend-ops.cpp -> tests/test-backend-ops.cpp @@ -143,20 +149,24 @@ if [ -f $SRC_GGML/llama-src.patch ]; then 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\/FindSIMD\.cmake/\/cmake\/FindSIMD.cmake/g' \ + -e 's/\/ggml\/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\/ggml(.*)\.cu/\/src\/ggml\1.cu/g' \ - -e 's/\/ggml\/src\/ggml(.*)\.m/\/src\/ggml\1.m/g' \ -e 's/\/ggml\/src\/ggml-amx\//\/src\/ggml-amx\//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/\/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' \ -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' \ diff --git a/scripts/sync-llama.sh b/scripts/sync-llama.sh index 0ed455da..c9cf6a7b 100755 --- a/scripts/sync-llama.sh +++ b/scripts/sync-llama.sh @@ -7,18 +7,22 @@ cp -rpv ../llama.cpp/ggml/cmake/FindSIMD.cmake cmake/FindSIMD.cmake cp -rpv ../llama.cpp/ggml/src/ggml*.c src/ cp -rpv ../llama.cpp/ggml/src/ggml*.cpp src/ cp -rpv ../llama.cpp/ggml/src/ggml*.h src/ -cp -rpv ../llama.cpp/ggml/src/ggml*.cu src/ -cp -rpv ../llama.cpp/ggml/src/ggml*.m src/ cp -rpv ../llama.cpp/ggml/src/ggml-amx/* src/ggml-amx/ +cp -rpv ../llama.cpp/ggml/src/ggml-blas/* src/ggml-blas/ cp -rpv ../llama.cpp/ggml/src/ggml-cann/* src/ggml-cann/ +cp -rpv ../llama.cpp/ggml/src/ggml-cpu/* src/ggml-cpu/ cp -rpv ../llama.cpp/ggml/src/ggml-cuda/* src/ggml-cuda/ +cp -rpv ../llama.cpp/ggml/src/ggml-hip/* src/ggml-hip/ +cp -rpv ../llama.cpp/ggml/src/ggml-kompute/* src/ggml-kompute/ +cp -rpv ../llama.cpp/ggml/src/ggml-metal/* src/ggml-metal/ +cp -rpv ../llama.cpp/ggml/src/ggml-musa/* src/ggml-musa/ +cp -rpv ../llama.cpp/ggml/src/ggml-rpc/* src/ggml-rpc/ cp -rpv ../llama.cpp/ggml/src/ggml-sycl/* src/ggml-sycl/ -cp -rpv ../llama.cpp/ggml/src/vulkan-shaders/* src/vulkan-shaders/ +cp -rpv ../llama.cpp/ggml/src/ggml-vulkan/* src/ggml-vulkan/ cp -rpv ../llama.cpp/ggml/include/ggml*.h include/ cp -rpv ../llama.cpp/tests/test-opt.cpp tests/test-opt.cpp -cp -rpv ../llama.cpp/tests/test-grad0.cpp tests/test-grad0.cpp cp -rpv ../llama.cpp/tests/test-quantize-fns.cpp tests/test-quantize-fns.cpp cp -rpv ../llama.cpp/tests/test-quantize-perf.cpp tests/test-quantize-perf.cpp cp -rpv ../llama.cpp/tests/test-backend-ops.cpp tests/test-backend-ops.cpp