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

Refactor function names

This commit is contained in:
Ed Addario 2025-08-03 15:10:17 +01:00
parent fce05aac9e
commit be60469f25
No known key found for this signature in database
GPG Key ID: E7875815A3230993
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/imatrix/imatrix.cpp
View File

@ -160,7 +160,7 @@ static std::vector<float> compute_tensor_averages(const Stats & tstats) {
return vec; return vec;
} }
static int compute_tensor_statistics(std::vector<tensor_statistics> & tstats, const std::string & name, const Stats & e) { static int compute_vector_statistics(std::vector<tensor_statistics> & tstats, const std::string & name, const Stats & e) {
if (e.in_sum2.size() % e.counts.size() != 0) { if (e.in_sum2.size() % e.counts.size() != 0) {
LOG_ERR("%s: activation size mismatch for tensor %s (%zu vs %zu)\n", __func__, name.c_str(), e.counts.size(), e.in_sum2.size()); LOG_ERR("%s: activation size mismatch for tensor %s (%zu vs %zu)\n", __func__, name.c_str(), e.counts.size(), e.in_sum2.size());
return -1;; return -1;;
@ -252,7 +252,7 @@ static int compute_tensor_statistics(std::vector<tensor_statistics> & tstats, co
return calc_mode; return calc_mode;
} }
static void compute_layer_statistics(std::vector<tensor_statistics> & tstats) { static void compute_tensor_statistics(std::vector<tensor_statistics> & tstats) {
static const std::regex pattern(R"(blk\.(\d+)\.)"); static const std::regex pattern(R"(blk\.(\d+)\.)");
// compute the cosine similarity between the same tensors in consecutive layers // compute the cosine similarity between the same tensors in consecutive layers
@ -1192,14 +1192,14 @@ static bool show_statistics(const common_params & params) {
} }
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()) {
tensor_calc_mode =compute_tensor_statistics(ts, name, stats); tensor_calc_mode =compute_vector_statistics(ts, name, stats);
} }
} 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_layer_statistics(ts); compute_tensor_statistics(ts);
} else { } 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;