Skip to content

Conversation

@QiJune
Copy link
Collaborator

@QiJune QiJune commented Sep 22, 2025

cherry pick #7725

Summary by CodeRabbit

  • Bug Fixes
    • Fixed an issue in the PyTorch backend where CUDA Graph defaults were applied even when no CUDA Graph configuration was provided. This prevented unintended adjustments to batch size and avoided potential errors when the configuration was absent. Users without a CUDA Graph setup will now see consistent behavior without unexpected modifications.

Description

Test Coverage

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)

  • Any new dependencies have been scanned for license and vulnerabilities

  • CODEOWNERS updated if ownership changes

  • Documentation updated as needed

  • 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

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

Signed-off-by: junq <[email protected]>
@QiJune QiJune requested a review from a team as a code owner September 22, 2025 11:23
@coderabbitai
Copy link
Contributor

coderabbitai bot commented Sep 22, 2025

📝 Walkthrough

Walkthrough

Adjusts PyTorch backend logic in get_llm_args to update cuda_graph_config.max_batch_size only when cuda_graph_config is present/truthy. Previously it assumed presence and modified unconditionally when batch sizes and max_batch_size were unset. No public API changes.

Changes

Cohort / File(s) Summary
PyTorch backend guard for cuda graph config
tensorrt_llm/bench/dataclasses/configuration.py
Wraps in-place updates to updated_llm_args["cuda_graph_config"] behind a truthy check; sets max_batch_size from batch_sizes only if cuda_graph_config exists and both batch_sizes and max_batch_size were previously unset.

Sequence Diagram(s)

sequenceDiagram
  participant C as Caller
  participant CFG as configuration.get_llm_args
  C->>CFG: get_llm_args(params)
  alt backend == "pytorch"
    CFG->>CFG: check cuda_graph_config
    alt cuda_graph_config is truthy
      CFG->>CFG: if batch_sizes set and max_batch_size unset<br/>then set max_batch_size = max(batch_sizes)
    else cuda_graph_config absent/falsey
      Note over CFG: Skip cuda graph modifications
    end
  else other backend
    Note over CFG: Unchanged paths
  end
  CFG-->>C: updated_llm_args
Loading

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Pre-merge checks and finishing touches

