Skip to content

[Upstream fix] Fix after #23262 from upstream - Make new_block_ids None if empty #93

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

Merged
adobrzyn merged 3 commits into from
Aug 21, 2025
Merged

[Upstream fix] Fix after #23262 from upstream - Make new_block_ids None if empty #93

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b85ff86
Fix after #23262
adobrzyn Aug 21, 2025
edbcd1b
Merge branch 'main' into adobrzyn/hourly_fix_pr23262
adobrzyn Aug 21, 2025
9b688a7
Comment out broken test
adobrzyn Aug 21, 2025
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
15 changes: 11 additions & 4 deletions vllm_gaudi/v1/worker/hpu_model_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,10 +804,15 @@ def _update_states(self, scheduler_output: "SchedulerOutput") -> bool:

# Update the block IDs.
if not resumed_from_preemption:
for block_ids, new_ids in zip(req_state.block_ids,
new_block_ids):
block_ids.extend(new_ids)
if new_block_ids is not None:
# Append the new blocks to the existing block IDs.
for block_ids, new_ids in zip(req_state.block_ids,
new_block_ids):
block_ids.extend(new_ids)
else:
assert new_block_ids is not None
# The request is resumed from preemption.
# Replace the existing block IDs with the new ones.
req_state.block_ids = new_block_ids

req_index = self.input_batch.req_id_to_index.get(req_id)
Expand All @@ -821,7 +826,9 @@ def _update_states(self, scheduler_output: "SchedulerOutput") -> bool:
# Update the persistent batch.
self.input_batch.num_computed_tokens_cpu[req_index] = (
num_computed_tokens)
self.input_batch.block_table.append_row(new_block_ids, req_index)
if new_block_ids is not None:
self.input_batch.block_table.append_row(
new_block_ids, req_index)

# For the last rank, we don't need to update the token_ids_cpu
# because the sampled tokens are already cached.
Expand Down
Loading