Skip to content

Conversation

@ziyixiong-nv
Copy link
Collaborator

@ziyixiong-nv ziyixiong-nv commented Aug 5, 2025

Summary by CodeRabbit

  • New Features

    • Added support for tracking and managing separate states for "draft" and "target" modes within requests.
    • Introduced a user-accessible property to toggle draft mode in both C++ and Python APIs.
  • Improvements

    • Enhanced resource management by automatically setting and clearing draft mode during resource preparation using a context manager.
    • Updated draft token preparation to run within the new draft mode context for better state consistency.
    • Refined internal checks to better identify the first context chunk during processing.
  • Bug Fixes

    • Improved handling of context position and prompt length for draft and target modes, reducing potential inconsistencies.

Description

There could be KV cache divergence issue caused by the mutation of context_current_position.
The PR is resolving this issue by separating the context_current_position and prepopulated_prompt_len for target and draft model.

Test Coverage

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.

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)]

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. Examples: "A10-PyTorch-1, xxx". 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. 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.

--post-merge (OPTIONAL) : Run the L0 post-merge pipeline instead of the ordinary L0 pre-merge pipeline.

--extra-stage "H100_PCIe-TensorRT-Post-Merge-1, xxx" (OPTIONAL) : Run the ordinary L0 pre-merge pipeline and specified test stages. Examples: --extra-stage "H100_PCIe-TensorRT-Post-Merge-1, xxx".

--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.

For guidance on mapping tests to stage names, see docs/source/reference/ci-overview.md
and the scripts/test_to_stage_mapping.py helper.

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.

@ziyixiong-nv ziyixiong-nv requested review from a team as code owners August 5, 2025 09:43
@coderabbitai
Copy link
Contributor

coderabbitai bot commented Aug 5, 2025

📝 Walkthrough

Walkthrough

This change introduces separate tracking of context position and prepopulated prompt length for draft and target modes in GenericLlmRequest, adds a flag and methods to select between modes, updates related C++ and Python bindings, and modifies context management in resource preparation and executor logic to support draft mode switching.

Changes

Cohort / File(s) Change Summary
C++: LlmRequest state tracking
cpp/include/tensorrt_llm/batch_manager/llmRequest.h
Replaces single context position and prompt length members with draft/target pairs; adds mUseDraftModel flag and methods to set/query it; updates all relevant methods to select draft/target state based on the flag; resets both states in pause().
C++: Guided decoder logic
cpp/tensorrt_llm/batch_manager/guidedDecoder.cpp
Changes context chunk initialization check to use new isFirstContextChunk() method, reflecting draft/target distinction.
C++: Python/nanobind bindings
cpp/tensorrt_llm/nanobind/batch_manager/bindings.cpp, cpp/tensorrt_llm/pybind/batch_manager/bindings.cpp
Adds use_draft_model read-write property to C++ and Python bindings for GenericLlmRequest, using the new getter/setter.
Python: LlmRequest attribute
tensorrt_llm/_torch/pyexecutor/llm_request.py
Adds use_draft_model attribute to LlmRequest, initialized from the constructor parameter.
Python: Resource manager context
tensorrt_llm/_torch/pyexecutor/resource_manager.py
Adds request_context context manager to set/clear use_draft_model on a batch of requests; updates KVCacheManager to accept is_draft parameter and use the context manager in resource preparation.
Python: KVCacheManager construction
tensorrt_llm/_torch/pyexecutor/_util.py
Passes is_draft flag to all KVCacheManager and MambaHybridCacheManager constructor calls.
Python: Executor draft context
tensorrt_llm/_torch/pyexecutor/py_executor.py
Imports request_context and wraps draft token preparation in the context manager to ensure correct draft flag handling.

Sequence Diagram(s)

sequenceDiagram
    participant Executor
    participant ResourceManager
    participant KVCacheManager
    participant LlmRequest

    Executor->>ResourceManager: prepare_resources(scheduled_batch)
    ResourceManager->>KVCacheManager: prepare_resources(scheduled_batch)
    KVCacheManager->>ResourceManager: request_context(is_draft, scheduled_batch)
    loop For each request in scheduled_batch
        ResourceManager->>LlmRequest: set use_draft_model = is_draft
    end
    KVCacheManager->>KVCacheManager: (resource preparation logic)
    loop For each request in scheduled_batch
        ResourceManager->>LlmRequest: set use_draft_model = False
    end
