Skip to content

[Bugfix] Padded Eagle Specdec with Chunked Prefill #26263

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
merged 11 commits into from
Nov 3, 2025
Merged

[Bugfix] Padded Eagle Specdec with Chunked Prefill #26263

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4dda0af
Fix padded specdec when chunked prefill
Flechman Oct 5, 2025
b43e38b
Add test
Flechman Oct 6, 2025
9c12233
Merge branch 'main' into fix-eagle-prepare-padded
Flechman Oct 7, 2025
37d8b4e
Fix test
Flechman Oct 7, 2025
9e2d600
Merge branch 'main' into fix-eagle-prepare-padded
Flechman Oct 13, 2025
ba459e2
Run on GPU
Flechman Oct 13, 2025
5653a73
Merge branch 'fix-eagle-prepare-padded' of github.com:Flechman/vllm i…
Flechman Oct 13, 2025
ee2d558
Merge branch 'main' into fix-eagle-prepare-padded
benchislett Oct 14, 2025
f5d2383
Merge branch 'main' into fix-eagle-prepare-padded
Flechman Oct 31, 2025
ee4d38e
Merge branch 'main' into fix-eagle-prepare-padded
Flechman Nov 1, 2025
3c6ede2
Fix test
Flechman Nov 2, 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
10 changes: 3 additions & 7 deletions vllm/v1/spec_decode/eagle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,13 +522,9 @@ def prepare_next_token_ids_padded(
)

# Generate a mask for all valid tokens within those requests
max_gen_len = sampled_token_ids.shape[-1]
if max_gen_len == 1:
valid_mask = torch.ones_like(valid_sampled_token_ids_gpu, dtype=torch.bool)
else:
valid_mask = (valid_sampled_token_ids_gpu != -1) & (
valid_sampled_token_ids_gpu < gpu_input_batch.vocab_size
)
valid_mask = (valid_sampled_token_ids_gpu != -1) & (
valid_sampled_token_ids_gpu < gpu_input_batch.vocab_size
)
Comment on lines 553 to 555
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Oct 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

This simplification is a great improvement. By removing the special case for max_gen_len == 1, the code is now more robust. The previous logic didn't account for discarded requests when max_gen_len == 1, which could lead to using an invalid token ID of -1. This unified approach correctly handles all cases.


# Count the number of valid tokens in each request
valid_sampled_tokens_count = valid_mask.sum(dim=1)
Expand Down