Skip to content
Closed
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions vllm/v1/engine/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,11 @@ def step_with_batch_queue(
with self.log_error_detail(scheduler_output):
model_output = future.result()

# Handle None return from execute_model (async scheduling)
if model_output is None:
grammar_output = self.scheduler.get_grammar_bitmask(scheduler_output)
model_output = self.model_executor.sample_tokens(grammar_output)

# Before processing the model output, process any aborts that happened
# during the model execution.
self._process_aborts_queue()
Expand Down