Loading

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Possibly related PRs

Suggested labels

Community want to contribute

Suggested reviewers

  • HuiGao-NV
  • mikeiovine
  • syuoni
  • lfr-0531

Note

🔌 MCP (Model Context Protocol) integration is now available in Early Access!

Pro users can now connect to remote MCP servers under the Integrations page to get reviews and chat conversations that understand additional development context.


📜 Recent review details

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 6de50c2 and f7b6973.

📒 Files selected for processing (8)
  • cpp/include/tensorrt_llm/batch_manager/llmRequest.h (10 hunks)
  • cpp/tensorrt_llm/batch_manager/guidedDecoder.cpp (1 hunks)
  • cpp/tensorrt_llm/nanobind/batch_manager/bindings.cpp (1 hunks)
  • cpp/tensorrt_llm/pybind/batch_manager/bindings.cpp (1 hunks)
  • tensorrt_llm/_torch/pyexecutor/_util.py (2 hunks)
  • tensorrt_llm/_torch/pyexecutor/llm_request.py (1 hunks)
  • tensorrt_llm/_torch/pyexecutor/py_executor.py (2 hunks)
  • tensorrt_llm/_torch/pyexecutor/resource_manager.py (4 hunks)
🚧 Files skipped from review as they are similar to previous changes (8)
  • tensorrt_llm/_torch/pyexecutor/llm_request.py
  • cpp/tensorrt_llm/batch_manager/guidedDecoder.cpp
  • cpp/tensorrt_llm/pybind/batch_manager/bindings.cpp
  • tensorrt_llm/_torch/pyexecutor/py_executor.py
  • tensorrt_llm/_torch/pyexecutor/_util.py
  • tensorrt_llm/_torch/pyexecutor/resource_manager.py
  • cpp/tensorrt_llm/nanobind/batch_manager/bindings.cpp
  • cpp/include/tensorrt_llm/batch_manager/llmRequest.h
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (1)
  • GitHub Check: Pre-commit Check
✨ Finishing Touches
  • 📝 Generate Docstrings
🧪 Generate unit tests
  • Create PR with unit tests
  • Post copyable unit tests in a comment

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai generate unit tests to generate unit tests for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai or @coderabbitai title anywhere in the PR title to generate the title automatically.

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@ziyixiong-nv
Copy link
Collaborator Author

/bot run

@ziyixiong-nv ziyixiong-nv requested a review from mikeiovine August 5, 2025 09:43
@tensorrt-cicd
Copy link
Collaborator

PR_Github #14133 [ run ] triggered by Bot

@tensorrt-cicd
Copy link
Collaborator

PR_Github #14133 [ run ] completed with state SUCCESS
/LLM/main/L0_MergeRequest_PR pipeline #10662 completed with status: 'FAILURE'

@ziyixiong-nv
Copy link
Collaborator Author

/bot run

@tensorrt-cicd
Copy link
Collaborator

PR_Github #14194 [ run ] triggered by Bot

@tensorrt-cicd
Copy link
Collaborator

PR_Github #14194 [ run ] completed with state SUCCESS
/LLM/main/L0_MergeRequest_PR pipeline #10719 completed with status: 'FAILURE'

@ziyixiong-nv ziyixiong-nv force-pushed the dev-fxiong-kv-cache-divergence-fix branch from 8e3aaa4 to cfd85cb Compare August 6, 2025 03:03
@ziyixiong-nv ziyixiong-nv requested review from a team as code owners August 6, 2025 03:03
@ziyixiong-nv
Copy link
Collaborator Author

/bot run

@tensorrt-cicd
Copy link
Collaborator

PR_Github #14215 [ run ] triggered by Bot

@tensorrt-cicd
Copy link
Collaborator

PR_Github #14215 [ run ] completed with state SUCCESS
/LLM/main/L0_MergeRequest_PR pipeline #10736 completed with status: 'FAILURE'

