| #!/usr/bin/env bash
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 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=""
|
|
|
|
|
| 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* \
|
| 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
|
|
|
|
|
| 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
|
|
|
|
|
|
|
|
|
| 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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 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(.*)/\1ggml\/src\/ggml\2/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
|
|
|
|
|
| cd $SRC_GGML
|
| git log -1 --format=%H > $SRC_LLAMA/scripts/sync-ggml.last
|
|
|
| echo "Done"
|
|
|
| exit 0
|
|
|