happyz
/
llama.cpp
mirror of https://github.com/ggerganov/llama.cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

common : filter out imatrix when finding models (#21023) 

Signed-off-by: Adrien Gallouët <angt@huggingface.co>
This commit is contained in:
Adrien Gallouët 2026-03-26 15:37:18 +01:00 committed by GitHub
parent dc8d14c582
commit 9900b29c3a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
common/download.cpp
View File

@ -548,6 +548,20 @@ static hf_cache::hf_file find_best_mmproj(const hf_cache::hf_files & files,
return best; return best;
} }
static bool gguf_filename_is_model(const std::string & filepath) {
if (!string_ends_with(filepath, ".gguf")) {
return false;
}
std::string filename = filepath;
if (auto pos = filename.rfind('/'); pos != std::string::npos) {
filename = filename.substr(pos + 1);
}
return filename.find("mmproj") == std::string::npos &&
filename.find("imatrix") == std::string::npos;
}
static hf_cache::hf_file find_best_model(const hf_cache::hf_files & files, static hf_cache::hf_file find_best_model(const hf_cache::hf_files & files,
const std::string & tag) { const std::string & tag) {
std::vector<std::string> tags; std::vector<std::string> tags;
@ -561,8 +575,7 @@ static hf_cache::hf_file find_best_model(const hf_cache::hf_files & files,
for (const auto & t : tags) { for (const auto & t : tags) {
std::regex pattern(t + "[.-]", std::regex::icase); std::regex pattern(t + "[.-]", std::regex::icase);
for (const auto & f : files) { for (const auto & f : files) {
if (string_ends_with(f.path, ".gguf") && if (gguf_filename_is_model(f.path) &&
f.path.find("mmproj") == std::string::npos &&
std::regex_search(f.path, pattern)) { std::regex_search(f.path, pattern)) {
return f; return f;
} }
@ -570,8 +583,7 @@ static hf_cache::hf_file find_best_model(const hf_cache::hf_files & files,
} }
for (const auto & f : files) { for (const auto & f : files) {
if (string_ends_with(f.path, ".gguf") && if (gguf_filename_is_model(f.path)) {
f.path.find("mmproj") == std::string::npos) {
return f; return f;
} }
} }