Skip to content

Commit 23631e3

Browse files
committed
Merge remote-tracking branch 'refs/remotes/upstream/pr/22619' into eliza/token-trie-sampler
# Conflicts: # tools/server/server-context.cpp
2 parents bffe609 + 1013a21 commit 23631e3

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

tools/server/server-context.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2962,7 +2962,7 @@ struct server_context_impl {
29622962
SLT_ERR(slot, "failed to process image, res = %d\n", res);
29632963
send_error(slot, "failed to process image", ERROR_TYPE_SERVER);
29642964
slot.release();
2965-
continue;
2965+
break;
29662966
}
29672967

29682968
if (ctx_dft) {
@@ -2986,6 +2986,10 @@ struct server_context_impl {
29862986
has_mtmd = true;
29872987
}
29882988

2989+
if (!slot.is_processing()) {
2990+
continue;
2991+
}
2992+
29892993
const int32_t checkpoint_before_last_user_token = slot.task->params.checkpoint_before_last_user_token;
29902994

29912995
// add prompt tokens for processing in the current batch

0 commit comments

Comments
 (0)