vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 6893f3ac5d into 55ac8c7791

Browse source
This commit is contained in:
Brian 2025-02-08 17:36:52 -07:00 • committed by GitHub
commit 437af24a48
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/llama.cpp
View file

@ -8623,6 +8623,12 @@ static int llama_decode_impl(
} }
while (lctx.sbatch.n_tokens > 0) { while (lctx.sbatch.n_tokens > 0) {
// If aborted, break out
if (lctx.abort_callback != nullptr && lctx.abort_callback(lctx.abort_callback_data)) {
LLAMA_LOG_ERROR("%s: token decode aborted\n", __func__);
return -1;
}
llama_ubatch ubatch; llama_ubatch ubatch;
{ {
const int ret = llama_prepare_ubatch(lctx, kv_slot_restorer, ubatch, n_outputs, batch.n_tokens); const int ret = llama_prepare_ubatch(lctx, kv_slot_restorer, ubatch, n_outputs, batch.n_tokens);