Skip to content

Conversation

Superjomn
Copy link
Collaborator

@Superjomn Superjomn commented Sep 5, 2025

Summary by CodeRabbit

  • Bug Fixes
    • Prevented unintended overrides of user/model parameters on non-TensorRT backends by excluding build_config, ensuring consistent configuration across backends.
    • Added strict validation for extra LLM API options loaded from YAML; a clear error is raised if the content isn’t a dictionary, avoiding silent misconfigurations and easing troubleshooting.
    • Improves reliability during serve startup and provides clearer feedback when configuration input is malformed.

Description

Fix the trtllm-serve yaml loading overwrite the CLI commands.

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.

@Superjomn Superjomn requested review from a team as code owners September 5, 2025 02:52
@Superjomn Superjomn changed the base branch from main to release/1.1.0rc2 September 5, 2025 02:52
@Superjomn Superjomn removed request for a team September 5, 2025 02:53
@Superjomn Superjomn requested review from kaiyux and removed request for 2ez4bz, chuangz0, nv-guomingz and yuanjingx87 September 5, 2025 02:53
@Superjomn Superjomn force-pushed the fix-trtllm-serve-yaml branch from 1c35b71 to 2dc3341 Compare September 5, 2025 02:54
@Superjomn
Copy link
Collaborator Author

/bot run

Copy link
Contributor

coderabbitai bot commented Sep 5, 2025

📝 Walkthrough

Walkthrough

Updates in tensorrt_llm/commands/serve.py adjust LLM argument handling: strip build_config from llm_args when backend is not trt, and validate that --extra_llm_api_options YAML loads into a dict before merging into llm_args.

Changes

Cohort / File(s) Summary of Changes
Serve command arg handling
tensorrt_llm/commands/serve.py
- In get_llm_args, remove build_config when backend != trt.
- In serve, after loading extra_llm_api_options YAML, ensure it’s a dict; raise ValueError if not, then apply updates to llm_args.

Sequence Diagram(s)

sequenceDiagram
  autonumber
  participant User
  participant serve.py
  participant YAML Loader as YAML
  participant ArgsBuilder as get_llm_args

  User->>serve.py: launch serve with options
  serve.py->>ArgsBuilder: build llm_args from CLI/config
  alt backend != "trt"
    ArgsBuilder-->>serve.py: llm_args without build_config
  else backend == "trt"
    ArgsBuilder-->>serve.py: llm_args with build_config
  end

  opt extra_llm_api_options provided
    serve.py->>YAML: load YAML file
    YAML-->>serve.py: parsed_object
    alt parsed_object is dict
      serve.py->>serve.py: update llm_args with overrides
    else not a dict
      serve.py-->>User: raise ValueError
    end
  end

  serve.py-->>User: start server with finalized llm_args
Loading

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Possibly related PRs

Suggested reviewers

  • kaiyux
  • nv-guomingz
  • chzblych
✨ 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.
    • 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.
  • 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 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/Issue comments)

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

Other keywords and placeholders

  • Add @coderabbitai ignore or @coderabbit 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.

Status, Documentation and Community

  • Visit our Status Page to check the current availability of CodeRabbit.
  • 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.

@tensorrt-cicd
Copy link
Collaborator

PR_Github #17737 [ run ] triggered by Bot

@tensorrt-cicd
Copy link
Collaborator

PR_Github #17737 [ run ] completed with state DISABLED
L0 testing is limited to prioritized users. User Superjomn is not in the prioritized list. L0 testing cannot be triggered.

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: 2

Caution

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

⚠️ Outside diff range comments (2)
tensorrt_llm/commands/serve.py (2)

1-1: Missing required NVIDIA Apache-2.0 header

Per project guidelines, prepend the NVIDIA Apache-2.0 copyright header (current year) to all source files.

Example:

+# Copyright (c) 2025, NVIDIA CORPORATION.  All rights reserved.
+#
+# 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.

326-344: Add moe_cluster_parallel_size to get_llm_args and include it in llm_args

The CLI arg moe_cluster_parallel_size is passed into get_llm_args but isn’t declared in its signature—so it’s captured by **llm_args_extra_dict and then discarded by the caller. Update the function to accept

moe_cluster_parallel_size: Optional[int] = None

and add

"moe_cluster_parallel_size": moe_cluster_parallel_size,

to the llm_args dict so the cluster size value isn’t silently dropped.

🧹 Nitpick comments (3)
tensorrt_llm/commands/serve.py (3)

347-352: Make YAML validation precise and user-friendly (mapping-only + clear errors)

Current message says “valid yaml file” even when YAML is valid but not a mapping (e.g., list). Also, YAML parse errors aren’t caught.