@ziyixiong-nv
Copy link
Collaborator Author

/bot run

@tensorrt-cicd
Copy link
Collaborator

PR_Github #14251 [ run ] triggered by Bot

@tensorrt-cicd
Copy link
Collaborator

PR_Github #14251 [ run ] completed with state SUCCESS
/LLM/main/L0_MergeRequest_PR pipeline #10758 completed with status: 'FAILURE'

@ziyixiong-nv ziyixiong-nv force-pushed the dev-fxiong-kv-cache-divergence-fix branch 2 times, most recently from f93cb9d to 54418a2 Compare August 7, 2025 03:55
@ziyixiong-nv ziyixiong-nv requested a review from a team as a code owner August 7, 2025 03:55
@ziyixiong-nv ziyixiong-nv requested a review from Tabrizian August 7, 2025 03:55
@ziyixiong-nv
Copy link
Collaborator Author

/bot run

@tensorrt-cicd
Copy link
Collaborator

PR_Github #14381 [ run ] triggered by Bot

@tensorrt-cicd
Copy link
Collaborator

PR_Github #14381 [ run ] completed with state SUCCESS
/LLM/main/L0_MergeRequest_PR pipeline #10870 completed with status: 'FAILURE'

@ziyixiong-nv
Copy link
Collaborator Author

/bot run

@tensorrt-cicd
Copy link
Collaborator

PR_Github #14406 [ run ] triggered by Bot

@tensorrt-cicd
Copy link
Collaborator

PR_Github #14406 [ run ] completed with state SUCCESS
/LLM/main/L0_MergeRequest_PR pipeline #10889 completed with status: 'FAILURE'

@ziyixiong-nv ziyixiong-nv force-pushed the dev-fxiong-kv-cache-divergence-fix branch from 2667b84 to 24cea1d Compare August 8, 2025 02:28
@ziyixiong-nv
Copy link
Collaborator Author

/bot run

@tensorrt-cicd
Copy link
Collaborator

PR_Github #14537 [ run ] triggered by Bot

@tensorrt-cicd
Copy link
Collaborator

PR_Github #14537 [ run ] completed with state SUCCESS
/LLM/main/L0_MergeRequest_PR pipeline #10980 completed with status: 'FAILURE'

@ziyixiong-nv ziyixiong-nv force-pushed the dev-fxiong-kv-cache-divergence-fix branch from 24cea1d to 07886bc Compare August 8, 2025 06:02
@ziyixiong-nv
Copy link
Collaborator Author

/bot run

@tensorrt-cicd
Copy link
Collaborator

PR_Github #14569 [ run ] triggered by Bot

@tensorrt-cicd
Copy link
Collaborator

PR_Github #14569 [ run ] completed with state SUCCESS
/LLM/main/L0_MergeRequest_PR pipeline #11006 completed with status: 'FAILURE'

@ziyixiong-nv ziyixiong-nv force-pushed the dev-fxiong-kv-cache-divergence-fix branch from 07886bc to 6de50c2 Compare August 8, 2025 13:38
@ziyixiong-nv
Copy link
Collaborator Author

/bot run

@tensorrt-cicd
Copy link
Collaborator

PR_Github #14613 [ run ] triggered by Bot

@tensorrt-cicd
Copy link
Collaborator

PR_Github #14613 [ run ] completed with state ABORTED

@ziyixiong-nv ziyixiong-nv force-pushed the dev-fxiong-kv-cache-divergence-fix branch from 6de50c2 to f7b6973 Compare August 9, 2025 00:51
@ziyixiong-nv
Copy link
Collaborator Author

/bot run

@tensorrt-cicd
Copy link
Collaborator

PR_Github #14658 [ run ] triggered by Bot

@tensorrt-cicd
Copy link
Collaborator

PR_Github #14658 [ run ] completed with state SUCCESS
/LLM/main/L0_MergeRequest_PR pipeline #11063 completed with status: 'SUCCESS'
Pipeline passed with automatic retried tests. Check the rerun report for details.

@ziyixiong-nv ziyixiong-nv merged commit de47282 into NVIDIA:main Aug 9, 2025
5 checks passed
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.

4 participants