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

Avoid using if statements with initialiser

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

28
tools/imatrix/imatrix.cpp
View File

@ -206,9 +206,8 @@ static bool compute_vector_statistics(std::vector<tensor_statistics> & tstats, c
if (e.activations.empty()) {
if (sum > 0) {
for (const auto act : activations) {
if (const float p = act / sum; p > 0) {
entropy -= p * std::log2(p);
}
const float p = act / sum;
if (p > 0) { entropy -= p * std::log2(p); }
}
}
} else {
@ -231,21 +230,22 @@ static bool compute_vector_statistics(std::vector<tensor_statistics> & tstats, c
int zd_score = 0;
if (std_deviation > 0.0f) {
for (const auto act : activations) {
if (const float z = (act - mean) / std_deviation; std::fabs(z) > 1.0f) zd_score++;
const float z = (act - mean) / std_deviation;
if (std::fabs(z) > 1.0f) { zd_score++; }
}
}
auto & ts = tstats.emplace_back();
ts.tensor = name;
ts.stats = e;
ts.sum_values = sum;
ts.mean_values = mean;
ts.max_values = max;
ts.min_values = min;
ts.elements = static_cast<int>(activations.size());
ts.std_deviation = std_deviation;
ts.entropy = entropy;
ts.zd_score = static_cast<float>(zd_score) / ts.elements;
ts.tensor = name;
ts.stats = e;
ts.sum_values = sum;
ts.mean_values = mean;
ts.max_values = max;
ts.min_values = min;
ts.elements = static_cast<int>(activations.size());
ts.std_deviation = std_deviation;
ts.entropy = entropy;
ts.zd_score = static_cast<float>(zd_score) / ts.elements;
return e.activations.empty();
}