vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scripts : update sync [no ci]

Browse source
This commit is contained in:
Georgi Gerganov 2024-06-21 12:29:55 +03:00
parent 8854044561
commit ef74eb13a7
No known key found for this signature in database
GPG key ID: BF970631944C16B7
2 changed files with 98 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

107
scripts/sync-ggml-am.sh
View file

@ -53,7 +53,9 @@ while read c; do
fi fi
git format-patch -k $c~1..$c --stdout -- \ git format-patch -k $c~1..$c --stdout -- \
include/ggml/ggml*.h \ CMakeLists.txt \
src/CMakeLists.txt \
cmake/FindSIMD.cmake \
src/ggml*.h \ src/ggml*.h \
src/ggml*.c \ src/ggml*.c \
src/ggml*.cpp \ src/ggml*.cpp \
@ -61,6 +63,7 @@ while read c; do
src/ggml*.metal \ src/ggml*.metal \
src/ggml*.cu \ src/ggml*.cu \
src/ggml-cuda/* \ src/ggml-cuda/* \
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 \
@ -93,30 +96,35 @@ if [ -f $SRC_LLAMA/ggml-src.patch ]; then
# replace filenames: # replace filenames:
# #
# src/ggml.c -> ggml.c # CMakelists.txt -> ggml/CMakeLists.txt
# src/ggml-alloc.c -> ggml-alloc.c # src/CMakeLists.txt -> ggml/src/CMakeLists.txt
# src/ggml-backend-impl.h -> ggml-backend-impl.h # cmake/FindSIMD.cmake -> ggml/cmake/FindSIMD.cmake
# src/ggml-backend.c -> ggml-backend.c #
# src/ggml-common.h -> ggml-common.h # src/ggml.c -> ggml/src/ggml.c
# src/ggml-cuda/* -> ggml-cuda/ # src/ggml-alloc.c -> ggml/src/ggml-alloc.c
# src/ggml-cuda.cu -> ggml-cuda.cu # src/ggml-backend-impl.h -> ggml/src/ggml-backend-impl.h
# src/ggml-cuda.h -> ggml-cuda.h # src/ggml-backend.c -> ggml/src/ggml-backend.c
# src/ggml-impl.h -> ggml-impl.h # src/ggml-common.h -> ggml/src/ggml-common.h
# src/ggml-kompute.cpp -> ggml-kompute.cpp # src/ggml-cuda/* -> ggml/src/ggml-cuda/
# src/ggml-kompute.h -> ggml-kompute.h # src/ggml-cuda.cu -> ggml/src/ggml-cuda.cu
# src/ggml-metal.h -> ggml-metal.h # src/ggml-cuda.h -> ggml/src/ggml-cuda.h
# src/ggml-metal.m -> ggml-metal.m # src/ggml-impl.h -> ggml/src/ggml-impl.h
# src/ggml-quants.c -> ggml-quants.c # src/ggml-kompute.cpp -> ggml/src/ggml-kompute.cpp
# src/ggml-quants.h -> ggml-quants.h # src/ggml-kompute.h -> ggml/src/ggml-kompute.h
# src/ggml-rpc.cpp -> ggml-rpc.cpp # src/ggml-metal.h -> ggml/src/ggml-metal.h
# src/ggml-rpc.h -> ggml-rpc.h # src/ggml-metal.m -> ggml/src/ggml-metal.m
# src/ggml-sycl.cpp -> ggml-sycl.cpp # src/ggml-quants.c -> ggml/src/ggml-quants.c
# src/ggml-sycl.h -> ggml-sycl.h # src/ggml-quants.h -> ggml/src/ggml-quants.h
# src/ggml-vulkan.cpp -> ggml-vulkan.cpp # src/ggml-rpc.cpp -> ggml/src/ggml-rpc.cpp
# src/ggml-vulkan.h -> ggml-vulkan.h # src/ggml-rpc.h -> ggml/src/ggml-rpc.h
# include/ggml/ggml.h -> ggml.h # src/ggml-sycl.cpp -> ggml/src/ggml-sycl.cpp
# include/ggml/ggml-alloc.h -> ggml-alloc.h # src/ggml-sycl.h -> ggml/src/ggml-sycl.h
# include/ggml/ggml-backend.h -> ggml-backend.h # src/ggml-vulkan.cpp -> ggml/src/ggml-vulkan.cpp
# src/ggml-vulkan.h -> ggml/src/ggml-vulkan.h
#
# 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
# #
# tests/test-opt.cpp -> tests/test-opt.cpp # tests/test-opt.cpp -> tests/test-opt.cpp
# tests/test-grad0.cpp -> tests/test-grad0.cpp # tests/test-grad0.cpp -> tests/test-grad0.cpp
@ -128,30 +136,33 @@ if [ -f $SRC_LLAMA/ggml-src.patch ]; then
# scripts/gen-authors.sh -> scripts/gen-authors.sh # scripts/gen-authors.sh -> scripts/gen-authors.sh
cat ggml-src.patch | sed \ cat ggml-src.patch | sed \
-e 's/src\/ggml\.c/ggml.c/g' \ -e 's/CMakeLists.txt/ggml\/CMakeLists.txt/g' \
-e 's/src\/ggml-alloc\.c/ggml-alloc.c/g' \ -e 's/src\/CMakeLists.txt/ggml\/src\/CMakeLists.txt/g' \
-e 's/src\/ggml-backend-impl\.h/ggml-backend-impl.h/g' \ -e 's/cmake\/FindSIMD.cmake/ggml\/cmake\/FindSIMD.cmake/g' \
-e 's/src\/ggml-backend\.c/ggml-backend.c/g' \ -e 's/src\/ggml\.c/ggml/src/ggml.c/g' \
-e 's/src\/ggml-common\.h/ggml-common.h/g' \ -e 's/src\/ggml-alloc\.c/ggml/src/ggml-alloc.c/g' \
-e 's/src\/ggml-backend-impl\.h/ggml/src/ggml-backend-impl.h/g' \
-e 's/src\/ggml-backend\.c/ggml/src/ggml-backend.c/g' \
-e 's/src\/ggml-common\.h/ggml/src/ggml-common.h/g' \
-e 's/src\/ggml-cuda\//ggml-cuda\//g' \ -e 's/src\/ggml-cuda\//ggml-cuda\//g' \
-e 's/src\/ggml-cuda\.cu/ggml-cuda.cu/g' \ -e 's/src\/ggml-cuda\.cu/ggml/src/ggml-cuda.cu/g' \
-e 's/src\/ggml-cuda\.h/ggml-cuda.h/g' \ -e 's/src\/ggml-cuda\.h/ggml/src/ggml-cuda.h/g' \
-e 's/src\/ggml-impl\.h/ggml-impl.h/g' \ -e 's/src\/ggml-impl\.h/ggml/src/ggml-impl.h/g' \
-e 's/src\/ggml-kompute\.cpp/ggml-kompute.cpp/g' \ -e 's/src\/ggml-kompute\.cpp/ggml/src/ggml-kompute.cpp/g' \
-e 's/src\/ggml-kompute\.h/ggml-kompute.h/g' \ -e 's/src\/ggml-kompute\.h/ggml/src/ggml-kompute.h/g' \
-e 's/src\/ggml-metal\.h/ggml-metal.h/g' \ -e 's/src\/ggml-metal\.h/ggml/src/ggml-metal.h/g' \
-e 's/src\/ggml-metal\.m/ggml-metal.m/g' \ -e 's/src\/ggml-metal\.m/ggml/src/ggml-metal.m/g' \
-e 's/src\/ggml-quants\.c/ggml-quants.c/g' \ -e 's/src\/ggml-quants\.c/ggml/src/ggml-quants.c/g' \
-e 's/src\/ggml-quants\.h/ggml-quants.h/g' \ -e 's/src\/ggml-quants\.h/ggml/src/ggml-quants.h/g' \
-e 's/src\/ggml-rpc\.cpp/ggml-rpc.cpp/g' \ -e 's/src\/ggml-rpc\.cpp/ggml/src/ggml-rpc.cpp/g' \
-e 's/src\/ggml-rpc\.h/ggml-rpc.h/g' \ -e 's/src\/ggml-rpc\.h/ggml/src/ggml-rpc.h/g' \
-e 's/src\/ggml-sycl\.cpp/ggml-sycl.cpp/g' \ -e 's/src\/ggml-sycl\.cpp/ggml/src/ggml-sycl.cpp/g' \
-e 's/src\/ggml-sycl\.h/ggml-sycl.h/g' \ -e 's/src\/ggml-sycl\.h/ggml/src/ggml-sycl.h/g' \
-e 's/src\/ggml-vulkan\.cpp/ggml-vulkan.cpp/g' \ -e 's/src\/ggml-vulkan\.cpp/ggml/src/ggml-vulkan.cpp/g' \
-e 's/src\/ggml-vulkan\.h/ggml-vulkan.h/g' \ -e 's/src\/ggml-vulkan\.h/ggml/src/ggml-vulkan.h/g' \
-e 's/include\/ggml\/ggml\.h/ggml.h/g' \ -e 's/include\/ggml\/ggml\.h/ggml/include/ggml.h/g' \
-e 's/include\/ggml\/ggml-alloc\.h/ggml-alloc.h/g' \ -e 's/include\/ggml\/ggml-alloc\.h/ggml/include/ggml-alloc.h/g' \
-e 's/include\/ggml\/ggml-backend\.h/ggml-backend.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-opt\.cpp/tests\/test-opt.cpp/g' \
-e 's/tests\/test-grad0\.cpp/tests\/test-grad0.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-fns\.cpp/tests\/test-quantize-fns.cpp/g' \

57
scripts/sync-ggml.sh
View file

@ -1,33 +1,40 @@
#!/bin/bash #!/bin/bash
cp -rpv ../ggml/src/ggml.c ./ggml.c cp -rpv ../ggml/CMakeLists.txt ./ggml/CMakeLists.txt
cp -rpv ../ggml/src/ggml-alloc.c ./ggml-alloc.c cp -rpv ../ggml/src/CMakeLists.txt ./ggml/src/CMakeLists.txt
cp -rpv ../ggml/src/ggml-backend-impl.h ./ggml-backend-impl.h cp -rpv ../ggml/cmake/FindSIMD.cmake.txt ./ggml/cmake/FindSIMD.cmake
cp -rpv ../ggml/src/ggml-backend.c ./ggml-backend.c
cp -rpv ../ggml/src/ggml-common.h ./ggml-common.h cp -rpv ../ggml/src/ggml.c ./ggml/src/ggml.c
cp -rpv ../ggml/src/ggml-cuda/* ./ggml-cuda/ cp -rpv ../ggml/src/ggml-alloc.c ./ggml/src/ggml-alloc.c
cp -rpv ../ggml/src/ggml-cuda.cu ./ggml-cuda.cu cp -rpv ../ggml/src/ggml-backend-impl.h ./ggml/src/ggml-backend-impl.h
cp -rpv ../ggml/src/ggml-cuda.h ./ggml-cuda.h cp -rpv ../ggml/src/ggml-backend.c ./ggml/src/ggml-backend.c
cp -rpv ../ggml/src/ggml-impl.h ./ggml-impl.h cp -rpv ../ggml/src/ggml-common.h ./ggml/src/ggml-common.h
cp -rpv ../ggml/src/ggml-kompute.cpp ./ggml-kompute.cpp cp -rpv ../ggml/src/ggml-cuda/* ./ggml/src/ggml-cuda/
cp -rpv ../ggml/src/ggml-kompute.h ./ggml-kompute.h cp -rpv ../ggml/src/ggml-cuda.cu ./ggml/src/ggml-cuda.cu
cp -rpv ../ggml/src/ggml-metal.h ./ggml-metal.h cp -rpv ../ggml/src/ggml-cuda.h ./ggml/src/ggml-cuda.h
cp -rpv ../ggml/src/ggml-metal.m ./ggml-metal.m cp -rpv ../ggml/src/ggml-impl.h ./ggml/src/ggml-impl.h
cp -rpv ../ggml/src/ggml-metal.metal ./ggml-metal.metal cp -rpv ../ggml/src/ggml-kompute.cpp ./ggml/src/ggml-kompute.cpp
cp -rpv ../ggml/src/ggml-quants.c ./ggml-quants.c cp -rpv ../ggml/src/ggml-kompute.h ./ggml/src/ggml-kompute.h
cp -rpv ../ggml/src/ggml-quants.h ./ggml-quants.h cp -rpv ../ggml/src/ggml-metal.h ./ggml/src/ggml-metal.h
cp -rpv ../ggml/src/ggml-rpc.cpp ./ggml-rpc.cpp cp -rpv ../ggml/src/ggml-metal.m ./ggml/src/ggml-metal.m
cp -rpv ../ggml/src/ggml-rpc.h ./ggml-rpc.h cp -rpv ../ggml/src/ggml-metal.metal ./ggml/src/ggml-metal.metal
cp -rpv ../ggml/src/ggml-sycl.cpp ./ggml-sycl.cpp cp -rpv ../ggml/src/ggml-quants.c ./ggml/src/ggml-quants.c
cp -rpv ../ggml/src/ggml-sycl.h ./ggml-sycl.h cp -rpv ../ggml/src/ggml-quants.h ./ggml/src/ggml-quants.h
cp -rpv ../ggml/src/ggml-vulkan.cpp ./ggml-vulkan.cpp cp -rpv ../ggml/src/ggml-rpc.cpp ./ggml/src/ggml-rpc.cpp
cp -rpv ../ggml/src/ggml-vulkan.h ./ggml-vulkan.h cp -rpv ../ggml/src/ggml-rpc.h ./ggml/src/ggml-rpc.h
cp -rpv ../ggml/include/ggml/ggml.h ./ggml.h cp -rpv ../ggml/src/ggml-sycl.cpp ./ggml/src/ggml-sycl.cpp
cp -rpv ../ggml/include/ggml/ggml-alloc.h ./ggml-alloc.h cp -rpv ../ggml/src/ggml-sycl.h ./ggml/src/ggml-sycl.h
cp -rpv ../ggml/include/ggml/ggml-backend.h ./ggml-backend.h cp -rpv ../ggml/src/ggml-vulkan.cpp ./ggml/src/ggml-vulkan.cpp
cp -rpv ../ggml/src/ggml-vulkan.h ./ggml/src/ggml-vulkan.h
cp -rpv ../ggml/include/ggml.h ./ggml/include/ggml.h
cp -rpv ../ggml/include/ggml-alloc.h ./ggml/include/ggml-alloc.h
cp -rpv ../ggml/include/ggml-backend.h ./ggml/include/ggml-backend.h
cp -rpv ../ggml/tests/test-opt.cpp ./tests/test-opt.cpp cp -rpv ../ggml/tests/test-opt.cpp ./tests/test-opt.cpp
cp -rpv ../ggml/tests/test-grad0.cpp ./tests/test-grad0.cpp cp -rpv ../ggml/tests/test-grad0.cpp ./tests/test-grad0.cpp
cp -rpv ../ggml/tests/test-quantize-fns.cpp ./tests/test-quantize-fns.cpp
cp -rpv ../ggml/tests/test-quantize-perf.cpp ./tests/test-quantize-perf.cpp
cp -rpv ../ggml/tests/test-backend-ops.cpp ./tests/test-backend-ops.cpp cp -rpv ../ggml/tests/test-backend-ops.cpp ./tests/test-backend-ops.cpp
cp -rpv ../LICENSE ./LICENSE cp -rpv ../LICENSE ./LICENSE