Skip to content

server : fix prompt-cache reuse for hybrid/recurrent models #23121

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
bjahoor wants to merge 1 commit into from
+15 −4
Closed

server : fix prompt-cache reuse for hybrid/recurrent models #23121

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
19 changes: 15 additions & 4 deletions tools/server/server-context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2554,6 +2554,12 @@ struct server_context_impl {
// guarantee that a checkpoint will result in at least one token being processed [TAG_PROMPT_LOGITS]
LOG_INF("slot %12.*s: id %2d | task %d | Checking checkpoint with [%d, %d] against %d...\n", 12,
func_name, (slot).id, ((slot).task ? (slot).task->id : -1), cur.pos_min, cur.pos_max, pos_min_thold);
// for hybrid/recurrent models (DeltaNet, Mamba), pos_min always equals
// the full sequence length, so the SWA-based pos_min check always fails.
// use pos_max <= pos_next instead to find the most recent valid checkpoint.
if (llama_model_is_recurrent(model_tgt) || llama_model_is_hybrid(model_tgt)) {
return cur.pos_max <= pos_next;
}
return cur.pos_min < pos_min_thold || cur.pos_min == 0;
}
);
Expand Down Expand Up @@ -2626,12 +2632,17 @@ struct server_context_impl {
SLT_INF(slot, "n_tokens = %d, memory_seq_rm [%d, end)\n", slot.prompt.n_tokens(), p0);

if (!llama_memory_seq_rm(llama_get_memory(ctx_tgt), slot.id, p0, -1)) {
SLT_WRN(slot, "failed to truncate tokens with position >= %d - clearing the memory\n", p0);
if (ctx_tgt_seq_rm_type == COMMON_CONTEXT_SEQ_RM_TYPE_FULL && slot.n_prompt_tokens_cache > 0) {
// hybrid/recurrent: partial seq_rm always fails, but checkpoint restored valid state
SLT_INF(slot, "seq_rm failed (expected for hybrid) - keeping %d cached tokens from checkpoint\n", slot.n_prompt_tokens_cache);
} else {
SLT_WRN(slot, "failed to truncate tokens with position >= %d - clearing the memory\n", p0);

slot.prompt_clear(true);
slot.prompt_clear(true);

// there is no common part left
slot.n_prompt_tokens_cache = 0;
// there is no common part left
slot.n_prompt_tokens_cache = 0;
}
} else {
if (ctx_dft && !llama_memory_seq_rm(llama_get_memory(ctx_dft.get()), slot.id, p0, -1)) {
GGML_ABORT("failed to truncate draft context\n");
Expand Down