Proposed improvement:

-    llm_args_extra_dict = {}
-    if extra_llm_api_options is not None:
-        with open(extra_llm_api_options, 'r') as f:
-            llm_args_extra_dict = yaml.safe_load(f)
-    if not isinstance(llm_args_extra_dict, dict):
-        raise ValueError("llm_args_extra_dict must be a valid yaml file")
+    llm_args_extra_dict = {}
+    if extra_llm_api_options is not None:
+        try:
+            with open(extra_llm_api_options, 'r') as f:
+                loaded = yaml.safe_load(f)
+        except yaml.YAMLError as e:
+            raise ValueError(
+                f"Invalid YAML in --extra_llm_api_options '{extra_llm_api_options}': {e}"
+            ) from e
+        if loaded is None:
+            loaded = {}
+        if not isinstance(loaded, dict):
+            raise ValueError(
+                f"--extra_llm_api_options must be a YAML mapping (dict) at top level, got {type(loaded).__name__}"
+            )
+        llm_args_extra_dict = loaded

110-146: Backend sentinel inconsistency (None vs "trt") invites subtle bugs

You normalize to 'pytorch' | '_autodeploy' | None, then later compare against "trt" elsewhere. Prefer consistent explicit values to avoid future footguns like the one fixed above.

Option: keep "trt" instead of None during normalization and treat unknown values as an error.

-    backend = backend if backend in ["pytorch", "_autodeploy"] else None
+    if backend not in ("pytorch", "trt", "_autodeploy"):
+        raise ValueError(f"Invalid backend: {backend}")
+    # keep explicit string for downstream checks/routes

41-43: Comment mismatch with behavior

The comment says “Using print for safety in signal handlers” but uses logger.info. Minor clarity nit.

Update the comment or switch to print(...) as stated.

📜 Review details

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

💡 Knowledge Base configuration:

  • MCP integration is disabled by default for public repositories
  • Jira integration is disabled by default for public repositories
  • Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

📥 Commits

Reviewing files that changed from the base of the PR and between 26fc7da and 2dc3341.

📒 Files selected for processing (1)
  • tensorrt_llm/commands/serve.py (2 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/commands/serve.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/commands/serve.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/commands/serve.py
🧠 Learnings (3)
📓 Common learnings
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.
Learnt from: moraxu
PR: NVIDIA/TensorRT-LLM#6303
File: tests/integration/test_lists/qa/examples_test_list.txt:494-494
Timestamp: 2025-07-28T17:06:08.621Z
Learning: In TensorRT-LLM testing, it's common to have both CLI flow tests (test_cli_flow.py) and PyTorch API tests (test_llm_api_pytorch.py) for the same model. These serve different purposes: CLI flow tests validate the traditional command-line workflow, while PyTorch API tests validate the newer LLM API backend. Both are legitimate and should coexist.
📚 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/commands/serve.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'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/commands/serve.py

@Superjomn Superjomn force-pushed the fix-trtllm-serve-yaml branch from 2dc3341 to 0a5f041 Compare September 5, 2025 06:04
@Superjomn
Copy link
Collaborator Author

/bot run

@tensorrt-cicd
Copy link
Collaborator

PR_Github #17754 [ run ] triggered by Bot

@tensorrt-cicd
Copy link
Collaborator

PR_Github #17754 [ run ] completed with state DISABLED
L0 testing is limited to prioritized users. User Superjomn is not in the prioritized list. L0 testing cannot be triggered.

Signed-off-by: Yan Chunwei <[email protected]>
@kaiyux kaiyux force-pushed the fix-trtllm-serve-yaml branch from 0a5f041 to 3f44dd2 Compare September 5, 2025 23:26
@kaiyux
Copy link
Member

kaiyux commented Sep 5, 2025

/bot run --disable-fail-fast

@tensorrt-cicd
Copy link
Collaborator

PR_Github #17829 [ run ] triggered by Bot

@tensorrt-cicd
Copy link
Collaborator

PR_Github #17829 [ run ] completed with state SUCCESS
/LLM/release-1.1.0rc2/L0_MergeRequest_PR pipeline #85 completed with status: 'SUCCESS'

@kaiyux kaiyux requested review from a team and syuoni and removed request for a team September 6, 2025 08:11
@kaiyux kaiyux merged commit 3b024cb into NVIDIA:release/1.1.0rc2 Sep 6, 2025
5 checks passed
@Superjomn Superjomn deleted the fix-trtllm-serve-yaml branch September 22, 2025 05:38
Superjomn added a commit to Superjomn/TensorRT-LLM that referenced this pull request Sep 22, 2025
Superjomn added a commit that referenced this pull request Sep 23, 2025
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.

3 participants