mirror of
				https://github.com/ggml-org/llama.cpp.git
				synced 2025-11-03 09:22:01 +00:00 
			
		
		
		
	llama : use LLM_KV_GENERAL_FILE_TYPE instead of gguf_find_key (#12672)
This commit is contained in:
		@@ -75,6 +75,7 @@ static const std::map<llm_kv, const char *> LLM_KV_NAMES = {
 | 
				
			|||||||
    { LLM_KV_GENERAL_ARCHITECTURE,         "general.architecture"                  },
 | 
					    { LLM_KV_GENERAL_ARCHITECTURE,         "general.architecture"                  },
 | 
				
			||||||
    { LLM_KV_GENERAL_QUANTIZATION_VERSION, "general.quantization_version"          },
 | 
					    { LLM_KV_GENERAL_QUANTIZATION_VERSION, "general.quantization_version"          },
 | 
				
			||||||
    { LLM_KV_GENERAL_ALIGNMENT,            "general.alignment"                     },
 | 
					    { LLM_KV_GENERAL_ALIGNMENT,            "general.alignment"                     },
 | 
				
			||||||
 | 
					    { LLM_KV_GENERAL_FILE_TYPE,            "general.file_type"                     },
 | 
				
			||||||
    { LLM_KV_GENERAL_NAME,                 "general.name"                          },
 | 
					    { LLM_KV_GENERAL_NAME,                 "general.name"                          },
 | 
				
			||||||
    { LLM_KV_GENERAL_AUTHOR,               "general.author"                        },
 | 
					    { LLM_KV_GENERAL_AUTHOR,               "general.author"                        },
 | 
				
			||||||
    { LLM_KV_GENERAL_VERSION,              "general.version"                       },
 | 
					    { LLM_KV_GENERAL_VERSION,              "general.version"                       },
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -79,6 +79,7 @@ enum llm_kv {
 | 
				
			|||||||
    LLM_KV_GENERAL_ARCHITECTURE,
 | 
					    LLM_KV_GENERAL_ARCHITECTURE,
 | 
				
			||||||
    LLM_KV_GENERAL_QUANTIZATION_VERSION,
 | 
					    LLM_KV_GENERAL_QUANTIZATION_VERSION,
 | 
				
			||||||
    LLM_KV_GENERAL_ALIGNMENT,
 | 
					    LLM_KV_GENERAL_ALIGNMENT,
 | 
				
			||||||
 | 
					    LLM_KV_GENERAL_FILE_TYPE,
 | 
				
			||||||
    LLM_KV_GENERAL_NAME,
 | 
					    LLM_KV_GENERAL_NAME,
 | 
				
			||||||
    LLM_KV_GENERAL_AUTHOR,
 | 
					    LLM_KV_GENERAL_AUTHOR,
 | 
				
			||||||
    LLM_KV_GENERAL_VERSION,
 | 
					    LLM_KV_GENERAL_VERSION,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -640,9 +640,9 @@ llama_model_loader::llama_model_loader(
 | 
				
			|||||||
        ftype = (llama_ftype) (ftype | LLAMA_FTYPE_GUESSED);
 | 
					        ftype = (llama_ftype) (ftype | LLAMA_FTYPE_GUESSED);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            const int kid = gguf_find_key(meta.get(), "general.file_type"); // TODO: use LLM_KV
 | 
					            uint32_t ftype_val = 0;
 | 
				
			||||||
            if (kid >= 0) {
 | 
					            if (get_key(LLM_KV_GENERAL_FILE_TYPE, ftype_val, false)) {
 | 
				
			||||||
                ftype = (llama_ftype) gguf_get_val_u32(meta.get(), kid);
 | 
					                ftype = (llama_ftype) ftype_val;
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user