Skip to content

Commit 0f02297

Browse files
committed
model : avoid hardcoded chat template constant
ggml-ci
1 parent d8931a7 commit 0f02297

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

src/llama-arch.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ static const std::map<llm_kv, const char *> LLM_KV_NAMES = {
176176
{ LLM_KV_TOKENIZER_PRECOMPILED_CHARSMAP, "tokenizer.ggml.precompiled_charsmap" },
177177
{ LLM_KV_TOKENIZER_HF_JSON, "tokenizer.huggingface.json" },
178178
{ LLM_KV_TOKENIZER_RWKV, "tokenizer.rwkv.world" },
179+
{ LLM_KV_TOKENIZER_CHAT_TEMPLATE, "tokenizer.chat.template" },
179180
{ LLM_KV_TOKENIZER_FIM_PRE_ID, "tokenizer.ggml.fim_pre_token_id" },
180181
{ LLM_KV_TOKENIZER_FIM_SUF_ID, "tokenizer.ggml.fim_suf_token_id" },
181182
{ LLM_KV_TOKENIZER_FIM_MID_ID, "tokenizer.ggml.fim_mid_token_id" },

src/llama-arch.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ enum llm_kv {
174174
LLM_KV_TOKENIZER_PRECOMPILED_CHARSMAP,
175175
LLM_KV_TOKENIZER_HF_JSON,
176176
LLM_KV_TOKENIZER_RWKV,
177+
LLM_KV_TOKENIZER_CHAT_TEMPLATE,
177178
LLM_KV_TOKENIZER_FIM_PRE_ID,
178179
LLM_KV_TOKENIZER_FIM_SUF_ID,
179180
LLM_KV_TOKENIZER_FIM_MID_ID,

src/llama-model.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3836,7 +3836,7 @@ uint64_t llama_model_size(const struct llama_model * model) {
38363836
}
38373837

38383838
const char * llama_model_chat_template(const struct llama_model * model) {
3839-
const auto & it = model->gguf_kv.find("tokenizer.chat_template");
3839+
const auto & it = model->gguf_kv.find(LLM_KV(model->arch)(LLM_KV_TOKENIZER_CHAT_TEMPLATE));
38403840
if (it == model->gguf_kv.end()) {
38413841
return nullptr;
38423842
}

0 commit comments

Comments
 (0)