❌ Failed checks (2 warnings, 1 inconclusive)
Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%. You can run @coderabbitai generate docstrings to improve docstring coverage.
Description Check ⚠️ Warning The PR description currently contains only "cherry pick #7725" and the repository's template text but the required fields are not filled in. Key required information is missing or incomplete: a title following the template (ticket/type), a Description that explains what changed and why, and Test Coverage that lists relevant tests and how to run them, so reviewers cannot assess the change or its testing. Because these required sections are unpopulated, the description does not meet the repository's template requirements. Please update the PR by adding a proper title per the template (include ticket/issue and [type]), a concise Description outlining the change and rationale, and a Test Coverage section listing relevant tests/commands; complete the PR checklist or mark items N/A and include the original PR/commit reference (#7725) and any cherry-pick notes to help reviewers validate the backport. Once those sections are populated with concrete details, re-request review.
Title Check ❓ Inconclusive The title includes a valid NVBugs link and the [fix] type but only reads "cherry pick #7725" and does not summarize the actual code change; the repository template expects a short descriptive summary of the primary fix so reviewers can understand intent at a glance. Because the title is generic and only indicates a cherry-pick rather than describing the change, its suitability is inconclusive for review. Please update the title to follow the repo template and add a concise summary of the change (for example: "[https://nvbugs/5531963][fix] Guard cuda_graph_config modification in PyTorch backend when absent") and then re-run the checks.
✨ 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

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

@QiJune QiJune changed the title [https://nvbugs/5531963][fix] cherry pick 7725 [https://nvbugs/5531963][fix] cherry pick #7725 Sep 22, 2025
@QiJune
Copy link
Collaborator Author

QiJune commented Sep 22, 2025

/bot run

@QiJune QiJune added the Release Blocker PRs that blocking the final release build or branching out the release branch label Sep 22, 2025
@nv-guomingz nv-guomingz added the Cherry-pick It's a label that applies to Cherry-pick PR. label Sep 22, 2025
@tensorrt-cicd
Copy link
Collaborator

PR_Github #19577 [ run ] triggered by Bot

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
tensorrt_llm/bench/dataclasses/configuration.py (1)

85-86: Dict union operator breaks Python 3.8 compatibility

backend_cache_config | kv_cache_config requires Python 3.9+. Guidelines target Python 3.8+. Replace with unpack merge.

-        llm_args["kv_cache_config"] = backend_cache_config | kv_cache_config
+        llm_args["kv_cache_config"] = {**backend_cache_config, **kv_cache_config}
🧹 Nitpick comments (3)
tensorrt_llm/bench/dataclasses/configuration.py (3)

103-103: Preserve absence semantics for cuda_graph_config

Avoid writing back a None value; keep the key absent if not present originally.

-            updated_llm_args["cuda_graph_config"] = cuda_graph_config
+            if cuda_graph_config is not None:
+                updated_llm_args["cuda_graph_config"] = cuda_graph_config

12-13: Type annotation mismatch and unnecessary class import

get_pytorch_perf_config() returns Dict[str, Any], but is annotated as PyTorchConfig. This also forces an otherwise-unused class import. Align the annotation and drop the import.

-from tensorrt_llm._torch.pyexecutor.config import PyTorchConfig
@@
-    def get_pytorch_perf_config(self) -> PyTorchConfig:
-        return self.pytorch_config
+    def get_pytorch_perf_config(self) -> Dict[str, Any]:
+        return self.pytorch_config

Also applies to: 128-130


1-1: Missing NVIDIA Apache-2.0 header

Per guidelines, add the NVIDIA Apache-2.0 copyright header with the current year.

+# Copyright (c) 2025, NVIDIA CORPORATION.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
📜 Review details

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between bc4136f and 4b6a086.

📒 Files selected for processing (1)
  • tensorrt_llm/bench/dataclasses/configuration.py (1 hunks)
🧰 Additional context used
📓 Path-based instructions (3)
**/*.{h,hpp,hh,hxx,cpp,cxx,cc,cu,cuh,py}

📄 CodeRabbit inference engine (CODING_GUIDELINES.md)

Use only spaces, no tabs; indent with 4 spaces.

Files:

  • tensorrt_llm/bench/dataclasses/configuration.py
**/*.py

📄 CodeRabbit inference engine (CODING_GUIDELINES.md)

**/*.py: Python code must target Python 3.8+.
Indent Python code with 4 spaces; do not use tabs.
Maintain module namespace when importing; prefer 'from package.subpackage import foo' then 'foo.SomeClass()' instead of importing the class directly.
Python filenames should be snake_case (e.g., some_file.py).
Python classes use PascalCase names.
Functions and methods use snake_case names.
Local variables use snake_case; prefix 'k' for variables that start with a number (e.g., k_99th_percentile).
Global variables use upper SNAKE_CASE prefixed with 'G' (e.g., G_MY_GLOBAL).
Constants use upper SNAKE_CASE (e.g., MY_CONSTANT).
Avoid shadowing variables from an outer scope.
Initialize all externally visible members of a class in the constructor.
Prefer docstrings for interfaces that may be used outside a file; comments for in-function or file-local interfaces.
Use Google-style docstrings for classes and functions (Sphinx-parsable).
Document attributes and variables inline so they render under the class/function docstring.
Avoid reflection when a simpler, explicit approach suffices (e.g., avoid dict(**locals()) patterns).
In try/except, catch the most specific exceptions possible.
For duck-typing try/except, keep the try body minimal and use else for the main logic.

Files:

  • tensorrt_llm/bench/dataclasses/configuration.py
**/*.{cpp,cxx,cc,h,hpp,hh,hxx,cu,cuh,py}

📄 CodeRabbit inference engine (CODING_GUIDELINES.md)

Prepend the NVIDIA Apache-2.0 copyright header with current year to the top of all source files (e.g., .cpp, .h, .cu, .py).

Files:

  • tensorrt_llm/bench/dataclasses/configuration.py
🧠 Learnings (3)
📓 Common learnings
Learnt from: MrGeva
PR: NVIDIA/TensorRT-LLM#7219
File: tensorrt_llm/_torch/auto_deploy/compile/backends/torch_cudagraph.py:162-168
Timestamp: 2025-09-04T07:33:10.618Z
Learning: When users explicitly provide cuda_graph_batch_sizes in TorchCudagraphCompiler, respect their choices and only sanitize the values (clamp, dedupe, sort) without forcing additional batch sizes like 1 or max_batch_size. Only add commonly-used batch sizes when falling back to the heuristic.
Learnt from: jiaganc
PR: NVIDIA/TensorRT-LLM#7031
File: tensorrt_llm/bench/dataclasses/configuration.py:90-104
Timestamp: 2025-08-26T09:37:10.463Z
Learning: In TensorRT-LLM's bench configuration, the `get_pytorch_perf_config()` method returns `self.pytorch_config` which is a Dict[str, Any] that can contain default values including `cuda_graph_config`, making the fallback `llm_args["cuda_graph_config"]` safe to use.
Learnt from: jiaganc
PR: NVIDIA/TensorRT-LLM#7031
File: tensorrt_llm/bench/dataclasses/configuration.py:90-104
Timestamp: 2025-08-26T09:37:10.463Z
Learning: In TensorRT-LLM, the `get_pytorch_perf_config()` method returns `self.pytorch_config` which can contain default `cuda_graph_config` values, so `llm_args` may already have this config before the extra options processing.
📚 Learning: 2025-08-26T09:37:10.463Z
Learnt from: jiaganc
PR: NVIDIA/TensorRT-LLM#7031
File: tensorrt_llm/bench/dataclasses/configuration.py:90-104
Timestamp: 2025-08-26T09:37:10.463Z
Learning: In TensorRT-LLM's bench configuration, the `get_pytorch_perf_config()` method returns `self.pytorch_config` which is a Dict[str, Any] that can contain default values including `cuda_graph_config`, making the fallback `llm_args["cuda_graph_config"]` safe to use.

Applied to files:

  • tensorrt_llm/bench/dataclasses/configuration.py
📚 Learning: 2025-08-26T09:37:10.463Z
Learnt from: jiaganc
PR: NVIDIA/TensorRT-LLM#7031
File: tensorrt_llm/bench/dataclasses/configuration.py:90-104
Timestamp: 2025-08-26T09:37:10.463Z
Learning: In TensorRT-LLM, the `get_pytorch_perf_config()` method returns `self.pytorch_config` which can contain default `cuda_graph_config` values, so `llm_args` may already have this config before the extra options processing.

Applied to files:

  • tensorrt_llm/bench/dataclasses/configuration.py
⏰ 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
🔇 Additional comments (1)
tensorrt_llm/bench/dataclasses/configuration.py (1)

93-101: LGTM: Guarded max_batch_size default aligns with respecting user-provided batch sizes

The new guard only defaults max_batch_size when both batch_sizes and max_batch_size are unset, which respects explicit user choices (including empty lists). Please confirm that an explicit empty list for batch_sizes is intended to opt out of auto-defaulting.

@chzblych chzblych enabled auto-merge (squash) September 22, 2025 12:19
@tensorrt-cicd
Copy link
Collaborator

PR_Github #19577 [ run ] completed with state SUCCESS
/LLM/release-1.0/L0_MergeRequest_PR pipeline #438 completed with status: 'SUCCESS'

@chzblych chzblych merged commit 68b7900 into NVIDIA:release/1.0 Sep 22, 2025
5 checks passed
dominicshanshan pushed a commit to dominicshanshan/TensorRT-LLM that referenced this pull request Sep 23, 2025
dominicshanshan pushed a commit to dominicshanshan/TensorRT-LLM that referenced this pull request Sep 23, 2025
dominicshanshan pushed a commit to dominicshanshan/TensorRT-LLM that referenced this pull request Sep 23, 2025
yuanjingx87 pushed a commit that referenced this pull request Sep 23, 2025
dominicshanshan pushed a commit to dominicshanshan/TensorRT-LLM that referenced this pull request Sep 24, 2025
dominicshanshan pushed a commit to dominicshanshan/TensorRT-LLM that referenced this pull request Sep 24, 2025
dominicshanshan pushed a commit to dominicshanshan/TensorRT-LLM that referenced this pull request Sep 24, 2025
dominicshanshan pushed a commit to dominicshanshan/TensorRT-LLM that referenced this pull request Sep 24, 2025
dominicshanshan pushed a commit to dominicshanshan/TensorRT-LLM that referenced this pull request Sep 24, 2025
dominicshanshan pushed a commit to dominicshanshan/TensorRT-LLM that referenced this pull request Sep 24, 2025
dominicshanshan pushed a commit to dominicshanshan/TensorRT-LLM that referenced this pull request Sep 24, 2025
dominicshanshan pushed a commit to dominicshanshan/TensorRT-LLM that referenced this pull request Sep 24, 2025
dominicshanshan pushed a commit to dominicshanshan/TensorRT-LLM that referenced this pull request Sep 25, 2025
chzblych pushed a commit that referenced this pull request Sep 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Cherry-pick It's a label that applies to Cherry-pick PR. Release Blocker PRs that blocking the final release build or branching out the release branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants