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

Refactor legacy determination

This commit is contained in:
Ed Addario 2025-11-17 13:05:34 +00:00
parent ae1cbc707b
commit 63cbcc6dfc
No known key found for this signature in database
GPG Key ID: E7875815A3230993
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tools/imatrix/imatrix.cpp
View File

@ -1334,29 +1334,41 @@ static bool compute_imatrix(llama_context * ctx, const common_params & params, c
static bool show_statistics(const common_params & params) { static bool show_statistics(const common_params & params) {
std::vector<tensor_statistics> ts; std::vector<tensor_statistics> ts;
bool legacy = true;
if (params.in_files.empty() || params.in_files.size() > 1) { if (params.in_files.empty() || params.in_files.size() > 1) {
LOG_ERR("\nError: a single imatrix file is required to compute tensor statistics\n\n"); LOG_ERR("\nError: a single imatrix file is required to compute tensor statistics\n\n");
return false; return false;
} }
bool has_activations = false;
bool no_activations = false;
if (g_collector.load_imatrix(params.in_files[0].c_str())) { if (g_collector.load_imatrix(params.in_files[0].c_str())) {
for (const auto & [name, stats] : g_collector.get_mstats()) { for (const auto & [name, stats] : g_collector.get_mstats()) {
if (!compute_vector_statistics(ts, name, stats, legacy)) { bool legacy_imatrix = true;
if (!compute_vector_statistics(ts, name, stats, legacy_imatrix)) {
LOG_WRN("%s: tensor %s has no data - skipping\n", __func__, name.c_str()); LOG_WRN("%s: tensor %s has no data - skipping\n", __func__, name.c_str());
continue;
} }
if (legacy_imatrix) { no_activations = true; }
else { has_activations = true; }
} }
} else { } else {
LOG_ERR("\nError: %s is not a valid imatrix file\n\n", params.in_files[0].c_str()); LOG_ERR("\nError: %s is not a valid imatrix file\n\n", params.in_files[0].c_str());
return false; return false;
} }
if (!ts.empty()) { if (ts.empty()) {
compute_tensor_statistics(ts);
} else {
LOG_ERR("Error: cannot compute statistics for %s\n\n", params.in_files[0].c_str()); LOG_ERR("Error: cannot compute statistics for %s\n\n", params.in_files[0].c_str());
return false; return false;
} }
bool legacy;
if (has_activations && no_activations) {
LOG_ERR("Error: %s has mixed tensors with and without activations\n\n", params.in_files[0].c_str());
return false;
}
legacy = !has_activations;
compute_tensor_statistics(ts);
struct tensor_comparer { struct tensor_comparer {
bool legacy_mode; bool legacy_mode;
explicit tensor_comparer(const bool legacy) : legacy_mode(legacy) {} explicit tensor_comparer(const bool legacy) : legacy_mode(legacy) {}