sync-ggml-am.sh 8.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205
  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...
  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. if [ "$1" == "-skip" ]; then
  23. to_skip=$2
  24. fi
  25. cd $SRC_GGML
  26. git log --oneline $lc..HEAD
  27. git log --oneline $lc..HEAD --reverse | grep -v "(llama/[0-9]*)" | cut -d' ' -f1 > $SRC_LLAMA/ggml-commits
  28. if [ ! -s $SRC_LLAMA/ggml-commits ]; then
  29. rm -v $SRC_LLAMA/ggml-commits
  30. echo "No new commits"
  31. exit 0
  32. fi
  33. if [ -f $SRC_LLAMA/ggml-src.patch ]; then
  34. rm -v $SRC_LLAMA/ggml-src.patch
  35. fi
  36. while read c; do
  37. if [ -n "$to_skip" ]; then
  38. if [[ $to_skip == *"$c"* ]]; then
  39. echo "Skipping $c"
  40. continue
  41. fi
  42. fi
  43. git format-patch -k $c~1..$c --stdout -- \
  44. CMakeLists.txt \
  45. src/CMakeLists.txt \
  46. cmake/FindSIMD.cmake \
  47. src/ggml*.h \
  48. src/ggml*.c \
  49. src/ggml*.cpp \
  50. src/ggml*.m \
  51. src/ggml*.metal \
  52. src/ggml*.cu \
  53. src/ggml-cann/* \
  54. src/ggml-cuda/* \
  55. src/ggml-sycl/* \
  56. src/vulkan-shaders/* \
  57. include/ggml*.h \
  58. tests/test-opt.cpp \
  59. tests/test-grad0.cpp \
  60. tests/test-quantize-fns.cpp \
  61. tests/test-quantize-perf.cpp \
  62. tests/test-backend-ops.cpp \
  63. LICENSE \
  64. scripts/gen-authors.sh \
  65. >> $SRC_LLAMA/ggml-src.patch
  66. done < $SRC_LLAMA/ggml-commits
  67. rm -v $SRC_LLAMA/ggml-commits
  68. # delete files if empty
  69. if [ ! -s $SRC_LLAMA/ggml-src.patch ]; then
  70. rm -v $SRC_LLAMA/ggml-src.patch
  71. fi
  72. cd $SRC_LLAMA
  73. if [ -f $SRC_LLAMA/ggml-src.patch ]; then
  74. # replace PR numbers
  75. #
  76. # Subject: some text (#1234)
  77. # Subject: some text (ggml/1234)
  78. cat ggml-src.patch | sed -e 's/^Subject: \(.*\) (#\([0-9]*\))/Subject: \1 (ggml\/\2)/' > ggml-src.patch.tmp
  79. mv ggml-src.patch.tmp ggml-src.patch
  80. cat ggml-src.patch | sed -e 's/^\(.*\) (#\([0-9]*\))$/\1 (ggml\/\2)/' > ggml-src.patch.tmp
  81. mv ggml-src.patch.tmp ggml-src.patch
  82. # replace filenames:
  83. #
  84. # CMakelists.txt -> ggml/CMakeLists.txt
  85. # src/CMakeLists.txt -> ggml/src/CMakeLists.txt
  86. # cmake/FindSIMD.cmake -> ggml/cmake/FindSIMD.cmake
  87. #
  88. # src/ggml.c -> ggml/src/ggml.c
  89. # src/ggml-aarch64.c -> ggml/src/ggml-aarch64.c
  90. # src/ggml-aarch64.h -> ggml/src/ggml-aarch64.h
  91. # src/ggml-alloc.c -> ggml/src/ggml-alloc.c
  92. # src/ggml-backend-impl.h -> ggml/src/ggml-backend-impl.h
  93. # src/ggml-backend.c -> ggml/src/ggml-backend.c
  94. # src/ggml-cann/* -> ggml/src/ggml-cann/
  95. # src/ggml-cann.cpp -> ggml/src/ggml-cann.cpp
  96. # src/ggml-common.h -> ggml/src/ggml-common.h
  97. # src/ggml-cuda/* -> ggml/src/ggml-cuda/
  98. # src/ggml-cuda.cu -> ggml/src/ggml-cuda.cu
  99. # src/ggml-impl.h -> ggml/src/ggml-impl.h
  100. # src/ggml-kompute.cpp -> ggml/src/ggml-kompute.cpp
  101. # src/ggml-metal.m -> ggml/src/ggml-metal.m
  102. # src/ggml-quants.c -> ggml/src/ggml-quants.c
  103. # src/ggml-quants.h -> ggml/src/ggml-quants.h
  104. # src/ggml-rpc.cpp -> ggml/src/ggml-rpc.cpp
  105. # src/ggml-sycl/* -> ggml/src/ggml-sycl/
  106. # src/ggml-sycl.cpp -> ggml/src/ggml-sycl.cpp
  107. # src/ggml-vulkan.cpp -> ggml/src/ggml-vulkan.cpp
  108. # src/vulkan-shaders/* -> ggml/src/vulkan-shaders/
  109. #
  110. # include/ggml.h -> ggml/include/ggml.h
  111. # include/ggml-alloc.h -> ggml/include/ggml-alloc.h
  112. # include/ggml-backend.h -> ggml/include/ggml-backend.h
  113. # include/ggml-blas.h -> ggml/include/ggml-blas.h
  114. # include/ggml-cann.h -> ggml/include/ggml-cann.h
  115. # include/ggml-cuda.h -> ggml/include/ggml-cuda.h
  116. # include/ggml-kompute.h -> ggml/include/ggml-kompute.h
  117. # include/ggml-metal.h -> ggml/include/ggml-metal.h
  118. # include/ggml-rpc.h -> ggml/include/ggml-rpc.h
  119. # include/ggml-sycl.h -> ggml/include/ggml-sycl.h
  120. # include/ggml-vulkan.h -> ggml/include/ggml-vulkan.h
  121. #
  122. # tests/test-opt.cpp -> tests/test-opt.cpp
  123. # tests/test-grad0.cpp -> tests/test-grad0.cpp
  124. # tests/test-quantize-fns.cpp -> tests/test-quantize-fns.cpp
  125. # tests/test-quantize-perf.cpp -> tests/test-quantize-perf.cpp
  126. # tests/test-backend-ops.cpp -> tests/test-backend-ops.cpp
  127. #
  128. # LICENSE -> LICENSE
  129. # scripts/gen-authors.sh -> scripts/gen-authors.sh
  130. cat ggml-src.patch | sed -E \
  131. -e 's/([[:space:]]|[ab]\/)CMakeLists.txt/\1ggml\/CMakeLists.txt/g' \
  132. -e 's/([[:space:]]|[ab]\/)src\/CMakeLists.txt/\1ggml\/src\/CMakeLists.txt/g' \
  133. -e 's/([[:space:]]|[ab]\/)cmake\/FindSIMD.cmake/\1ggml\/cmake\/FindSIMD.cmake/g' \
  134. -e 's/([[:space:]]|[ab]\/)src\/ggml\.c/\1ggml\/src\/ggml.c/g' \
  135. -e 's/([[:space:]]|[ab]\/)src\/ggml-aarch64\.c/\1ggml\/src\/ggml-aarch64.c/g' \
  136. -e 's/([[:space:]]|[ab]\/)src\/ggml-aarch64\.h/\1ggml\/src\/ggml-aarch64.h/g' \
  137. -e 's/([[:space:]]|[ab]\/)src\/ggml-alloc\.c/\1ggml\/src\/ggml-alloc.c/g' \
  138. -e 's/([[:space:]]|[ab]\/)src\/ggml-backend-impl\.h/\1ggml\/src\/ggml-backend-impl.h/g' \
  139. -e 's/([[:space:]]|[ab]\/)src\/ggml-backend\.c/\1ggml\/src\/ggml-backend.c/g' \
  140. -e 's/([[:space:]]|[ab]\/)src\/ggml-cann\//\1ggml\/src\/ggml-cann\//g' \
  141. -e 's/([[:space:]]|[ab]\/)src\/ggml-cann\.cpp/\1ggml\/src\/ggml-cann.cpp/g' \
  142. -e 's/([[:space:]]|[ab]\/)src\/ggml-common\.h/\1ggml\/src\/ggml-common.h/g' \
  143. -e 's/([[:space:]]|[ab]\/)src\/ggml-cuda\//\1ggml\/src\/ggml-cuda\//g' \
  144. -e 's/([[:space:]]|[ab]\/)src\/ggml-cuda\.cu/\1ggml\/src\/ggml-cuda.cu/g' \
  145. -e 's/([[:space:]]|[ab]\/)src\/ggml-impl\.h/\1ggml\/src\/ggml-impl.h/g' \
  146. -e 's/([[:space:]]|[ab]\/)src\/ggml-kompute\.cpp/\1ggml\/src\/ggml-kompute.cpp/g' \
  147. -e 's/([[:space:]]|[ab]\/)src\/ggml-metal\.m/\1ggml\/src\/ggml-metal.m/g' \
  148. -e 's/([[:space:]]|[ab]\/)src\/ggml-quants\.c/\1ggml\/src\/ggml-quants.c/g' \
  149. -e 's/([[:space:]]|[ab]\/)src\/ggml-quants\.h/\1ggml\/src\/ggml-quants.h/g' \
  150. -e 's/([[:space:]]|[ab]\/)src\/ggml-rpc\.cpp/\1ggml\/src\/ggml-rpc.cpp/g' \
  151. -e 's/([[:space:]]|[ab]\/)src\/ggml-sycl\//\1ggml\/src\/ggml-sycl\//g' \
  152. -e 's/([[:space:]]|[ab]\/)src\/ggml-sycl\.cpp/\1ggml\/src\/ggml-sycl.cpp/g' \
  153. -e 's/([[:space:]]|[ab]\/)src\/ggml-vulkan\.cpp/\1ggml\/src\/ggml-vulkan.cpp/g' \
  154. -e 's/([[:space:]]|[ab]\/)src\/vulkan-shaders\//\1ggml\/src\/vulkan-shaders\//g' \
  155. -e 's/([[:space:]]|[ab]\/)include\/ggml\.h/\1ggml\/include\/ggml.h/g' \
  156. -e 's/([[:space:]]|[ab]\/)include\/ggml-alloc\.h/\1ggml\/include\/ggml-alloc.h/g' \
  157. -e 's/([[:space:]]|[ab]\/)include\/ggml-backend\.h/\1ggml\/include\/ggml-backend.h/g' \
  158. -e 's/([[:space:]]|[ab]\/)include\/ggml-blas\.h/\1ggml\/include\/ggml-blas.h/g' \
  159. -e 's/([[:space:]]|[ab]\/)include\/ggml-cann\.h/\1ggml\/include\/ggml-cann.h/g' \
  160. -e 's/([[:space:]]|[ab]\/)include\/ggml-cuda\.h/\1ggml\/include\/ggml-cuda.h/g' \
  161. -e 's/([[:space:]]|[ab]\/)include\/ggml-kompute\.h/\1ggml\/include\/ggml-kompute.h/g' \
  162. -e 's/([[:space:]]|[ab]\/)include\/ggml-metal\.h/\1ggml\/include\/ggml-metal.h/g' \
  163. -e 's/([[:space:]]|[ab]\/)include\/ggml-rpc\.h/\1ggml\/include\/ggml-rpc.h/g' \
  164. -e 's/([[:space:]]|[ab]\/)include\/ggml-sycl\.h/\1ggml\/include\/ggml-sycl.h/g' \
  165. -e 's/([[:space:]]|[ab]\/)include\/ggml-vulkan\.h/\1ggml\/include\/ggml-vulkan.h/g' \
  166. -e 's/([[:space:]]|[ab]\/)examples\/common\.h/\1examples\/common.h/g' \
  167. -e 's/([[:space:]]|[ab]\/)examples\/common\.cpp/\1examples\/common.cpp/g' \
  168. -e 's/([[:space:]]|[ab]\/)examples\/common-ggml\.h/\1examples\/common-ggml.h/g' \
  169. -e 's/([[:space:]]|[ab]\/)examples\/common-ggml\.cpp/\1examples\/common-ggml.cpp/g' \
  170. -e 's/([[:space:]]|[ab]\/)LICENSE/\1LICENSE/g' \
  171. -e 's/([[:space:]]|[ab]\/)scripts\/gen-authors\.sh/\1scripts\/gen-authors.sh/g' \
  172. > ggml-src.patch.tmp
  173. mv ggml-src.patch.tmp ggml-src.patch
  174. git am ggml-src.patch
  175. rm -v $SRC_LLAMA/ggml-src.patch
  176. fi
  177. # update last commit
  178. cd $SRC_GGML
  179. git log -1 --format=%H > $SRC_LLAMA/scripts/sync-ggml.last
  180. echo "Done"
  181. exit 0