tqcq/llama.cpp
0
0
Fork 0
mirror of https://github.com/ggml-org/llama.cpp.git synced 2025-06-27 20:05:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

server : disable speculative decoding for SWA models (#13970)

Browse Source 
* server : use swa-full fo draft context

ggml-ci

* server : disable speculative decoding for SWA models
This commit is contained in:
Georgi Gerganov
2025-06-02 21:34:40 +03:00
committed by GitHub
parent ea394d7ab1
commit 3637576288
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/server/server.cpp
View File

@ -2016,6 +2016,11 @@ struct server_context {
params_base.n_cache_reuse = 0; params_base.n_cache_reuse = 0;
SRV_WRN("%s\n", "cache_reuse is not supported by this context, it will be disabled"); SRV_WRN("%s\n", "cache_reuse is not supported by this context, it will be disabled");
} }
if (!params_base.speculative.model.path.empty()) {
SRV_ERR("%s\n", "err: speculative decode is not supported by this context");
return false;
}
} }
return true; return true;
@ -3203,9 +3208,7 @@ struct server_context {
} }
} else { } else {
// if we don't cache the prompt, we have to remove the entire KV cache // if we don't cache the prompt, we have to remove the entire KV cache
llama_kv_self_seq_rm(ctx, slot.id, 0, -1);
slot.n_past = 0; slot.n_past = 0;
slot.cache_tokens.clear(); // TODO: not needed, will be cleared later via "keep_first()"
} }
if (slot.n_past > 0 && slot.n_past < (int) slot.cache_tokens.size()) { if (slot.n_past > 0 && slot.n_past < (int) slot.cache_tokens.size()) {
@ -3220,7 +3223,6 @@ struct server_context {
SLT_WRN(slot, "n_past = %d, cache_tokens.size() = %d, seq_id = %d, pos_min = %d, n_swa = %d\n", slot.n_past, (int) slot.cache_tokens.size(), slot.id, pos_min, n_swa); SLT_WRN(slot, "n_past = %d, cache_tokens.size() = %d, seq_id = %d, pos_min = %d, n_swa = %d\n", slot.n_past, (int) slot.cache_tokens.size(), slot.id, pos_min, n_swa);
SLT_WRN(slot, "forcing full prompt re-processing due to lack of cache data (likely due to SWA, see %s)\n", SLT_WRN(slot, "forcing full prompt re-processing due to lack of cache data (likely due to SWA, see %s)\n",
"https://github.com/ggml-org/llama.cpp/pull/13194#issuecomment-2868343055"); "https://github.com/ggml-org/llama.cpp/pull/13194#issuecomment-2868343055");
llama_kv_self_seq_rm(ctx, slot.id, 0, -1);
slot.n_past = 0; slot.n_past = 0;
} }
} }