sync-ggml-am.sh 5.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181
  1. #!/bin/bash
  2. #
  3. # Synchronize ggml changes to llama.cpp
  4. #
  5. # Usage:
  6. #
  7. # $ cd /path/to/llama.cpp
  8. # $ ./scripts/sync-ggml-am.sh -skip hash0,hash1,hash2... -C 3
  9. #
  10. set -e
  11. sd=$(dirname $0)
  12. cd $sd/../
  13. SRC_LLAMA=$(pwd)
  14. SRC_GGML=$(cd ../ggml; pwd)
  15. if [ ! -d $SRC_GGML ]; then
  16. echo "ggml not found at $SRC_GGML"
  17. exit 1
  18. fi
  19. lc=$(cat $SRC_LLAMA/scripts/sync-ggml.last)
  20. echo "Syncing ggml changes since commit $lc"
  21. to_skip=""
  22. # context for git patches in number of lines
  23. ctx="8"
  24. while [ "$1" != "" ]; do
  25. case $1 in
  26. -skip )
  27. shift
  28. to_skip=$1
  29. ;;
  30. -C )
  31. shift
  32. ctx=$1
  33. ;;
  34. esac
  35. shift
  36. done
  37. cd $SRC_GGML
  38. git log --oneline $lc..HEAD
  39. git log --oneline $lc..HEAD --reverse | grep -v "(llama/[0-9]*)" | cut -d' ' -f1 > $SRC_LLAMA/ggml-commits
  40. if [ ! -s $SRC_LLAMA/ggml-commits ]; then
  41. rm -v $SRC_LLAMA/ggml-commits
  42. echo "No new commits"
  43. exit 0
  44. fi
  45. if [ -f $SRC_LLAMA/ggml-src.patch ]; then
  46. rm -v $SRC_LLAMA/ggml-src.patch
  47. fi
  48. while read c; do
  49. if [ -n "$to_skip" ]; then
  50. if [[ $to_skip == *"$c"* ]]; then
  51. echo "Skipping $c"
  52. continue
  53. fi
  54. fi
  55. git format-patch -U${ctx} -k $c~1..$c --stdout -- \
  56. CMakeLists.txt \
  57. src/CMakeLists.txt \
  58. cmake/FindSIMD.cmake \
  59. src/ggml*.h \
  60. src/ggml*.c \
  61. src/ggml*.cpp \
  62. src/ggml-blas/* \
  63. src/ggml-cann/* \
  64. src/ggml-cpu/* \
  65. src/ggml-cuda/* \
  66. src/ggml-hip/* \
  67. src/ggml-kompute/* \
  68. src/ggml-metal/* \
  69. src/ggml-musa/* \
  70. src/ggml-rpc/* \
  71. src/ggml-sycl/* \
  72. src/ggml-vulkan/* \
  73. include/ggml*.h \
  74. tests/test-opt.cpp \
  75. tests/test-quantize-fns.cpp \
  76. tests/test-quantize-perf.cpp \
  77. tests/test-backend-ops.cpp \
  78. LICENSE \
  79. scripts/gen-authors.sh \
  80. >> $SRC_LLAMA/ggml-src.patch
  81. done < $SRC_LLAMA/ggml-commits
  82. rm -v $SRC_LLAMA/ggml-commits
  83. # delete files if empty
  84. if [ ! -s $SRC_LLAMA/ggml-src.patch ]; then
  85. rm -v $SRC_LLAMA/ggml-src.patch
  86. fi
  87. cd $SRC_LLAMA
  88. if [ -f $SRC_LLAMA/ggml-src.patch ]; then
  89. # replace PR numbers
  90. #
  91. # Subject: some text (#1234)
  92. # Subject: some text (ggml/1234)
  93. cat ggml-src.patch | sed -e 's/^Subject: \(.*\) (#\([0-9]*\))/Subject: \1 (ggml\/\2)/' > ggml-src.patch.tmp
  94. mv ggml-src.patch.tmp ggml-src.patch
  95. cat ggml-src.patch | sed -e 's/^\(.*\) (#\([0-9]*\))$/\1 (ggml\/\2)/' > ggml-src.patch.tmp
  96. mv ggml-src.patch.tmp ggml-src.patch
  97. # replace filenames:
  98. #
  99. # CMakelists.txt -> ggml/CMakeLists.txt
  100. # src/CMakeLists.txt -> ggml/src/CMakeLists.txt
  101. # cmake/FindSIMD.cmake -> ggml/cmake/FindSIMD.cmake
  102. #
  103. # src/ggml*.c -> ggml/src/ggml*.c
  104. # src/ggml*.cpp -> ggml/src/ggml*.cpp
  105. # src/ggml*.h -> ggml/src/ggml*.h
  106. # src/ggml-blas/* -> ggml/src/ggml-blas/*
  107. # src/ggml-cann/* -> ggml/src/ggml-cann/*
  108. # src/ggml-cpu/* -> ggml/src/ggml-cpu/*
  109. # src/ggml-cuda/* -> ggml/src/ggml-cuda/*
  110. # src/ggml-hip/* -> ggml/src/ggml-hip/*
  111. # src/ggml-kompute/* -> ggml/src/ggml-kompute/*
  112. # src/ggml-metal/* -> ggml/src/ggml-metal/*
  113. # src/ggml-musa/* -> ggml/src/ggml-musa/*
  114. # src/ggml-rpc/* -> ggml/src/ggml-rpc/*
  115. # src/ggml-sycl/* -> ggml/src/ggml-sycl/*
  116. # src/ggml-vulkan/* -> ggml/src/ggml-vulkan/*
  117. #
  118. # include/ggml*.h -> ggml/include/ggml*.h
  119. #
  120. # tests/test*.cpp -> tests/
  121. #
  122. # LICENSE -> LICENSE
  123. # scripts/gen-authors.sh -> scripts/gen-authors.sh
  124. cat ggml-src.patch | sed -E \
  125. -e 's/([[:space:]]|[ab]\/)CMakeLists.txt/\1ggml\/CMakeLists.txt/g' \
  126. -e 's/([[:space:]]|[ab]\/)src\/CMakeLists.txt/\1ggml\/src\/CMakeLists.txt/g' \
  127. -e 's/([[:space:]]|[ab]\/)cmake\/FindSIMD.cmake/\1ggml\/cmake\/FindSIMD.cmake/g' \
  128. -e 's/([[:space:]]|[ab]\/)src\/ggml(.*)\.c/\1ggml\/src\/ggml\2.c/g' \
  129. -e 's/([[:space:]]|[ab]\/)src\/ggml(.*)\.cpp/\1ggml\/src\/ggml\2.cpp/g' \
  130. -e 's/([[:space:]]|[ab]\/)src\/ggml(.*)\.h/\1ggml\/src\/ggml\2.h/g' \
  131. -e 's/([[:space:]]|[ab]\/)src\/ggml-blas\//\1ggml\/src\/ggml-blas\//g' \
  132. -e 's/([[:space:]]|[ab]\/)src\/ggml-cann\//\1ggml\/src\/ggml-cann\//g' \
  133. -e 's/([[:space:]]|[ab]\/)src\/ggml-cpu\//\1ggml\/src\/ggml-cpu\//g' \
  134. -e 's/([[:space:]]|[ab]\/)src\/ggml-cuda\//\1ggml\/src\/ggml-cuda\//g' \
  135. -e 's/([[:space:]]|[ab]\/)src\/ggml-hip\//\1ggml\/src\/ggml-hip\//g' \
  136. -e 's/([[:space:]]|[ab]\/)src\/ggml-kompute\//\1ggml\/src\/ggml-kompute\//g' \
  137. -e 's/([[:space:]]|[ab]\/)src\/ggml-metal\//\1ggml\/src\/ggml-metal\//g' \
  138. -e 's/([[:space:]]|[ab]\/)src\/ggml-musa\//\1ggml\/src\/ggml-musa\//g' \
  139. -e 's/([[:space:]]|[ab]\/)src\/ggml-rpc\//\1ggml\/src\/ggml-rpc\//g' \
  140. -e 's/([[:space:]]|[ab]\/)src\/ggml-sycl\//\1ggml\/src\/ggml-sycl\//g' \
  141. -e 's/([[:space:]]|[ab]\/)src\/ggml-vulkan\//\1ggml\/src\/ggml-vulkan\//g' \
  142. -e 's/([[:space:]]|[ab]\/)include\/ggml(.*)\.h/\1ggml\/include\/ggml\2.h/g' \
  143. -e 's/([[:space:]]|[ab]\/)tests\/(.*)\.cpp/\1tests\/\2.cpp/g' \
  144. -e 's/([[:space:]]|[ab]\/)LICENSE/\1LICENSE/g' \
  145. -e 's/([[:space:]]|[ab]\/)scripts\/gen-authors\.sh/\1scripts\/gen-authors.sh/g' \
  146. > ggml-src.patch.tmp
  147. mv ggml-src.patch.tmp ggml-src.patch
  148. git am -C${ctx} ggml-src.patch
  149. rm -v $SRC_LLAMA/ggml-src.patch
  150. fi
  151. # update last commit
  152. cd $SRC_GGML
  153. git log -1 --format=%H > $SRC_LLAMA/scripts/sync-ggml.last
  154. echo "Done"
  155. exit 0