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

Refactor epsilon into a function-wide variable

This commit is contained in:
Ed Addario 2025-08-28 16:01:03 +01:00
parent 4286690019
commit 04946114c9
No known key found for this signature in database
GPG Key ID: E7875815A3230993
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/llama-quant.cpp
View File

@ -649,6 +649,8 @@ static std::unordered_map<std::string, ggml_type> target_bpw_type(
GGML_TYPE_Q8_0 GGML_TYPE_Q8_0
}; };
constexpr double epsilon = 1e-12;
auto tensor_bytes = [](const ggml_tensor * t, const ggml_type typ) -> size_t { auto tensor_bytes = [](const ggml_tensor * t, const ggml_type typ) -> size_t {
const int64_t n_per_row = t->ne[0]; const int64_t n_per_row = t->ne[0];
const size_t row_sz = ggml_row_size(typ, n_per_row); const size_t row_sz = ggml_row_size(typ, n_per_row);
@ -1193,7 +1195,7 @@ static std::unordered_map<std::string, ggml_type> target_bpw_type(
double err = cur.error - nxt.error; double err = cur.error - nxt.error;
err = std::max(err, 0.0); err = std::max(err, 0.0);
double ratio = err / (double)(delta_bytes * 8ull); double ratio = err / (double)(delta_bytes * 8ull);
if (ratio > best.ratio + eps || (std::abs(ratio - best.ratio) <= eps && delta_bytes < best.delta_bytes)) { if (ratio > best.ratio + epsilon || (std::abs(ratio - best.ratio) <= epsilon && delta_bytes < best.delta_bytes)) {
best = upgrade{ i, j, err, delta_bytes, ratio }; best = upgrade{ i, j, err, delta_bytes, ratio };
} }
} }
@ -1208,7 +1210,7 @@ static std::unordered_map<std::string, ggml_type> target_bpw_type(
size_t now_bytes = current_total_bytes(); size_t now_bytes = current_total_bytes();
size_t next_bytes = now_bytes + up.delta_bytes; size_t next_bytes = now_bytes + up.delta_bytes;
double bpw_next = (double)next_bytes * 8.0 / (double)tw; double bpw_next = (double)next_bytes * 8.0 / (double)tw;
if (bpw_next <= target_bpw + 1e-12) { if (bpw_next <= target_bpw + epsilon) {
all[up.idx].choice = up.next; all[up.idx].choice = up.next;
bpw_now = bpw_next; bpw_now = bpw_next;
} else { } else {
@ -1241,7 +1243,7 @@ static std::unordered_map<std::string, ggml_type> target_bpw_type(
double ratio = err / (double)(delta_bytes * 8ull); double ratio = err / (double)(delta_bytes * 8ull);
double over_gap = std::abs(bpw_over - (double)target_bpw); double over_gap = std::abs(bpw_over - (double)target_bpw);
if (over_gap < best_over_gap - 1e-12 || (std::abs(over_gap - best_over_gap) <= 1e-12 && ratio > best_over.ratio)) { if (over_gap < best_over_gap - epsilon || (std::abs(over_gap - best_over_gap) <= epsilon && ratio > best_over.ratio)) {
best_over_gap = over_gap; best_over_gap = over_gap;
best_over = upgrade{ i, j, err, delta_bytes, ratio }; best_over = upgrade{ i, j, err, delta_bytes, ratio };
} }