Fix cross-attention cache layer type for T5Gemma2 long inputs#45540
Open
Beichen-Ma wants to merge 1 commit intohuggingface:mainfrom
Open
Fix cross-attention cache layer type for T5Gemma2 long inputs#45540Beichen-Ma wants to merge 1 commit intohuggingface:mainfrom
Beichen-Ma wants to merge 1 commit intohuggingface:mainfrom
Conversation
Contributor
|
[For maintainers] Suggested jobs to run (before merge) run-slow: t5gemma2 |
Member
|
cc @vasqu since you were active in the original issue! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #45521. Cross-attention in
T5Gemma2ForConditionalGenerationis supposed to attend to all encoder tokens, but for inputs whose encoder length is >= sliding_window (default 4096) generation crashes with:The root cause was in
T5Gemma2ForConditionalGeneration._prepare_cache_for_generation, the cross-attention config was being stripped of its sliding-window settings viadel:T5Gemma2DecoderConfigwith defaultssliding_window: int | None = 4096andlayer_types: list[str] | None = None. Removing the instance attributes therefore makes attribute lookup fall back to those class defaults, socross_attn_configonce again issliding_window=4096.DynamicCache.__init__seessliding_window=4096withlayer_types=Nonewill auto-deriveslayer_types = ["sliding_attention"] * num_hidden_layers, and instantiatesDynamicSlidingWindowLayerfor every cross-attention layer. On update, those layers truncate the encoder K/V states to the lastsliding_window-1tokens:So when
enc_len == 4096, the cached cross-attention keys end up with shape [..., 4095, head_dim], which (after concatenation with the decoder self-attention key inT5Gemma2MergedAttention.forward) yields anattn_weightslast-dim of 4097. Hence the mismatch.Fix
Explicitly set
sliding_windowto null andlayer_typesto full attention for all layers, instead of deleting the instance attributes.Tests
T5Gemma2ModelTest::test_cross_attention_cache_is_not_sliding, which asserts that aftergenerate()every layer ofoutput.past_key_values.cross_attention_cacheisDynamicLayer. Confirmed test fails on main branch and passes on this branch.tests/models/t5gemma2/test_modeling_t5gemma2.pypasses.Code Agent Policy
The Transformers repo is currently being overwhelmed by a large number of PRs and issue comments written by
code agents. We are currently bottlenecked by our ability to review and respond to them. As a result,
we ask that new users do not submit pure code agent PRs at this time.
You may use code agents in drafting or to help you diagnose issues. We'd also ask autonomous "OpenClaw"-like agents
not to open any PRs or issues for the moment.
PRs that appear to be fully agent-written will probably be closed without review, and we may block users who do this
repeatedly or maliciously.
This is a rapidly-evolving situation that's causing significant shockwaves in the open-source community. As a result,
this policy is likely to be updated regularly in the near future. For more information, please read
CONTRIBUTING.md.Before submitting
Pull Request section?
to it if that's the case.
documentation guidelines, and
here are tips on formatting docstrings.
Who can review?
Anyone in the community is free to review the PR once the tests have passed. Feel free to tag
members/contributors who may be interested in your PR.