[None][fix] Update RMSNorm custom op plumbing #10843
Conversation
📝 WalkthroughWalkthroughThe changes reorganize the fake Torch operator registration for Changes
Estimated code review effort🎯 2 (Simple) | ⏱️ ~12 minutes 🚥 Pre-merge checks | ✅ 2 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing touches
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. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 2
🤖 Fix all issues with AI agents
In `@tensorrt_llm/_torch/modules/rms_norm.py`:
- Around line 102-105: The ValueError raised in the RMSNorm NVFP4 fused path
wrongly uses a `key=` keyword argument (inside the raise in
tensorrt_llm/_torch/modules/rms_norm.py), which will cause a TypeError; replace
the keyword argument by embedding the key information into the error message
(e.g., append `rmsnorm_nvfp4_cast_{key}` to the f-string) or use a logging call
before raising if structured metadata is required, updating the raise in the
function/method where the f"RMSNorm NVFP4 fused path: casting {key} from
{t.dtype} to {hs_2d.dtype}." message is created (look for the raise ValueError
line) so only positional arguments are passed to ValueError.
- Around line 99-107: In _ensure_contiguous_with_dtype, the assignment "t =
t.to(dtype=hs_2d.dtype)" is unreachable because the preceding raise ValueError
always executes on a dtype mismatch; remove that dead assignment so the function
either raises on mismatch (strict behavior) or, if you intended lenient
behavior, replace the raise with a warning and then perform the cast — reference
the _ensure_contiguous_with_dtype function, the t variable and hs_2d.dtype to
locate and fix the logic.
🧹 Nitpick comments (1)
tensorrt_llm/_torch/modules/rms_norm.py (1)
118-119: RedundantNonecheck -nvfp4_scaleis already validated.Since lines 85-88 raise
ValueErrorwhennvfp4_scale is None, the ternary check here is unnecessary—nvfp4_scaleis guaranteed to be non-Noneat this point.♻️ Suggested simplification
- sf_scale = nvfp4_scale.contiguous( - ) if nvfp4_scale is not None else None + sf_scale = nvfp4_scale.contiguous()
JintaoPengCS
changed the title
JintaoPengCS
changed the title
JintaoPengCS
changed the title
JintaoPengCS
changed the title
|
/bot run --disable-fail-fast |
|
PR_Github #32748 [ run ] triggered by Bot. Commit: |
Squashed changes: - update RMSNorm custom op plumbing - tweak fake op stub name - fix NVFP4 RMSNorm dtype-cast warning Signed-off-by: jintaop <jintaop@nvidia.com>
Tidy up NVFP4 RMSNorm fused-path code formatting and remove stray blank lines in torch custom ops. Signed-off-by: jintaop <jintaop@nvidia.com>
|
/bot run --disable-fail-fast |
|
PR_Github #32762 [ run ] triggered by Bot. Commit: |
|
PR_Github #32762 [ run ] completed with state
|
|
/bot run --disable-fail-fast |
|
PR_Github #32820 [ run ] triggered by Bot. Commit: |
Avoid importing fused_add_rms_norm_quant inside RMSNorm; call it via torch.ops.trtllm. Signed-off-by: jintaop <jintaop@nvidia.com>
Use has_residual to clarify when residual was provided, preserving tuple return behavior. Signed-off-by: jintaop <jintaop@nvidia.com>
|
/bot run --disable-fail-fast |
|
PR_Github #32844 [ run ] triggered by Bot. Commit: |
Signed-off-by: jintaop <jintaop@nvidia.com>
|
/bot run --disable-fail-fast |
|
PR_Github #32869 [ run ] triggered by Bot. Commit: |
|
PR_Github #32869 [ run ] completed with state
|
|
/bot run --disable-fail-fast |
|
PR_Github #32931 [ run ] triggered by Bot. Commit: |
|
PR_Github #32931 [ run ] completed with state
|
|
/bot run --disable-fail-fast |
|
PR_Github #33031 [ run ] triggered by Bot. Commit: |
|
PR_Github #33031 [ run ] completed with state
|
|
/bot run --disable-fail-fast |
|
PR_Github #33146 [ run ] triggered by Bot. Commit: |
|
PR_Github #33146 [ run ] completed with state |
Signed-off-by: jintaop <jintaop@nvidia.com>
5 participants
Summary by CodeRabbit
✏️ Tip: You can customize this high-level summary in your review settings.
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
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
/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)]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 thestage-listparameter 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.mdand the
scripts/test_to_stage_mapping.pyhelper.kill
killKill all running builds associated with pull request.
skip
skip --comment COMMENTSkip 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-pipelineReuse 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.