Skip to content

[TRTLLM-17121][fix] Sync output-slice review fixes to Helix aggregate - #21238

Merged
zhaoyuanh-nvidia merged 1 commit into
NVIDIA:feat/helix-aggfrom
zhaoyuanh-nvidia:fix/helix-agg-pr20833-review-20261028
Oct 29, 2026
Merged

zhaoyuanh-nvidia merged 1 commit into
NVIDIA:feat/helix-aggfrom
zhaoyuanh-nvidia:fix/helix-agg-pr20833-review-20261028

Conversation

@zhaoyuanh-nvidia

@zhaoyuanh-nvidia zhaoyuanh-nvidia commented Oct 29, 2026 •

Copy link
Copy Markdown
Collaborator

Description

Bring the remaining compatible review fixes from merged #20833 into feat/helix-agg, whose original phase-dependent MLA port landed in #20920. This PR is intentionally limited to four files; it does not synchronize main or rewrite the shared feature branch.

  • Delegate output-slice preparation to each linear method while retaining the common range, parallelism, locality-domain, and LoRA guards.
  • Keep unsupported quantized methods fail-closed and add CPU coverage for custom-method dispatch and unsupported-method rejection.
  • Initialize context-head metadata in the bare MLA locality-domain test fixture and register the new CPU test.

The two low-M dispatch tests from #20833 depend on APIs not yet present on this feature branch. They belong with the separate main synchronization, not with this narrow backport. Later feature work is unchanged.

Test Coverage

  • Source-extracted CPU contract probe: 27 passed, 6 native R128c4 cases deselected. This uses stub Linear construction; it is not a native TensorRT-LLM pytest or GPU run.
  • Bad/fixed/restored-bad control: the same custom-method dispatch test fails on the feature base, passes with this change, and fails again when the base implementation is restored.
  • Pre-commit hooks passed across the full-repository run plus the type-check retry using Git Bash. The staged-file run passed; no repository hook configuration changed. Mypy used its lightweight no-native-bindings mode (16 source files).
  • Python compilation, staged-source equivalence/scope audit, and git diff --check passed.
  • Native TensorRT-LLM and GPU validation remain for CI.

Integration

One DCO-signed-off commit, targeting feat/helix-agg. Merge this narrow fix before the separate main synchronization PR #21240. That follow-up preserves upstream ancestry with a merge commit rather than rewriting the shared feature branch. No automatic merge requested.

Signed-off-by: Zhaoyuan He <195028209+zhaoyuanh-nvidia@users.noreply.github.com>
@zhaoyuanh-nvidia
zhaoyuanh-nvidia requested review from a team as code owners October 29, 2026 04:20
@zhaoyuanh-nvidia
zhaoyuanh-nvidia merged commit dae6d1e into NVIDIA:feat/helix-agg Oct 29, 2026
12 checks passed
zhaoyuanh-nvidia added a commit to zhaoyuanh-nvidia/TensorRT-LLM that referenced this pull request Oct 29, 2026
Refresh the main synchronization on the squash-merged review fixes from NVIDIA#21238. Preserve feature history and main ancestry, retain the validated Helix conflict resolutions, and integrate the latest upstream attention-test-list updates.

Signed-off-by: Zhaoyuan He <195028209+zhaoyuanh-nvidia@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant