KEMBAR78
[None][fix] Ensure that the W4A8 custom input scale remains aligned across all ranks by yilin-void · Pull Request #7614 · NVIDIA/TensorRT-LLM · GitHub
Skip to content

Conversation

@yilin-void
Copy link
Collaborator

@yilin-void yilin-void commented Sep 8, 2025

Summary by CodeRabbit

  • Bug Fixes
    • Fixed inconsistent loading of input quantization scales for W4A8 custom MoE, aligning scales across experts and ranks to prevent mismatches.
    • Improves inference stability and output quality in distributed setups using W4A8 custom quantization.
    • Preserves existing behavior for non-W4A8 configurations; no changes to public APIs.

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.

@yilin-void yilin-void requested a review from a team as a code owner September 8, 2025 10:53
@yilin-void yilin-void requested a review from QiJune September 8, 2025 10:53
@coderabbitai
Copy link
Contributor

coderabbitai bot commented Sep 8, 2025

📝 Walkthrough

Walkthrough

Adds alignment logic in load_quant_scales for W4A8 custom: selects expert IDs differently, loads input scales for w3/w1 across selected experts, computes a cross-layer max scale, and uses it to set fc31_act_scale and fc31_alpha. Non-W4A8 paths retain existing per-expert scale logic.

Changes

Cohort / File(s) Summary of Changes
Fused MoE quantization scales loading
tensorrt_llm/_torch/modules/fused_moe/quantization.py
Updated load_quant_scales: choose input_scale_expert_ids (all experts for W4A8 custom, local otherwise); iterate over these for w3/w1 input_scale loading; compute all_w3_w1_input_scales_max and use it to set fc31_act_scale/fc31_alpha in W4A8 custom path; preserve existing vanilla path behavior.

Sequence Diagram(s)

sequenceDiagram
  autonumber
  participant Caller
  participant QuantModule as Quant Module (MoE)
  participant Storage as Scale Storage

  Caller->>QuantModule: load_quant_scales()
  alt W4A8 custom
    QuantModule->>QuantModule: input_scale_expert_ids = range(num_experts)
    loop For each expert in input_scale_expert_ids
      QuantModule->>Storage: load w3.input_scale[expert]
      QuantModule->>Storage: load w1.input_scale[expert]
    end
    QuantModule->>QuantModule: all_w3_w1_input_scales_max = max(loaded w3/w1 scales)
    QuantModule->>QuantModule: set fc31_act_scale, fc31_alpha using max
  else Non-W4A8
    QuantModule->>QuantModule: input_scale_expert_ids = initial_local_expert_ids
    loop For each expert in input_scale_expert_ids
      QuantModule->>Storage: load w3.input_scale[expert]
      QuantModule->>Storage: load w1.input_scale[expert]
    end
    QuantModule->>QuantModule: retain existing pre_quant per-expert logic
  end
  QuantModule-->>Caller: return
Loading

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Possibly related PRs

Suggested labels

Community want to contribute

Suggested reviewers

  • Barry-Delaney
  • byshiue
  • hlu1
  • symphonylyh
✨ 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.

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

🧹 Nitpick comments (2)
tensorrt_llm/_torch/modules/fused_moe/quantization.py (2)

1152-1161: Nit: simplify/maximize clarity when computing the global max

You can avoid an intermediate pairwise tensor by taking the maxima separately and then a scalar max. Slightly clearer and avoids an elementwise max allocation.

Apply this diff:

-        all_w3_w1_input_scales_max = torch.max(
-            torch.stack(all_w3_input_scales),
-            torch.stack(all_w1_input_scales)).max()
+        all_w3_w1_input_scales_max = max(
+            torch.stack(all_w3_input_scales).max(),
+            torch.stack(all_w1_input_scales).max(),
+        )

1258-1274: Consider aligning fc2 input_scale across ranks for W4A8 custom as well

You aligned fc31 using all experts under W4A8 custom but fc2 still aggregates over module.initial_local_expert_ids. If fc2 activation scaling participates in cross-rank collectives, this asymmetry can reintroduce rank skew.

Proposed minimal change reusing input_scale_expert_ids:

-        all_w2_input_scales = [
-            load_weight_shard(weights[f"{expert_id}.w2.input_scale"],
-                              device=self.device)
-            for expert_id in module.initial_local_expert_ids
-        ]
+        all_w2_input_scales = [
+            load_weight_shard(weights[f"{expert_id}.w2.input_scale"],
+                              device=self.device)
+            for expert_id in (input_scale_expert_ids
+                              if w4a8_custom else module.initial_local_expert_ids)
+        ]

