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

Minor refactoring

This commit is contained in:
Ed Addario 2025-11-17 14:14:05 +00:00
parent 1f3db496cc
commit a2b86d7fd9
No known key found for this signature in database
GPG Key ID: E7875815A3230993
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/imatrix/imatrix.cpp
View File

@ -1347,6 +1347,7 @@ 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) {
g_collector.set_params(params);
std::vector<tensor_statistics> ts; std::vector<tensor_statistics> ts;
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");
@ -1374,13 +1375,17 @@ static bool show_statistics(const common_params & params) {
return false; return false;
} }
bool legacy;
if (has_activations && no_activations) { if (has_activations && no_activations) {
LOG_ERR("Error: %s has mixed tensors with and without activations\n\n", params.in_files[0].c_str()); LOG_ERR("Error: %s has mixed tensors with and without activations\n\n", params.in_files[0].c_str());
return false; return false;
} }
legacy = !has_activations; const bool legacy = !has_activations;
if (!legacy && no_activations) {
LOG_ERR("Error: %s is in new-format but some tensors are missing activations.\n\n", params.in_files[0].c_str());
return false;
}
compute_tensor_statistics(ts); compute_tensor_statistics(ts);
struct tensor_comparer { struct tensor_comparer {