Skip to content

[TRTLLM-14388][refactor] BREAKING: Force 2 model spec dec to fall back to 1 model - #17366

Merged
mikeiovine merged 1 commit into
NVIDIA:mainfrom
mikeiovine:force-one-model
Aug 12, 2026
Merged

[TRTLLM-14388][refactor] BREAKING: Force 2 model spec dec to fall back to 1 model#17366
mikeiovine merged 1 commit into
NVIDIA:mainfrom
mikeiovine:force-one-model

Conversation

@mikeiovine

@mikeiovine mikeiovine commented Aug 6, 2026

Copy link
Copy Markdown
Collaborator

Description

First step of 2-model removal. Before removing the flags, make it so that all users are forced to use 1-model.

After this change, we can start to remove internal code piece by piece. Then, we can slowly delete tests and remove the API all together. Doing it step by step will avoid merge conflict difficulties.

Test Coverage

Removed some existing tests that were 2-model only. They no longer work on this change (usually because they relied on some misbehavior of 2-model). All this stuff has coverage elsewhere

PR Checklist

Please review the following before submitting your PR:

  • PR description clearly explains what and why. If using CodeRabbit's summary, please make sure it makes sense.

  • PR Follows TRT-LLM CODING GUIDELINES to the best of your knowledge.

  • Test cases are provided for new code paths (see test instructions)

  • If PR introduces API changes, an appropriate PR label is added - either api-compatible or api-breaking. For api-breaking, include BREAKING in the PR title.

  • Any new dependencies have been scanned for license and vulnerabilities

  • CODEOWNERS updated if ownership changes

  • Documentation updated as needed

  • Update tava architecture diagram if there is a significant design change in PR.

  • The reviewers assigned automatically/manually are appropriate for the PR.

  • Please check this after reviewing the above items as appropriate for this PR.

GitHub Bot Help

To see a list of available CI bot commands, please comment /bot help.

Dev Engineer Review

  • Updated EAGLE3 and EAGLE-style MTP configurations to require the one-model implementation.
  • When a two-model flag is set to False, the code warns, resets it to True, and continues with one-model behavior.
  • Removed the obsolete AutoDeploy behavior that forced DraftTargetDecodingConfig into two-model mode.
  • No public declarations, configuration files, or test-list files changed.
  • The change matches the stated breaking refactor.
  • Review should confirm that warning behavior and configuration mutation follow project coding guidelines.

QA Engineer Review

  • Modified test_mtp_shared_kv_config.
    • Removed the one_model parameter.
    • Removed the mtp_eagle_one_model configuration from test cases.
    • Retained architecture and shared-KV behavior coverage.
  • Removed test_deepseek_eagle3.
  • Removed test_eagle3_cuda_graph_padding.
  • No matching entries were found in tests/integration/test_lists/, test-db/, or qa/.
  • CI coverage for the modified and removed test functions is not established.
  • Verdict: needs follow-up.

@mikeiovine

Copy link
Copy Markdown
Collaborator Author

/bot run --disable-fail-fast

@mikeiovine mikeiovine added the api-breaking Accepted LLM API contract change that is backwards-incompatible label Aug 6, 2026
@mikeiovine mikeiovine changed the title [TRTLLM-14388][refactor] Force 2 model spec dec to fall back to 1 model [TRTLLM-14388][refactor] BREAKING: Force 2 model spec dec to fall back to 1 model Aug 6, 2026
@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #64369 [ run ] triggered by Bot. Commit: 1066a4f Link to invocation

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #64369 [ run ] completed with state SUCCESS. Commit: 1066a4f
/LLM/main/L0_MergeRequest_PR pipeline #52261 completed with status: 'FAILURE'

CI Report

⚠️ Action Required:

  • Please check the failed tests and fix your PR
  • If you cannot view the failures, ask the CI triggerer to share details
  • Once fixed, request an NVIDIA team member to trigger CI again

CI Agent Failure Analysis

Link to invocation

@mikeiovine
mikeiovine marked this pull request as ready for review August 7, 2026 19:29
@mikeiovine
mikeiovine requested a review from a team as a code owner August 7, 2026 19:29
@mikeiovine

Copy link
Copy Markdown
Collaborator Author

/bot run

@coderabbitai

coderabbitai Bot commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 233ce5f2-4238-4670-9362-05d553d2830d

📥 Commits

Reviewing files that changed from the base of the PR and between e34db64 and 0393ec8.

📒 Files selected for processing (1)
  • tensorrt_llm/llmapi/llm_args.py
🚧 Files skipped from review as they are similar to previous changes (1)
  • tensorrt_llm/llmapi/llm_args.py

Walkthrough

EAGLE3 and MTP validation now enforces one-model operation and warns when disabled. AutoDeploy no longer selects two-model DraftTarget decoding. The shared-KV test no longer configures the removed option, and deprecated Eagle3 tests were deleted.

Changes

Speculative decoding configuration

Layer / File(s) Summary
Enforce one-model configuration
tensorrt_llm/llmapi/llm_args.py
EAGLE3 and MTP documentation and validation now require one-model operation. Disabled flags are reset to True with warnings. AutoDeploy no longer forces DraftTarget decoding into two-model mode.
Align speculative decoding tests
tests/unittest/_torch/speculative/hw_agnostic/test_mtp.py, tests/unittest/_torch/speculative/test_eagle3.py
The shared-KV test no longer sets mtp_eagle_one_model. Two deprecated Eagle3 test cases were removed.

Estimated code review effort: 2 (Simple) | ~10 minutes

Suggested reviewers: allisonlim-nv, cascade812

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly identifies the breaking refactor that forces two-model specifications to use one-model mode.
Description check ✅ Passed The description explains the rationale, implementation approach, affected tests, and checklist status with sufficient detail.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands.

@coderabbitai coderabbitai Bot left a comment

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.

