common : revert reasoning budget +inf logit bias (#22740)
This commit is contained in:
@@ -158,8 +158,6 @@ static void common_reasoning_budget_apply(struct llama_sampler * smpl, llama_tok
|
|||||||
for (size_t i = 0; i < cur_p->size; i++) {
|
for (size_t i = 0; i < cur_p->size; i++) {
|
||||||
if (cur_p->data[i].id != forced) {
|
if (cur_p->data[i].id != forced) {
|
||||||
cur_p->data[i].logit = -INFINITY;
|
cur_p->data[i].logit = -INFINITY;
|
||||||
} else {
|
|
||||||
cur_p->data[i].logit = +INFINITY; // force the token
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -70,20 +70,20 @@ static void test_reasoning_budget(
|
|||||||
llama_sampler_apply(sampler, &cur_p);
|
llama_sampler_apply(sampler, &cur_p);
|
||||||
|
|
||||||
// Check if forcing is active (all logits except one should be -INFINITY)
|
// Check if forcing is active (all logits except one should be -INFINITY)
|
||||||
size_t not_neg_inf = 0;
|
size_t finite_count = 0;
|
||||||
llama_token not_neg_inf_token = -1;
|
llama_token finite_token = -1;
|
||||||
for (size_t j = 0; j < cur.size(); j++) {
|
for (size_t j = 0; j < cur.size(); j++) {
|
||||||
if (std::isfinite(cur[j].logit) || cur[j].logit > 0) { // +INFINITY
|
if (std::isfinite(cur[j].logit)) {
|
||||||
not_neg_inf++;
|
finite_count++;
|
||||||
not_neg_inf_token = cur[j].id;
|
finite_token = cur[j].id;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
llama_sampler_accept(sampler, sequence[i]);
|
llama_sampler_accept(sampler, sequence[i]);
|
||||||
|
|
||||||
fprintf(stderr, " i=%zu: token=%d, not_neg_inf_count=%zu, not_neg_inf_token=%d\n", i, (int)sequence[i], not_neg_inf, (int)not_neg_inf_token);
|
fprintf(stderr, " i=%zu: token=%d, finite_count=%zu, finite_token=%d\n", i, (int)sequence[i], finite_count, (int)finite_token);
|
||||||
|
|
||||||
if (not_neg_inf == 1) {
|
if (finite_count == 1) {
|
||||||
if (actual_force_start == SIZE_MAX) {
|
if (actual_force_start == SIZE_MAX) {
|
||||||
actual_force_start = i;
|
actual_force_start = i;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user