Skip to content

Commit e39e727

Browse files
authored
llama : use LLM_KV_GENERAL_FILE_TYPE instead of gguf_find_key (#12672)
1 parent 5936a61 commit e39e727

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

src/llama-arch.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ static const std::map<llm_kv, const char *> LLM_KV_NAMES = {
7575
{ LLM_KV_GENERAL_ARCHITECTURE, "general.architecture" },
7676
{ LLM_KV_GENERAL_QUANTIZATION_VERSION, "general.quantization_version" },
7777
{ LLM_KV_GENERAL_ALIGNMENT, "general.alignment" },
78+
{ LLM_KV_GENERAL_FILE_TYPE, "general.file_type" },
7879
{ LLM_KV_GENERAL_NAME, "general.name" },
7980
{ LLM_KV_GENERAL_AUTHOR, "general.author" },
8081
{ LLM_KV_GENERAL_VERSION, "general.version" },

src/llama-arch.h

+1
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ enum llm_kv {
7979
LLM_KV_GENERAL_ARCHITECTURE,
8080
LLM_KV_GENERAL_QUANTIZATION_VERSION,
8181
LLM_KV_GENERAL_ALIGNMENT,
82+
LLM_KV_GENERAL_FILE_TYPE,
8283
LLM_KV_GENERAL_NAME,
8384
LLM_KV_GENERAL_AUTHOR,
8485
LLM_KV_GENERAL_VERSION,

src/llama-model-loader.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -640,9 +640,9 @@ llama_model_loader::llama_model_loader(
640640
ftype = (llama_ftype) (ftype | LLAMA_FTYPE_GUESSED);
641641

642642
{
643-
const int kid = gguf_find_key(meta.get(), "general.file_type"); // TODO: use LLM_KV
644-
if (kid >= 0) {
645-
ftype = (llama_ftype) gguf_get_val_u32(meta.get(), kid);
643+
uint32_t ftype_val = 0;
644+
if (get_key(LLM_KV_GENERAL_FILE_TYPE, ftype_val, false)) {
645+
ftype = (llama_ftype) ftype_val;
646646
}
647647
}
648648

0 commit comments

Comments
 (0)