chore: bump llama.cpp and remove patch

mybigday · May 10, 2024 · 764742e · 764742e
1 parent 8a0ca56
commit 764742e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 69 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -64,15 +64,6 @@ if (VULKAN_SDK)
   find_package(Vulkan REQUIRED)
 endif()
 
-find_program(PATCH patch REQUIRED)
-
-add_custom_target(
-  patch ALL
-  COMMAND ${PATCH} -p1 -N < ${CMAKE_SOURCE_DIR}/patches/llama.patch || true
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/llama.cpp
-  COMMENT "Applying patches"
-)
-
 set(LLAMA_STATIC ON CACHE BOOL "Build llama as static library")
 add_subdirectory("src/llama.cpp")
 

diff --git a/patches/llama.patch b/patches/llama.patch
diff --git a/src/llama.cpp b/src/llama.cpp
+2 −1		CMakeLists.txt
+1 −1		Makefile
+22 −25		README.md
+13 −6		common/common.cpp
+1 −0		common/common.h
+4 −0		common/json-schema-to-grammar.h
+5 −0		common/sampling.cpp
+1 −0		common/sampling.h
+10 −0		convert-hf-to-gguf-update.py
+758 −1,225		convert-hf-to-gguf.py
+44 −27		convert.py
+1 −1		docs/BLIS.md
+2 −2		docs/HOWTO-add-model.md
+1 −1		examples/convert-llama2c-to-ggml/README.md
+5 −5		examples/eval-callback/eval-callback.cpp
+1 −1		examples/finetune/finetune.cpp
+29 −7		examples/imatrix/imatrix.cpp
+1 −1		examples/llava/README.md
+10 −8		examples/llava/clip.cpp
+2 −2		examples/main/README.md
+8 −5		examples/main/main.cpp
+2 −1		examples/quantize/quantize.cpp
+14 −2		examples/server/README.md
+ −		examples/server/public/favicon.ico
+63 −46		examples/server/server.cpp
+13 −1		examples/server/tests/features/server.feature
+33 −5		examples/server/tests/features/steps/steps.py
+5 −0		examples/server/themes/README.md
+7 −0		examples/server/themes/buttons-top/README.md
+ −		examples/server/themes/buttons-top/buttons_top.png
+ −		examples/server/themes/buttons-top/favicon.ico
+1,057 −0		examples/server/themes/buttons-top/index.html
+5 −0		examples/server/themes/wild/README.md
+ −		examples/server/themes/wild/favicon.ico
+1,061 −0		examples/server/themes/wild/index.html
+ −		examples/server/themes/wild/llama_cpp.png
+ −		examples/server/themes/wild/llamapattern.png
+ −		examples/server/themes/wild/wild.png
+17 −15		examples/server/utils.hpp
+1 −1		examples/sycl/README.md
+286 −14		ggml-cuda.cu
+0 −1		ggml-cuda/clamp.cu
+164 −108		ggml-cuda/common.cuh
+1 −3		ggml-cuda/convert.cu
+29 −0		ggml-cuda/cpy.cu
+2 −0		ggml-cuda/cpy.cuh
+223 −82		ggml-cuda/fattn.cu
+10 −20		ggml-cuda/mmq.cu
+2 −4		ggml-cuda/mmvq.cu
+0 −1		ggml-cuda/scale.cu
+77 −0		ggml-impl.h
+23 −8		ggml-metal.m
+1 −1		ggml-metal.metal
+1 −0		ggml-opencl.cpp
+18 −0		ggml-quants.c
+11 −9		ggml-sycl.cpp
+46,843 −39,205		ggml-vulkan-shaders.hpp
+950 −267		ggml-vulkan.cpp
+1,089 −88		ggml.c
+15 −7		ggml.h
+541 −175		ggml_vk_generate_shaders.py
+3 −1		gguf-py/gguf/constants.py
+4 −4		gguf-py/gguf/gguf_reader.py
+68 −9		gguf-py/gguf/gguf_writer.py
+3 −3		gguf-py/gguf/vocab.py
+1 −0		gguf-py/pyproject.toml
+1 −1		gguf-py/scripts/gguf-dump.py
+76 −24		gguf-py/scripts/gguf-new-metadata.py
+1 −1		grammars/README.md
+38 −11		llama.cpp
+4 −0		llama.h
+ −		models/ggml-vocab-qwen2.gguf
+106 −0		models/ggml-vocab-qwen2.gguf.inp
+43 −0		models/ggml-vocab-qwen2.gguf.out
+3 −0		pyrightconfig.json
+0 −1		requirements/requirements-convert-hf-to-gguf-update.txt
+0 −1		requirements/requirements-convert-hf-to-gguf.txt
+1 −1		requirements/requirements-convert.txt
+9 −6		scripts/compare-llama-bench.py
+38 −40		scripts/gen-unicode-data.py
+56 −21		sgemm.cpp
+1 −0		tests/CMakeLists.txt
+8 −2		tests/test-backend-ops.cpp
+1 −0		tests/test-json-schema-to-grammar.cpp
+295 −0		tests/test-tokenizer-random.py
+875 −385		unicode-data.cpp
+1 −0		unicode-data.h
+249 −117		unicode.cpp
+3 −1		unicode.h