| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199 |
- #!/usr/bin/env bash
- #
- # Synchronize ggml changes to llama.cpp
- #
- # Usage:
- #
- # $ cd /path/to/llama.cpp
- # $ ./scripts/sync-ggml-am.sh -skip hash0,hash1,hash2... -C 3
- #
- set -e
- sd=$(dirname $0)
- cd $sd/../
- SRC_LLAMA=$(pwd)
- SRC_GGML=$(cd ../ggml; pwd)
- if [ ! -d $SRC_GGML ]; then
- echo "ggml not found at $SRC_GGML"
- exit 1
- fi
- lc=$(cat $SRC_LLAMA/scripts/sync-ggml.last)
- echo "Syncing ggml changes since commit $lc"
- to_skip=""
- # context for git patches in number of lines
- ctx="8"
- while [ "$1" != "" ]; do
- case $1 in
- -skip )
- shift
- to_skip=$1
- ;;
- -C )
- shift
- ctx=$1
- ;;
- esac
- shift
- done
- cd $SRC_GGML
- git log --oneline $lc..HEAD
- git log --oneline $lc..HEAD --reverse | grep -v "(llama/[0-9]*)" | cut -d' ' -f1 > $SRC_LLAMA/ggml-commits
- if [ ! -s $SRC_LLAMA/ggml-commits ]; then
- rm -v $SRC_LLAMA/ggml-commits
- echo "No new commits"
- exit 0
- fi
- if [ -f $SRC_LLAMA/ggml-src.patch ]; then
- rm -v $SRC_LLAMA/ggml-src.patch
- fi
- while read c; do
- if [ -n "$to_skip" ]; then
- if [[ $to_skip == *"$c"* ]]; then
- echo "Skipping $c"
- continue
- fi
- fi
- git format-patch -U${ctx} -k $c~1..$c --stdout -- \
- CMakeLists.txt \
- src/CMakeLists.txt \
- cmake/BuildTypes.cmake \
- cmake/GitVars.cmake \
- cmake/common.cmake \
- cmake/ggml-config.cmake.in \
- src/ggml-cpu/cmake/FindSIMD.cmake \
- src/ggml*.h \
- src/ggml*.c \
- src/ggml*.cpp \
- src/gguf*.cpp \
- src/ggml-blas/* \
- src/ggml-cann/* \
- src/ggml-cpu/* \
- src/ggml-cuda/* \
- src/ggml-hip/* \
- src/ggml-metal/* \
- src/ggml-musa/* \
- src/ggml-opencl/* \
- src/ggml-rpc/* \
- src/ggml-sycl/* \
- src/ggml-vulkan/* \
- include/ggml*.h \
- include/gguf*.h \
- tests/test-opt.cpp \
- tests/test-quantize-fns.cpp \
- tests/test-quantize-perf.cpp \
- tests/test-backend-ops.cpp \
- LICENSE \
- scripts/gen-authors.sh \
- >> $SRC_LLAMA/ggml-src.patch
- done < $SRC_LLAMA/ggml-commits
- rm -v $SRC_LLAMA/ggml-commits
- # delete files if empty
- if [ ! -s $SRC_LLAMA/ggml-src.patch ]; then
- rm -v $SRC_LLAMA/ggml-src.patch
- fi
- cd $SRC_LLAMA
- if [ -f $SRC_LLAMA/ggml-src.patch ]; then
- # replace PR numbers
- #
- # Subject: some text (#1234)
- # Subject: some text (ggml/1234)
- cat ggml-src.patch | sed -e 's/^Subject: \(.*\) (#\([0-9]*\))/Subject: \1 (ggml\/\2)/' > ggml-src.patch.tmp
- mv ggml-src.patch.tmp ggml-src.patch
- cat ggml-src.patch | sed -e 's/^\(.*\) (#\([0-9]*\))$/\1 (ggml\/\2)/' > ggml-src.patch.tmp
- mv ggml-src.patch.tmp ggml-src.patch
- # replace filenames:
- #
- # CMakelists.txt -> ggml/CMakeLists.txt
- # src/CMakeLists.txt -> ggml/src/CMakeLists.txt
- # cmake/BuildTypes.cmake -> ggml/cmake/BuildTypes.cmake
- # cmake/GitVars.cmake -> ggml/cmake/GitVars.cmake
- # cmake/common.cmake -> ggml/cmake/common.cmake
- # cmake/ggml-config.cmake.in -> ggml/cmake/ggml-config.cmake.in
- # src/ggml-cpu/cmake/FindSIMD.cmake -> ggml/src/ggml-cpu/cmake/FindSIMD.cmake
- #
- # src/ggml*.c -> ggml/src/ggml*.c
- # src/ggml*.cpp -> ggml/src/ggml*.cpp
- # src/ggml*.h -> ggml/src/ggml*.h
- # src/gguf*.cpp -> ggml/src/gguf*.cpp
- # src/ggml-blas/* -> ggml/src/ggml-blas/*
- # src/ggml-cann/* -> ggml/src/ggml-cann/*
- # src/ggml-cpu/* -> ggml/src/ggml-cpu/*
- # src/ggml-cuda/* -> ggml/src/ggml-cuda/*
- # src/ggml-hip/* -> ggml/src/ggml-hip/*
- # src/ggml-metal/* -> ggml/src/ggml-metal/*
- # src/ggml-musa/* -> ggml/src/ggml-musa/*
- # src/ggml-opencl/* -> ggml/src/ggml-opencl/*
- # src/ggml-rpc/* -> ggml/src/ggml-rpc/*
- # src/ggml-sycl/* -> ggml/src/ggml-sycl/*
- # src/ggml-vulkan/* -> ggml/src/ggml-vulkan/*
- #
- # include/ggml*.h -> ggml/include/ggml*.h
- # include/gguf*.h -> ggml/include/gguf*.h
- #
- # tests/test*.cpp -> tests/
- #
- # LICENSE -> LICENSE
- # scripts/gen-authors.sh -> scripts/gen-authors.sh
- cat ggml-src.patch | sed -E \
- -e 's/([[:space:]]| [ab]\/)CMakeLists.txt/\1ggml\/CMakeLists.txt/g' \
- -e 's/([[:space:]]| [ab]\/)src\/CMakeLists.txt/\1ggml\/src\/CMakeLists.txt/g' \
- -e 's/([[:space:]]| [ab]\/)cmake\/BuildTypes.cmake/\1ggml\/cmake\/BuildTypes.cmake/g' \
- -e 's/([[:space:]]| [ab]\/)cmake\/GitVars.cmake/\1ggml\/cmake\/GitVars.cmake/g' \
- -e 's/([[:space:]]| [ab]\/)cmake\/common.cmake/\1ggml\/cmake\/common.cmake/g' \
- -e 's/([[:space:]]| [ab]\/)cmake\/ggml-config.cmake.in/\1ggml\/cmake\/ggml-config.cmake.in/g' \
- -e 's/([[:space:]]| [ab]\/)src\/ggml-cpu\/cmake\/FindSIMD.cmake/\1ggml\/src\/ggml-cpu\/cmake\/FindSIMD.cmake/g' \
- -e 's/([[:space:]]| [ab]\/)src\/ggml(.*)\.c/\1ggml\/src\/ggml\2.c/g' \
- -e 's/([[:space:]]| [ab]\/)src\/ggml(.*)\.cpp/\1ggml\/src\/ggml\2.cpp/g' \
- -e 's/([[:space:]]| [ab]\/)src\/ggml(.*)\.h/\1ggml\/src\/ggml\2.h/g' \
- -e 's/([[:space:]]| [ab]\/)src\/gguf(.*)\.cpp/\1ggml\/src\/gguf\2.cpp/g' \
- -e 's/([[:space:]]| [ab]\/)src\/ggml-blas\//\1ggml\/src\/ggml-blas\//g' \
- -e 's/([[:space:]]| [ab]\/)src\/ggml-cann\//\1ggml\/src\/ggml-cann\//g' \
- -e 's/([[:space:]]| [ab]\/)src\/ggml-cpu\//\1ggml\/src\/ggml-cpu\//g' \
- -e 's/([[:space:]]| [ab]\/)src\/ggml-cuda\//\1ggml\/src\/ggml-cuda\//g' \
- -e 's/([[:space:]]| [ab]\/)src\/ggml-hip\//\1ggml\/src\/ggml-hip\//g' \
- -e 's/([[:space:]]| [ab]\/)src\/ggml-metal\//\1ggml\/src\/ggml-metal\//g' \
- -e 's/([[:space:]]| [ab]\/)src\/ggml-opencl\//\1ggml\/src\/ggml-opencl\//g' \
- -e 's/([[:space:]]| [ab]\/)src\/ggml-rpc\//\1ggml\/src\/ggml-rpc\//g' \
- -e 's/([[:space:]]| [ab]\/)src\/ggml-sycl\//\1ggml\/src\/ggml-sycl\//g' \
- -e 's/([[:space:]]| [ab]\/)src\/ggml-vulkan\//\1ggml\/src\/ggml-vulkan\//g' \
- -e 's/([[:space:]]| [ab]\/)include\/ggml(.*)\.h/\1ggml\/include\/ggml\2.h/g' \
- -e 's/([[:space:]]| [ab]\/)include\/gguf(.*)\.h/\1ggml\/include\/gguf\2.h/g' \
- -e 's/([[:space:]]| [ab]\/)tests\/(.*)\.cpp/\1tests\/\2.cpp/g' \
- -e 's/([[:space:]]| [ab]\/)LICENSE/\1LICENSE/g' \
- -e 's/([[:space:]]| [ab]\/)scripts\/gen-authors\.sh/\1scripts\/gen-authors.sh/g' \
- > ggml-src.patch.tmp
- mv ggml-src.patch.tmp ggml-src.patch
- git am -C${ctx} ggml-src.patch
- rm -v $SRC_LLAMA/ggml-src.patch
- fi
- # update last commit
- cd $SRC_GGML
- git log -1 --format=%H > $SRC_LLAMA/scripts/sync-ggml.last
- echo "Done"
- exit 0
|