Can you confirm whether fc2’s act scale needs to be rank-aligned for your kernels/checkpoints? If yes, this change keeps both fc31/fc2 consistent.

📜 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 dd9627d and 3092497.

📒 Files selected for processing (1)
  • tensorrt_llm/_torch/modules/fused_moe/quantization.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/_torch/modules/fused_moe/quantization.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/_torch/modules/fused_moe/quantization.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/_torch/modules/fused_moe/quantization.py
🧬 Code graph analysis (1)
tensorrt_llm/_torch/modules/fused_moe/quantization.py (1)
tensorrt_llm/_torch/modules/linear.py (1)
  • load_weight_shard (59-103)
⏰ 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/_torch/modules/fused_moe/quantization.py (1)

1148-1151: W4A8 custom: good fix to align input_scale across ranks

Using all experts (range(module.num_experts)) for W4A8 custom ensures rank-invariant fc31 input-scale derived values. This directly addresses the cross-rank drift. LGTM.

@yilin-void
Copy link
Collaborator Author

/bot run

@tensorrt-cicd
Copy link
Collaborator

PR_Github #18049 [ run ] triggered by Bot

@tensorrt-cicd
Copy link
Collaborator

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

@yilin-void
Copy link
Collaborator Author

/bot run

@tensorrt-cicd
Copy link
Collaborator

PR_Github #18113 [ run ] triggered by Bot

Copy link
Collaborator

@Barry-Delaney Barry-Delaney left a comment

Choose a reason for hiding this comment

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

The changes LGTM.
Do we have any accuracy data on related models? Thx!

@tensorrt-cicd
Copy link
Collaborator

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

@yilin-void
Copy link
Collaborator Author

yilin-void commented Sep 9, 2025

The changes LGTM. Do we have any accuracy data on related models? Thx!

Thanks!

I validated with the DS R1 W4A8 checkpoints on H20x8, and the output of quickstart_advanced.py was reasonable. The average accuracy of lm-eval on gsm8k was 95, which met expectations.

image

@yilin-void
Copy link
Collaborator Author

/bot run

@tensorrt-cicd
Copy link
Collaborator

PR_Github #18199 [ run ] triggered by Bot

@tensorrt-cicd
Copy link
Collaborator

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

@yilin-void
Copy link
Collaborator Author

/bot run

@tensorrt-cicd
Copy link
Collaborator

PR_Github #18272 [ run ] triggered by Bot

@tensorrt-cicd
Copy link
Collaborator

PR_Github #18272 [ run ] completed with state FAILURE
/LLM/main/L0_MergeRequest_PR pipeline #13696 completed with status: 'ABORTED'

@yilin-void
Copy link
Collaborator Author

/bot run

@tensorrt-cicd
Copy link
Collaborator

PR_Github #18282 [ run ] triggered by Bot

@tensorrt-cicd
Copy link
Collaborator

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

@yilin-void
Copy link
Collaborator Author

/bot run --disable-fail-fast

@yilin-void
Copy link
Collaborator Author

/bot run

@tensorrt-cicd
Copy link
Collaborator

PR_Github #18538 [ run ] triggered by Bot

@tensorrt-cicd
Copy link
Collaborator

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

… custom ckpts.

Signed-off-by: Yilin Zhang <18275976+yilin-void@users.noreply.github.com>
@yilin-void
Copy link
Collaborator Author

/bot run

@tensorrt-cicd
Copy link
Collaborator

PR_Github #18581 [ run ] triggered by Bot

@tensorrt-cicd
Copy link
Collaborator

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

@yilin-void yilin-void merged commit 103b554 into NVIDIA:main Sep 16, 2025
5 checks passed
Wong4j pushed a commit to Wong4j/TensorRT-LLM that referenced this pull request Sep 20, 2025
…cross all ranks (NVIDIA#7614)

Signed-off-by: Yilin Zhang <18275976+yilin-void@users.noreply.github.com>
MrGeva pushed a commit to nv-auto-deploy/TensorRT-LLM that referenced this pull request Sep 21, 2025
…cross all ranks (NVIDIA#7614)

Signed-off-by: Yilin Zhang <18275976+yilin-void@users.noreply.github.com>
@yilin-void yilin-void deleted the w4a8_act_scale branch September 28, 2025 03:27
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