From e39e727e9a3daec7082b9c59540a429ad85914af Mon Sep 17 00:00:00 2001 From: jklincn Date: Tue, 1 Apr 2025 20:54:28 +0800 Subject: [PATCH] llama : use LLM_KV_GENERAL_FILE_TYPE instead of gguf_find_key (#12672) --- src/llama-arch.cpp | 1 + src/llama-arch.h | 1 + src/llama-model-loader.cpp | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/llama-arch.cpp b/src/llama-arch.cpp index 954ae65a..047782e7 100644 --- a/src/llama-arch.cpp +++ b/src/llama-arch.cpp @@ -75,6 +75,7 @@ static const std::map LLM_KV_NAMES = { { LLM_KV_GENERAL_ARCHITECTURE, "general.architecture" }, { LLM_KV_GENERAL_QUANTIZATION_VERSION, "general.quantization_version" }, { LLM_KV_GENERAL_ALIGNMENT, "general.alignment" }, + { LLM_KV_GENERAL_FILE_TYPE, "general.file_type" }, { LLM_KV_GENERAL_NAME, "general.name" }, { LLM_KV_GENERAL_AUTHOR, "general.author" }, { LLM_KV_GENERAL_VERSION, "general.version" }, diff --git a/src/llama-arch.h b/src/llama-arch.h index 7e2a3dd2..297cfa4d 100644 --- a/src/llama-arch.h +++ b/src/llama-arch.h @@ -79,6 +79,7 @@ enum llm_kv { LLM_KV_GENERAL_ARCHITECTURE, LLM_KV_GENERAL_QUANTIZATION_VERSION, LLM_KV_GENERAL_ALIGNMENT, + LLM_KV_GENERAL_FILE_TYPE, LLM_KV_GENERAL_NAME, LLM_KV_GENERAL_AUTHOR, LLM_KV_GENERAL_VERSION, diff --git a/src/llama-model-loader.cpp b/src/llama-model-loader.cpp index 05d58ad9..1be0f2d6 100644 --- a/src/llama-model-loader.cpp +++ b/src/llama-model-loader.cpp @@ -640,9 +640,9 @@ llama_model_loader::llama_model_loader( ftype = (llama_ftype) (ftype | LLAMA_FTYPE_GUESSED); { - const int kid = gguf_find_key(meta.get(), "general.file_type"); // TODO: use LLM_KV - if (kid >= 0) { - ftype = (llama_ftype) gguf_get_val_u32(meta.get(), kid); + uint32_t ftype_val = 0; + if (get_key(LLM_KV_GENERAL_FILE_TYPE, ftype_val, false)) { + ftype = (llama_ftype) ftype_val; } }