Skip to content

[https://nvbugs/6428124][fix] Include use_host_stop_criteria in the PP send/recv payload in… #16134

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

Closed
trtllm-agent wants to merge 2 commits into from
Closed

[https://nvbugs/6428124][fix] Include use_host_stop_criteria in the PP send/recv payload in… #16134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3cb735
[nvbugs/6428124][fix] Forward use_host_stop_criteria over PP ring
trtllm-agent Jul 8, 2026
9a87404
[nvbugs/6428124][chore] Remove stale waiver after fix
HandongLi-01 Jul 24, 2026
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
19 changes: 14 additions & 5 deletions tensorrt_llm/_torch/pyexecutor/py_executor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3883,10 +3883,18 @@ def _ring_broadcast_sample_state(
if not self.dist.is_last_pp_rank:
# Receive tokens from previous pp rank (w.r.t model forward direction)
with nvtx_range("recv_sample_state"):
sample_state.host, py_result_diffs = self.dist.recv_object(
src=self.dist.prev_pp_rank,
tag=tag,
)
(sample_state.host, py_result_diffs,
use_host_stop_criteria) = self.dist.recv_object(
src=self.dist.prev_pp_rank,
tag=tag,
)

# The last PP rank owns the sampling shape. Its fast host stop
# criteria path leaves host.finish_reasons=None, so the flag
# governing update_requests's branching must ride the ring with
# the host state or non-last ranks index into an empty list.
if hasattr(sample_state, "use_host_stop_criteria"):

@brnguyen2 brnguyen2 Aug 11, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

No SampleState subclass defines use_host_stop_criteria, so this hasattr is always False and the assignment never executes — paired with getattr(sample_state, "use_host_stop_criteria", False) on the send side, the flag round-trips as a constant False. If a flag really is needed here it has to be a declared field on the sample-state dataclass, set by the sampler; a hasattr guard just hides that it isn't.

@BowenFu BowenFu Oct 29, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

use_host_stop_criteria no longer exists anywhere on main, so this hasattr check is always false and the sender always ships False. The flag non-last PP ranks actually need is single_step_greedy, and #17828 already moved it onto SampleStateTensorsHostTorch, which travels through the ring as sample_state.host. The py_executor.py change is dead code with a comment describing a fix it doesn't make.

Please drop it and keep only the waiver removal for test_lora_pp2_sanity, which is still waived on main. Required for this PR.

sample_state.use_host_stop_criteria = use_host_stop_criteria

for request, py_result_diff in zip(requests, py_result_diffs):
request.py_result.apply_diff(py_result_diff)
Expand All @@ -3904,7 +3912,8 @@ def _ring_broadcast_sample_state(
self.wait_on_pp_send_handles(self.send_handles, microbatch_id)
with nvtx_range("send_sample_state"):
self.send_handles[microbatch_id] = self.dist.isend_object(
(sample_state.host, py_result_diffs),
(sample_state.host, py_result_diffs,
getattr(sample_state, "use_host_stop_criteria", False)),
dest=self.dist.next_pp_rank,
tag=tag,
)
Expand Down
1 change: 0 additions & 1 deletion tests/integration/test_lists/waives.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ unittest/_torch/modeling_v2/comm/test_modeling_v2_allgather_op_matrix.py::test_a
unittest/_torch/modeling_v2/comm/test_modeling_v2_reducescatter_op_matrix.py::test_reducescatter_op_matrix SKIP (https://nvbugs/6843474)
unittest/_torch/modeling_v2/models/glm_moe_dsa/test_routing.py SKIP (https://nvbugs/6986044)
unittest/_torch/modules/mamba/test_flashinfer_gdn_decode.py SKIP (https://nvbugs/6842831)
unittest/_torch/modules/tests_lora_modules/test_nemotron_h_lora_sanity.py::TestNemotronHLoRA::test_lora_pp2_sanity SKIP (https://nvbugs/6428124)
unittest/_torch/moe/test_moe_backend.py::test_moe_backend[act=Relu2-e60_k4_h2048_i1408-seq=8-dtype=torch.bfloat16-backend=TRTLLM-quant=NVFP4-routing=Renormalize] SKIP (https://nvbugs/5989912)
unittest/_torch/moe/test_moe_backend.py::test_trtllm_bf16_unquantized_moe[deepseekv3-relu2-8-separated_routing] SKIP (https://nvbugs/6778221)
unittest/_torch/multi_gpu/test_linear.py::test_row_linear_norm_fusion[2-hidden:16-seqlen:2] SKIP (https://nvbugs/6501404)
Expand Down
Loading