Skip to content

server: Added support for n_predict values of -2 #12347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

server: Added support for n_predict values of -2 #12347

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions examples/server/server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1321,17 +1321,29 @@ struct server_slot {
&& are_lora_equal(lora, other_slot.lora);
}

bool has_budget(const common_params & global_params) {
bool has_budget(const common_params & global_params, int32_t slot_n_ctx) {
if (params.n_predict == -1 && global_params.n_predict == -1) {
return true; // limitless
}

n_remaining = -1;

if (params.n_predict != -1) {
n_remaining = params.n_predict - n_decoded;
} else if (global_params.n_predict != -1) {
n_remaining = global_params.n_predict - n_decoded;
if (global_params.n_predict == -1) {
if (params.n_predict == -2)
n_remaining = slot_n_ctx - n_decoded;
else
n_remaining = params.n_predict - n_decoded;
} else if (global_params.n_predict == -2) {
if (params.n_predict == -1 || params.n_predict == -2)
n_remaining = slot_n_ctx - n_decoded;
else
n_remaining = std::min(params.n_predict - n_decoded, slot_n_ctx - n_decoded);
} else {
if (params.n_predict == -1)
n_remaining = global_params.n_predict - n_decoded;
else if (params.n_predict == -2)
n_remaining = std::min(global_params.n_predict - n_decoded, slot_n_ctx - n_decoded);
else
n_remaining = std::min(params.n_predict - n_decoded, global_params.n_predict - n_decoded);
}

return n_remaining > 0; // no budget
Expand Down Expand Up @@ -2153,7 +2165,7 @@ struct server_context {
}

// check the limits
if (slot.n_decoded > 0 && slot.has_next_token && !slot.has_budget(params_base)) {
if (slot.n_decoded > 0 && slot.has_next_token && !slot.has_budget(params_base, slot.n_ctx)) {
slot.stop = STOP_TYPE_LIMIT;
slot.has_next_token = false;

Expand Down