Merge branch 'upstream' into concedo_experimental

# Conflicts:
#	.github/workflows/bench.yml
#	.github/workflows/server.yml
#	CMakeLists.txt
#	Makefile
#	README-sycl.md
#	flake.lock
This commit is contained in:
Concedo 2024-04-23 22:37:42 +08:00
commit 65bf69d104
6 changed files with 421 additions and 572 deletions

View file

@ -4403,7 +4403,7 @@ static void llm_load_vocab(
}
}
// find EOT token: "<|eot_id|>", "<|im_emd|>", "<end_of_turn>", etc.
// find EOT token: "<|eot_id|>", "<|im_end|>", "<end_of_turn>", etc.
//
// TODO: convert scripts should provide this token through the KV metadata LLAMA_KV_TOKENIZER_EOT_ID
// for now, we apply this workaround to find the EOT token based on its text
@ -4414,7 +4414,7 @@ static void llm_load_vocab(
// need to fix convert script
//vocab.id_to_token[t.second].type == LLAMA_TOKEN_TYPE_CONTROL &&
(t.first == "<|eot_id|>" ||
t.first == "<|im_emd|>" ||
t.first == "<|im_end|>" ||
t.first == "<end_of_turn>"
)
) {