Actionable comments posted: 2

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@tensorrt_llm/llmapi/llm_args.py`:
- Around line 2104-2106: Regenerate the LLM-args golden manifest after the
EAGLE3 and MTP metadata or behavior changes by running
scripts/generate_llm_args_golden_manifest.py, then commit the resulting update
to llm_args_golden_manifest.json.

In `@tests/unittest/_torch/speculative/hw_agnostic/test_mtp.py`:
- Around line 1745-1754: Extend test_mtp_shared_kv_config to accept and pass
mtp_eagle_one_model=False, then assert the resulting configuration stores it as
True and spec_dec_mode.is_mtp_eagle_one_model() returns true. Preserve the
existing architecture parameterization and coverage for both architecture
values.
🪄 Autofix

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: f2525f3b-109b-4120-b803-c695bcbc826a

📥 Commits

Reviewing files that changed from the base of the PR and between 2c96f94 and e34db64.

📒 Files selected for processing (3)
  • tensorrt_llm/llmapi/llm_args.py
  • tests/unittest/_torch/speculative/hw_agnostic/test_mtp.py
  • tests/unittest/_torch/speculative/test_eagle3.py
💤 Files with no reviewable changes (1)
  • tests/unittest/_torch/speculative/test_eagle3.py

Comment thread tensorrt_llm/llmapi/llm_args.py
Comment thread tests/unittest/_torch/speculative/hw_agnostic/test_mtp.py
@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #64690 [ run ] triggered by Bot. Commit: e34db64 Link to invocation

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #64690 [ run ] completed with state SUCCESS. Commit: e34db64
/LLM/main/L0_MergeRequest_PR pipeline #52546 completed with status: 'FAILURE'

CI Report

⚠️ Action Required:

  • Please check the failed tests and fix your PR
  • If you cannot view the failures, ask the CI triggerer to share details
  • Once fixed, request an NVIDIA team member to trigger CI again

CI Agent Failure Analysis

Link to invocation

Signed-off-by: Mike Iovine <miovine@nvidia.com>
@mikeiovine

Copy link
Copy Markdown
Collaborator Author

/bot run

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #65055 [ run ] triggered by Bot. Commit: 0393ec8 Link to invocation

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #65055 [ run ] completed with state SUCCESS. Commit: 0393ec8
/LLM/main/L0_MergeRequest_PR pipeline #52862 completed with status: 'FAILURE'

CI Report

⚠️ Action Required:

  • Please check the failed tests and fix your PR
  • If you cannot view the failures, ask the CI triggerer to share details
  • Once fixed, request an NVIDIA team member to trigger CI again

CI Agent Failure Analysis

Link to invocation

@mikeiovine

Copy link
Copy Markdown
Collaborator Author

/bot run

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #65098 [ run ] triggered by Bot. Commit: 0393ec8 Link to invocation

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #65098 [ run ] completed with state SUCCESS. Commit: 0393ec8
/LLM/main/L0_MergeRequest_PR pipeline #52899 completed with status: 'SUCCESS'

CI Report

Link to invocation

@mikeiovine

Copy link
Copy Markdown
Collaborator Author

/bot help

@github-actions

Copy link
Copy Markdown

GitHub Bot Help

/bot [-h] ['run', 'kill', 'skip', 'reuse-pipeline'] ...

Provide a user friendly way for developers to interact with a Jenkins server.

Run /bot [-h|--help] to print this help message.

See details below for each supported subcommand.

Details

run [--reuse-test (optional)pipeline-id --disable-fail-fast --skip-test --stage-list "A10-PyTorch-1, xxx" --gpu-type "A30, H100_PCIe" --test-backend "pytorch, cpp" --add-multi-gpu-test --only-multi-gpu-test --disable-multi-gpu-test --post-merge --extra-stage "H100_PCIe-TensorRT-Post-Merge-1, xxx" --detailed-log --debug(experimental) --high-priority]

Launch build/test pipelines. All previously running jobs will be killed.

--reuse-test (optional)pipeline-id (OPTIONAL) : Allow the new pipeline to reuse build artifacts and skip successful test stages from a specified pipeline or the last pipeline if no pipeline-id is indicated. If the Git commit ID has changed, this option will be always ignored. The DEFAULT behavior of the bot is to reuse build artifacts and successful test results from the last pipeline.

--disable-reuse-test (OPTIONAL) : Explicitly prevent the pipeline from reusing build artifacts and skipping successful test stages from a previous pipeline. Ensure that all builds and tests are run regardless of previous successes.

--disable-fail-fast (OPTIONAL) : Disable fail fast on build/tests/infra failures.

--skip-test (OPTIONAL) : Skip all test stages, but still run build stages, package stages and sanity check stages. Note: Does NOT update GitHub check status.

--stage-list "A10-PyTorch-1, xxx" (OPTIONAL) : Only run the specified test stages. Supports wildcard * for pattern matching (e.g., "*PerfSanity*" matches all stages containing PerfSanity). Examples: "A10-PyTorch-1, xxx", "PerfSanity". The patterns "*", "*Post-Merge*", and "*PerfSanity*", including equivalent escaped or repeated-star forms and their use in comma-separated lists, require the ci: post-merge approved PR label. Note: Does NOT update GitHub check status.

--gpu-type "A30, H100_PCIe" (OPTIONAL) : Only run the test stages on the specified GPU types. Examples: "A30, H100_PCIe". Note: Does NOT update GitHub check status.

--test-backend "pytorch, cpp" (OPTIONAL) : Skip test stages which don't match the specified backends. Only support [pytorch, cpp, tensorrt, triton]. Examples: "pytorch, cpp" (does not run test stages with tensorrt or triton backend). Note: Does NOT update GitHub pipeline status.

--only-multi-gpu-test (OPTIONAL) : Only run the multi-GPU tests. Requires the ci: full pre-merge approved label on the PR (ask a member of NVIDIA/trt-llm-ci-approvers). Note: Does NOT update GitHub check status.

--disable-multi-gpu-test (OPTIONAL) : Disable the multi-GPU tests. Note: Does NOT update GitHub check status.

--add-multi-gpu-test (OPTIONAL) : Force run the multi-GPU tests in addition to running L0 pre-merge pipeline. Requires the ci: full pre-merge approved label on the PR (ask a member of NVIDIA/trt-llm-ci-approvers).

--post-merge (OPTIONAL) : Run the L0 post-merge pipeline instead of the ordinary L0 pre-merge pipeline. Requires the ci: post-merge approved PR label applied by an active member of NVIDIA/trt-llm-ci-approvers. The approval label remains in place when new commits are pushed.

--extra-stage "H100_PCIe-TensorRT-Post-Merge-1, xxx" (OPTIONAL) : Run the ordinary L0 pre-merge pipeline and specified test stages. Supports wildcard * for pattern matching. Examples: --extra-stage "H100_PCIe-TensorRT-Post-Merge-1, xxx", --extra-stage "Post-Merge". The patterns "*", "*Post-Merge*", and "*PerfSanity*", including equivalent escaped or repeated-star forms and their use in comma-separated lists, require the ci: post-merge approved PR label.

--detailed-log (OPTIONAL) : Enable flushing out all logs to the Jenkins console. This will significantly increase the log volume and may slow down the job.

--debug (OPTIONAL) : Experimental feature. Enable access to the CI container for debugging purpose. Note: Specify exactly one stage in the stage-list parameter to access the appropriate container environment. Note: Does NOT update GitHub check status.

--high-priority (OPTIONAL) : Run the pipeline with high priority. This option is restricted to authorized users only and will route the job to a high-priority queue.

kill

kill

Kill all running builds associated with pull request.

skip

skip --comment COMMENT

Skip testing for latest commit on pull request. --comment "Reason for skipping build/test" is required. IMPORTANT NOTE: This is dangerous since lack of user care and validation can cause top of tree to break.

reuse-pipeline

reuse-pipeline

Reuse a previous pipeline to validate current commit. This action will also kill all currently running builds associated with the pull request. IMPORTANT NOTE: This is dangerous since lack of user care and validation can cause top of tree to break.

@mikeiovine

Copy link
Copy Markdown
Collaborator Author

/bot run --only-multi-gpu-test

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #65306 [ run ] triggered by Bot. Commit: 0393ec8 Link to invocation

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #65306 [ run ] completed with state FAILURE. Commit: 0393ec8
/LLM/main/L0_MergeRequest_PR pipeline #53082 (Partly Tested) completed with status: 'FAILURE'

CI Report

⚠️ Action Required:

  • Please check the failed tests and fix your PR
  • If you cannot view the failures, ask the CI triggerer to share details
  • Once fixed, request an NVIDIA team member to trigger CI again

CI Agent Failure Analysis

Link to invocation

@mikeiovine

Copy link
Copy Markdown
Collaborator Author

/bot run --only-multi-gpu-test

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #65373 [ run ] triggered by Bot. Commit: 0393ec8 Link to invocation

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #65373 [ run ] completed with state SUCCESS. Commit: 0393ec8
/LLM/main/L0_MergeRequest_PR pipeline #53136 (Partly Tested) completed with status: 'SUCCESS'

CI Report

Link to invocation

@mikeiovine

Copy link
Copy Markdown
Collaborator Author

/bot skip --comment "Single GPU and multi GPU passed on separate runs"

@mikeiovine
mikeiovine enabled auto-merge (squash) August 12, 2026 15:19
@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #65598 [ skip ] triggered by Bot. Commit: 0393ec8 Link to invocation

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #65598 [ skip ] completed with state SUCCESS. Commit: 0393ec8
Skipping testing for commit 0393ec8

Link to invocation

@mikeiovine
mikeiovine merged commit 1e6a8cb into NVIDIA:main Aug 12, 2026
11 checks passed
@mikeiovine
mikeiovine deleted the force-one-model branch August 12, 2026 15:32
brnguyen2 added a commit to brnguyen2/TensorRT-LLM that referenced this pull request Aug 14, 2026
…r exists)

The waive entry pointed at
unittest/_torch/modeling/test_modeling_gpt_oss.py::test_gpt_oss_two_model_eagle3_falls_back_to_v1,
which was removed from main as obsolete in NVIDIA#17597 (commit 8398196).
The 2-model Eagle3 fallback scenario it asserted was invalidated when
NVIDIA#17366 forced 2-model spec-dec to fall back to 1-model, so the test was
deleted rather than fixed. Waiving a nonexistent test fails the AST-based
validate-test-lists pre-commit hook (check_test_list.py --validate) and
gates the whole pipeline. NVBug 6606544 is moot now that the test is gone.

Signed-off-by: Brian Nguyen <brnguyen@nvidia.com>
brnguyen2 added a commit to brnguyen2/TensorRT-LLM that referenced this pull request Aug 16, 2026
…r exists)

The waive entry pointed at
unittest/_torch/modeling/test_modeling_gpt_oss.py::test_gpt_oss_two_model_eagle3_falls_back_to_v1,
which was removed from main as obsolete in NVIDIA#17597 (commit 8398196).
The 2-model Eagle3 fallback scenario it asserted was invalidated when
NVIDIA#17366 forced 2-model spec-dec to fall back to 1-model, so the test was
deleted rather than fixed. Waiving a nonexistent test fails the AST-based
validate-test-lists pre-commit hook (check_test_list.py --validate) and
gates the whole pipeline. NVBug 6606544 is moot now that the test is gone.

Signed-off-by: Brian Nguyen <brnguyen@nvidia.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

api-breaking Accepted LLM API contract change that is backwards-incompatible ci: full pre-merge approved

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants