ggml-org
diff --git a/‎src/llama-arch.cpp
Copy file name to clipboardExpand all lines: src/llama-arch.cpp
+8-3Lines changed: 8 additions & 3 deletions b/‎src/llama-arch.cpp
Copy file name to clipboardExpand all lines: src/llama-arch.cpp
+8-3Lines changed: 8 additions & 3 deletions
diff --git a/‎src/llama-arch.h
Copy file name to clipboardExpand all lines: src/llama-arch.h
-1Lines changed: 0 additions & 1 deletion b/‎src/llama-arch.h
Copy file name to clipboardExpand all lines: src/llama-arch.h
-1Lines changed: 0 additions & 1 deletion
diff --git a/‎src/llama-model.cpp
Copy file name to clipboardExpand all lines: src/llama-model.cpp
+1-1Lines changed: 1 addition & 1 deletion b/‎src/llama-model.cpp
Copy file name to clipboardExpand all lines: src/llama-model.cpp
+1-1Lines changed: 1 addition & 1 deletion
@@ -200,7 +200,6 @@ static const std::map<llm_kv, const char *> LLM_KV_NAMES = {
     { LLM_KV_TOKENIZER_HF_JSON,              "tokenizer.huggingface.json"              },
     { LLM_KV_TOKENIZER_RWKV,                 "tokenizer.rwkv.world"                    },
     { LLM_KV_TOKENIZER_CHAT_TEMPLATE,        "tokenizer.chat_template"                 },
-    { LLM_KV_TOKENIZER_CHAT_TEMPLATE_N,      "tokenizer.chat_template.%s"              },
     { LLM_KV_TOKENIZER_FIM_PRE_ID,           "tokenizer.ggml.fim_pre_token_id"         },
     { LLM_KV_TOKENIZER_FIM_SUF_ID,           "tokenizer.ggml.fim_suf_token_id"         },
     { LLM_KV_TOKENIZER_FIM_MID_ID,           "tokenizer.ggml.fim_mid_token_id"         },
@@ -1707,8 +1706,14 @@ static const std::map<llm_tensor, llm_tensor_info> LLM_TENSOR_INFOS = {
 LLM_KV::LLM_KV(llm_arch arch, const char * suffix) : arch(arch), suffix(suffix) {}
 
 std::string LLM_KV::operator()(llm_kv kv) const {
-    return suffix ? ::format(LLM_KV_NAMES.at(kv), LLM_ARCH_NAMES.at(arch), suffix)
-        : ::format(LLM_KV_NAMES.at(kv), LLM_ARCH_NAMES.at(arch));
+    std::string name = ::format(LLM_KV_NAMES.at(kv), LLM_ARCH_NAMES.at(arch));
+
+    if (suffix != nullptr) {
+        name += ".";
+        name += suffix;
+    }
+
+    return name;
 }
 
 std::string LLM_TN_IMPL::str() const {
 
@@ -196,7 +196,6 @@ enum llm_kv {
     LLM_KV_TOKENIZER_HF_JSON,
     LLM_KV_TOKENIZER_RWKV,
     LLM_KV_TOKENIZER_CHAT_TEMPLATE,
-    LLM_KV_TOKENIZER_CHAT_TEMPLATE_N,
     LLM_KV_TOKENIZER_FIM_PRE_ID,
     LLM_KV_TOKENIZER_FIM_SUF_ID,
     LLM_KV_TOKENIZER_FIM_MID_ID,
 
@@ -13788,7 +13788,7 @@ uint64_t llama_model_size(const llama_model * model) {
 }
 
 const char * llama_model_chat_template(const llama_model * model, const char * name) {
-    const auto key = name ? LLM_KV(model->arch, name)(LLM_KV_TOKENIZER_CHAT_TEMPLATE_N)
+    const auto key = name ? LLM_KV(model->arch, name)(LLM_KV_TOKENIZER_CHAT_TEMPLATE)
         : LLM_KV(model->arch)(LLM_KV_TOKENIZER_CHAT_TEMPLATE);
     const auto & it = model->gguf_kv.find(key);
     if (it == model->gguf_kv.end()) {
Original file line number	Diff line number	Diff line change
`@@ -13788,7 +13788,7 @@ uint64_t llama_model_size(const llama_model * model) {`
`13788`	`13788`	`}`
`13789`	`13789`
`13790`	`13790`	`const char * llama_model_chat_template(const llama_model * model, const char * name) {`
`13791`		`- const auto key = name ? LLM_KV(model->arch, name)(LLM_KV_TOKENIZER_CHAT_TEMPLATE_N)`
	`13791`	`+ const auto key = name ? LLM_KV(model->arch, name)(LLM_KV_TOKENIZER_CHAT_TEMPLATE)`
`13792`	`13792`	`: LLM_KV(model->arch)(LLM_KV_TOKENIZER_CHAT_TEMPLATE);`
`13793`	`13793`	`const auto & it = model->gguf_kv.find(key);`
`13794`	`13794`	`if (it == model->gguf_kv.end()) {`