Merge branch 'upstream' into concedo_experimental

# Conflicts:
#	.github/workflows/bench.yml.disabled
#	Makefile
#	README.md
#	ggml/CMakeLists.txt
#	ggml/src/CMakeLists.txt
#	ggml/src/ggml-vulkan.cpp
This commit is contained in:
Concedo 2024-08-17 16:21:14 +08:00
commit 1edf83761a
49 changed files with 110670 additions and 109313 deletions

View file

@ -402,10 +402,6 @@ std::string llama_detokenize(
const std::vector<llama_token> & tokens,
bool special = true);
// Uses the value from the model metadata if possible, otherwise
// defaults to true when model type is SPM, otherwise false.
bool llama_should_add_bos_token(const llama_model * model);
//
// Chat template utils
//