Merge branch 'upstream' into concedo_experimental

# Conflicts:
#	examples/parallel/parallel.cpp
This commit is contained in:
Concedo 2025-07-18 23:49:45 +08:00
commit b0b7a07b34
18 changed files with 1070 additions and 600 deletions

View file

@ -2161,6 +2161,9 @@ void llama_vocab::impl::load(llama_model_loader & ml, const LLM_KV & kv) {
} else if (
tokenizer_pre == "exaone") {
pre_type = LLAMA_VOCAB_PRE_TYPE_EXAONE;
} else if (
tokenizer_pre == "exaone4") {
pre_type = LLAMA_VOCAB_PRE_TYPE_GPT2;
} else if (
tokenizer_pre == "chameleon") {
pre_type = LLAMA_VOCAB_PRE_TYPE_CHAMELEON;