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

server : make 2 checkpoints near the end of the prompt (#20288) 

* server : make 2 checkpoints near the end of the prompt

* cont : adjust checkpoints
This commit is contained in:
Georgi Gerganov 2026-03-10 14:28:23 +02:00 committed by GitHub
parent ec947d2b16
commit a7b3dee7a5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
tools/server/server-context.cpp
View File

@ -2530,9 +2530,24 @@ private:
slot.n_prompt_tokens_processed++; slot.n_prompt_tokens_processed++;
// process the last few tokens of the prompt separately in order to allow for a checkpoint to be created. // process the last few tokens of the prompt separately in order to allow for a checkpoint to be created.
const int n_last = std::min(n_batch, 512); // create checkpoints that many tokens before the end of the prompt:
if (do_checkpoint && slot.task->n_tokens() == slot.prompt.n_tokens() + n_last) { // - 4 + n_ubatch
break; // - 4
// ref: https://github.com/ggml-org/llama.cpp/pull/20288
{
static const int checkpoint_offsets[] = {4 + n_ubatch, 4};
bool should_break = false;
for (int offset : checkpoint_offsets) {
const int n_last = std::min(n_batch, offset);
if (do_checkpoint && slot.task->n_tokens() == slot.prompt.n_tokens() + n_last) {
should_break = true;
break;
}
}
if (should_break) {
break;
}
} }
} }
@ -2554,18 +2569,27 @@ private:
slot.init_sampler(); slot.init_sampler();
SLT_INF(slot, "prompt processing done, n_tokens = %d, batch.n_tokens = %d\n", slot.prompt.n_tokens(), batch.n_tokens); SLT_INF(slot, "prompt processing done, n_tokens = %d, batch.n_tokens = %d\n", slot.prompt.n_tokens(), batch.n_tokens);
} else { } else {
// only do non-end checkpoints if the "checkpoint every n tokens" option is set if (slot.task->n_tokens() < slot.prompt.n_tokens() + n_ubatch) {
do_checkpoint = do_checkpoint && params_base.checkpoint_every_nt > 0; // near the end of the prompt
if (do_checkpoint) { do_checkpoint = do_checkpoint && true;
llama_pos last_checkpoint = 0; } else {
if (!slot.prompt.checkpoints.empty()) { // only do non-end checkpoints if the "checkpoint every n tokens" option is set
last_checkpoint = slot.prompt.checkpoints.back().n_tokens; do_checkpoint = do_checkpoint && params_base.checkpoint_every_nt > 0;
}
do_checkpoint = do_checkpoint && slot.prompt.n_tokens() - batch.n_tokens - last_checkpoint >= params_base.checkpoint_every_nt;
if (do_checkpoint) { if (do_checkpoint) {
SLT_INF(slot, "%d tokens since last checkpoint at %d, creating new checkpoint during processing at position %d\n", params_base.checkpoint_every_nt, last_checkpoint, slot.prompt.n_tokens()); llama_pos last_checkpoint = 0;
if (!slot.prompt.checkpoints.empty()) {
last_checkpoint = slot.prompt.checkpoints.back().n_tokens;
}
do_checkpoint = do_checkpoint && slot.prompt.n_tokens() - batch.n_tokens - last_checkpoint >= params_base.checkpoint_every_nt;
if (do_checkpoint) {
SLT_INF(slot, "%d tokens since last checkpoint at %d, creating new checkpoint during processing at position %d\n", params_base.checkpoint_every_nt, last_checkpoint, slot.prompt.n_tokens());
}
} }
} }
SLT_INF(slot, "prompt processing progress, n_tokens = %d, batch.n_tokens = %d, progress = %f\n", slot.prompt.n_tokens(), batch.n_tokens, (float) slot.prompt.n_tokens() / slot.task->n_tokens()); SLT_INF(slot, "prompt processing progress, n_tokens = %d, batch.n_tokens = %d, progress = %f\n", slot.prompt.n_tokens(), batch.n_tokens, (float) slot.prompt.n_tokens() / slot.task->n_tokens());
} }