Skip to content

[https://nvbugs/7071872][fix] Align disaggregation cancellation fixtures with batch state #21994

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

Open
yuxianq wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −11
Open

[https://nvbugs/7071872][fix] Align disaggregation cancellation fixtures with batch state #21994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 0 additions & 6 deletions tests/integration/test_lists/waives.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,6 @@ perf/test_visual_gen_perf_sanity.py::test_visual_gen_e2e[vg_upload-flux2_blackwe
test_e2e.py::test_ptp_quickstart_bert[VANILLA-BertForSequenceClassification-bert/bert-base-uncased-yelp-polarity] SKIP (bug pending, tracked in PR 17414)
test_kimi_k3_specdec.py::test_kimi_k3_sa_specdec_logits_parity SKIP (https://nvbugs/7016339)
unittest/_torch/attention/sparse/csa2/test_module.py::test_fused_native_index_q_and_graph SKIP (https://nvbugs/7039506)
unittest/_torch/disaggregation/test_disagg_idle_cancellation.py::test_cancelled_overlap_request_retires_at_the_existing_post_sampler_boundary[False-already-complete] SKIP (https://nvbugs/7071872)
unittest/_torch/disaggregation/test_disagg_idle_cancellation.py::test_cancelled_overlap_request_retires_at_the_existing_post_sampler_boundary[False-cancelled] SKIP (https://nvbugs/7071872)
unittest/_torch/disaggregation/test_disagg_idle_cancellation.py::test_cancelled_overlap_request_retires_at_the_existing_post_sampler_boundary[True-already-complete] SKIP (https://nvbugs/7071872)
unittest/_torch/disaggregation/test_disagg_idle_cancellation.py::test_cancelled_overlap_request_retires_at_the_existing_post_sampler_boundary[True-cancelled] SKIP (https://nvbugs/7071872)
unittest/_torch/disaggregation/test_disagg_idle_cancellation.py::test_deferred_lora_generation_resumes_from_harvested_host_token SKIP (https://nvbugs/7071872)
unittest/_torch/disaggregation/test_disagg_idle_cancellation.py::test_overlap_marker_changes_only_after_previous_sample_is_harvested[empty] SKIP (https://nvbugs/7071872)
unittest/_torch/misc/test_guided_decoder_errors.py::test_executor_loop_fails_the_request_once_its_batch_is_synchronized SKIP (https://nvbugs/7068781)

@sunnyqgg sunnyqgg Nov 10, 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.

[Required] This is about the six test_disagg_idle_cancellation.py waivers removed just above. The auto-waive PR #21958 for the same bug (nvbugs/7071872) is still open, and it adds these same six cases again as full:CPU/unittest/_torch/disaggregation/test_disagg_idle_cancellation.py::... SKIP (https://nvbugs/7071872) lines.

Its hunk sits in the full: section of this file (around lines 87-93, next to full:CPU/unittest/scripts/test_subprocess_timeouts.py), which this PR does not touch. The prefixed lines are also different text from the unprefixed ones removed here, so #21958 still applies cleanly after this PR and the duplicate-line check does not catch it. If it is merged later, the six restored cases are skipped again on the CPU stage, the only stage that collects this file (l0_cpu.yml:114). Nothing in CI would flag it, and the bug would look fixed.

Please close #21958 as superseded by #21963 plus this PR, or link it here and ask the bot owner to close it.

unittest/_torch/modeling -k "modeling_gemma3" SKIP (https://nvbugs/7066117)
unittest/_torch/modeling -k "modeling_gemma4" SKIP (https://nvbugs/7066117)
Expand Down
13 changes: 8 additions & 5 deletions tests/unittest/_torch/disaggregation/test_disagg_idle_cancellation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
RequestQueueItem,
)
from tensorrt_llm._torch.pyexecutor.llm_request import LlmRequest, LlmResponse, SamplingConfig
from tensorrt_llm._torch.pyexecutor.py_executor import PyExecutor
from tensorrt_llm._torch.pyexecutor.py_executor import BatchState, PyExecutor
from tensorrt_llm._torch.pyexecutor.sampler import (
SampleStateTensorsHostTorch,
SampleStateTorch,
Expand Down Expand Up @@ -134,6 +134,7 @@ def executor(monkeypatch: pytest.MonkeyPatch) -> PyExecutor:
engine.gather_all_responses = False
engine.kv_connector_manager = None
engine.previous_batch = None
engine.capturable_guided_decoder = None
engine.is_encoder_decoder = False
engine._mm_encoder_item_scheduling_enabled = False
engine.dist = SimpleNamespace(
Expand Down Expand Up @@ -510,8 +511,8 @@ def test_existing_compute_request_keeps_post_batch_cancellation(
batch.context_requests_chunking = [request]
else:
batch.generation_requests = [request]
executor.previous_batch = SimpleNamespace(
scheduled_requests=batch, sample_state=SimpleNamespace(requests=[])
executor.previous_batch = BatchState(
scheduled_requests=batch, sample_state=SampleStateTorch(requests=[])
)
executor.active_requests = [request]
_abort(executor, request)
Expand Down Expand Up @@ -613,7 +614,9 @@ def test_cancelled_overlap_request_retires_at_the_existing_post_sampler_boundary
batch.context_requests_chunking = [request]
else:
batch.generation_requests = [request]
executor.previous_batch = SimpleNamespace(scheduled_requests=batch)
executor.previous_batch = BatchState(
scheduled_requests=batch, sample_state=SampleStateTorch(requests=[])
)
executor._is_kv_manager_v2 = True
executor.enable_joint_kv_cache_reuse = False
executor.kv_cache_manager = Mock(spec=["update_resources", "is_preemption_pending"])
Expand Down Expand Up @@ -678,7 +681,7 @@ def _prepare_generation_harvest(executor: PyExecutor, requests: list[LlmRequest]
single_step_greedy=True,
),
)
executor.previous_batch = SimpleNamespace(scheduled_requests=batch, sample_state=state)
executor.previous_batch = BatchState(scheduled_requests=batch, sample_state=state)
sampler = object.__new__(TorchSampler)
sampler.max_seq_len = 1024
sampler._track_pending_steps = False
Expand Down
Loading