[Bugfix][Spec Decode][Structured Output] DSpark: fix the grammar bitmask mapping when the draft budget is zero (#52436)

Signed-off-by: oops-oom <73481342@qq.com>
Co-authored-by: oops-oom <73481342@qq.com>
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
oops-oom
2026-08-16 11:09:23 +00:00
committed by GitHub
co-authored by oops-oom Claude Opus 4.8
parent 84530eb235
commit 4d2a68d64d
3 changed files with 89 additions and 15 deletions
@@ -9,6 +9,7 @@ from vllm.v1.worker.gpu.async_utils import StepTimingSample
from vllm.v1.worker.gpu.spec_decode.adaptive_verification import (
AdaptiveVerificationManager,
)
from vllm.v1.worker.gpu.structured_outputs import _build_grammar_mapping
def make_manager(
@@ -168,3 +169,51 @@ def test_zero_budget_rebuilds_cpu_cu_num_logits():
assert cu_num_logits_np.dtype == scheduled_cu_num_logits.dtype
# The prefill keeps its scheduled tokens; only drafts are dropped.
assert np.array_equal(compacted, np.array([1, 1, 40], dtype=np.int32))
def test_zero_budget_keeps_one_grammar_row_per_scheduled_draft():
# The scheduler sizes the grammar bitmask from the *scheduled* drafts
# (len(drafts) + 1 rows per request), but a zero budget rewrites
# cu_num_logits_np to bonus-only. Deriving the bitmask -> logits mapping
# from those rewritten offsets drops rows and trips the
# `num_masks == len(mapping)` assert in apply_grammar_bitmask.
manager = make_manager(
np.array([[0.9, 0.9], [0.9, 0.9], [1.0, 1.0]], dtype=np.float32),
np.ones(64),
)
manager.req_states.req_id_to_index["prefill"] = 2
manager.req_states.num_computed_tokens_np = np.zeros(3, dtype=np.int32)
manager.req_states.prefill_len.np = np.array([0, 0, 60], dtype=np.int32)
manager._max_total_logits = 2 # < 3 requests * 1 bonus token
scheduled_spec_decode_tokens = {"low": [1, 2], "high": [3, 4]}
manager.get_num_tokens(
{"low": 3, "high": 3, "prefill": 40}, scheduled_spec_decode_tokens
)
assert manager._batch_budget[2] == 0
req_ids = ["low", "high", "prefill"]
num_draft_tokens_per_req = np.array([2, 2, 0], dtype=np.int32)
_, cu_num_logits_np = manager.compact_batch(
num_draft_tokens_per_req,
np.array([3, 3, 40], dtype=np.int32),
np.array([0, 3, 6, 7], dtype=np.int32),
)
mask_stride = manager.num_speculative_steps + manager.num_bonus_tokens
mapping = _build_grammar_mapping(
req_ids,
req_ids,
cu_num_logits_np,
num_draft_tokens_per_req,
manager.num_bonus_tokens,
mask_stride,
)
num_bitmask_rows = sum(
len(scheduled_spec_decode_tokens.get(req_id, ())) + 1 for req_id in req_ids
)
assert len(mapping) == num_bitmask_rows
# (request, position) keys, so the kernel can mask rows the compacted
# device layout no longer has room for.
assert mapping == [0, 1, 2, 3, 4, 5, 6]