-
Notifications
You must be signed in to change notification settings - Fork 2k
[None][fix] [Gemma3] Fix RoPE for local attention for Gemma3 #9961
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[None][fix] [Gemma3] Fix RoPE for local attention for Gemma3 #9961
Conversation
📝 WalkthroughWalkthroughAdded local rope parameter support to attention layer by introducing an Changes
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes
Pre-merge checks and finishing touches❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
✨ Finishing touches
🧪 Generate unit tests (beta)
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 |
1750f85 to
09fcb61
Compare
2ae4f49 to
8256ade
Compare
|
@shivghai ,
|
|
Hi @karljang , updated! |
|
@shivghai , but the pre-commit check failure has not been resolved 😄 |
|
hi @karljang - looks like the pre-commit check works for me now (and also did earlier for some reason). i can't see it auto-triggering in CI but it should be fine now. i will wait to see a failure |
|
@karljang looks like we are set on the pre-commit side! |
|
/bot run |
|
PR_Github #29026 [ run ] triggered by Bot. Commit: |
|
PR_Github #29026 [ run ] completed with state |
|
@brb-nv happy to contribute! this isn't needed exclusively for the VLMs, but for all Gemma3 variants:
I'm surprised no one saw this sooner. But to be fair, most of the time, it might not be super noticeable; the sequence would have to be very long, and require a lot of attention in the middle of the sequence and also require that the output clearly depends on the middle of the sequence |
I meant it wasn't needed for the text-only 1B model because even the global layers don't use scaling there. Please correct me if I'm wrong. And our focus lately shifted to Pytorch workflow (please give it a shot! :D). So, all fixes have been made there like this one: Other stuff that's good to be aware of for Gemma3 users: Pls consider using the Pytorch flow if you can. |
|
From the Gemma 3 technical report:
You're right, looks like the 1B model is the only one which doesn't require rope scaling! Anyway - thank you for all the contributions here, and we will make the switch to the torch workflow eventually :) |
brb-nv
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approving with the request to address newer comments for completeness. Let's run CI right after and get this merged!
|
/bot run --disable-fail-fast |
|
/bot run --disable-fail-fast |
|
PR_Github #29670 [ run ] triggered by Bot. Commit: |
|
PR_Github #29670 [ run ] completed with state
|
|
@brb-nv looks like it failed again for unrelated issues (HF related issues) |
|
/bot run --disable-fail-fast |
|
PR_Github #29853 [ run ] triggered by Bot. Commit: |
|
PR_Github #29853 [ run ] completed with state
|
Signed-off-by: Shiv Ghai <[email protected]>
Signed-off-by: Shiv Ghai <[email protected]>
Signed-off-by: Shiv Ghai <[email protected]>
Signed-off-by: Shiv Ghai <[email protected]>
Signed-off-by: Shiv Ghai <[email protected]>
9d57d51 to
025b7c7
Compare
|
Quite some unrelated failures, mostly related to HF. Rebased and retrying. |
|
/bot run --disable-fail-fast |
|
PR_Github #29870 [ run ] triggered by Bot. Commit: |
|
PR_Github #29870 [ run ] completed with state
|
|
/bot run --disable-fail-fast |
|
PR_Github #29990 [ run ] triggered by Bot. Commit: |
|
PR_Github #29990 [ run ] completed with state
|
|
more failures, look unrelated from the snippet i see |
|
/bot run --disable-fail-fast |
|
Waiving the problematic test here: #10311 |
|
PR_Github #30032 [ run ] triggered by Bot. Commit: |
|
PR_Github #30032 [ run ] completed with state |
|
Thank you for your contribution, @shivghai. Cheers! |
Description
Gemma3 has local and global attention layers. Right now, RoPE is incorrectly applied for local layers, this PR fixes that. The issue is not apparent when dealing with shorter sequences - but once the sequence is long enough (longer than 1024 tokens minimum, for a 1024 token local window attention), the outputs are garbled a little. I've already applied this to my own version of TensorRT-LLM and my Gemma3 is now working as expected.
Test Coverage
Added
tests/unittest/others/test_layer.py::TestLayer::test_gemma3_local_attention_rope_scaling.pyPR 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.