Skip to content
Merged
Show file tree
Hide file tree
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: 4 additions & 1 deletion tensorrt_llm/_torch/speculative/eagle3.py
Original file line number Diff line number Diff line change
Expand Up @@ -1159,7 +1159,10 @@ def sample_and_accept_draft_tokens(
self.spec_config.end_thinking_phase_token)

num_accepted_tokens = self._apply_force_accepted_tokens(
num_accepted_tokens, num_contexts, runtime_draft_len)
num_accepted_tokens,
num_contexts,
runtime_draft_len,
spec_metadata=spec_metadata)

return accepted_tokens, num_accepted_tokens

Expand Down
10 changes: 8 additions & 2 deletions tensorrt_llm/_torch/speculative/eagle3_dynamic_tree.py
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,10 @@ def _sample_and_accept_dynamic_tree(
)

num_accepted_tokens = self._apply_force_accepted_tokens(
num_accepted_tokens, num_contexts, self.max_draft_len
num_accepted_tokens,
num_contexts,
self.max_draft_len,
spec_metadata=spec_metadata,
)

return accepted_tokens, num_accepted_tokens
Expand Down Expand Up @@ -968,7 +971,10 @@ def _sample_and_accept_dynamic_tree_rejection(
)

num_accepted_tokens = self._apply_force_accepted_tokens(
num_accepted_tokens, num_contexts, self.max_draft_len
num_accepted_tokens,
num_contexts,
self.max_draft_len,
spec_metadata=spec_metadata,
)

return accepted_tokens, num_accepted_tokens
Expand Down
28 changes: 24 additions & 4 deletions tensorrt_llm/_torch/speculative/interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -1005,8 +1005,11 @@ def _ensure_force_accept_rng_state(self, device: torch.device) -> None:
dtype=torch.int64,
device=device)

def _apply_force_accepted_tokens(self, num_accepted_tokens, num_contexts,
runtime_draft_len: int):
def _apply_force_accepted_tokens(self,
num_accepted_tokens,
num_contexts,
runtime_draft_len: int,
spec_metadata=None):
"""
Apply a forced (synthetic) number of accepted draft tokens if the
``TLLM_SPEC_DECODE_FORCE_NUM_ACCEPTED_TOKENS`` environment variable is
Expand All @@ -1033,13 +1036,24 @@ def _apply_force_accepted_tokens(self, num_accepted_tokens, num_contexts,
accepted counts (target token + accepted draft tokens).
num_contexts: Number of context (prefill) requests in the batch.
runtime_draft_len: The draft length for the current iteration.
spec_metadata: Optional SpecMetadata. When provided, used to
detect eager CUDA-graph warmup so the override is skipped
there — warmup batches use dummy requests whose KV cache and
draft buffers are not populated for an inflated accepted
count, which would drive downstream MTP ops out-of-bounds.

Returns:
Modified num_accepted_tokens tensor.
"""
if self.force_num_accepted_tokens == 0.0:
return num_accepted_tokens

if spec_metadata is not None:
is_warmup = (spec_metadata.is_cuda_graph
and not torch.cuda.is_current_stream_capturing())
if is_warmup:
return num_accepted_tokens

Comment thread
longlee0622 marked this conversation as resolved.
# Decompose into a deterministic integer part (always accepted) and a
# probabilistic fractional part. ``int(...)`` truncates toward zero,
# which matches floor for the supported non-negative range.
Expand Down Expand Up @@ -1151,7 +1165,10 @@ def _sample_and_accept_draft_tokens_base(

# Apply force override if set
num_accepted_tokens = self._apply_force_accepted_tokens(
num_accepted_tokens, num_contexts, runtime_draft_len)
num_accepted_tokens,
num_contexts,
runtime_draft_len,
spec_metadata=spec_metadata)

return accepted_tokens, num_accepted_tokens

Expand Down Expand Up @@ -1336,7 +1353,10 @@ def _sample_and_accept_draft_tokens_rejection(
num_accepted_tokens[num_contexts:] = gen_num_accepted

num_accepted_tokens = self._apply_force_accepted_tokens(
num_accepted_tokens, num_contexts, runtime_draft_len)
num_accepted_tokens,
num_contexts,
runtime_draft_len,
spec_metadata=spec_metadata)
return accepted_tokens, num_accepted_tokens

def _draft_sampler_greedy(self, logits: torch.Tensor, d2t=None):
Expand Down
12 changes: 8 additions & 4 deletions tensorrt_llm/_torch/speculative/mtp.py
Original file line number Diff line number Diff line change
Expand Up @@ -826,8 +826,10 @@ def sample_and_accept_draft_tokens(

# Apply force override for relaxed acceptance path
num_accepted_tokens = self._apply_force_accepted_tokens(
num_accepted_tokens, num_contexts,
spec_metadata.runtime_draft_len)
num_accepted_tokens,
num_contexts,
spec_metadata.runtime_draft_len,
spec_metadata=spec_metadata)

# Strict acceptance
else:
Expand All @@ -843,8 +845,10 @@ def sample_and_accept_draft_tokens(

# Apply force override for THOP path
num_accepted_tokens = self._apply_force_accepted_tokens(
num_accepted_tokens, num_contexts,
spec_metadata.runtime_draft_len)
num_accepted_tokens,
num_contexts,
spec_metadata.runtime_draft_len,
spec_metadata=spec_metadata)
else:
# Reshape draft tokens for base implementation
draft_tokens = spec_metadata.draft_tokens.reshape(
Expand Down
Loading