Skip to content
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.

Sign up for GitHub

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

Fix cache_position initialisation for generation with use_cache=False #30485

Merged
merged 3 commits into from
May 7, 2024
Merged

Fix cache_position initialisation for generation with use_cache=False #30485

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c0be24
Fix cache_position init for generation
nurlanov-zh Apr 25, 2024
043df8b
Update src/transformers/generation/utils.py
nurlanov-zh Apr 30, 2024
e1b1c10
Fix cache position update
nurlanov-zh Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/transformers/generation/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,11 @@ def _update_model_kwargs_for_generation(
dim=-1,
)

if "cache_position" in model_kwargs and model_kwargs["cache_position"] is not None:
if (
model_kwargs.get("use_cache", True)
and "cache_position" in model_kwargs
and model_kwargs["cache_position"] is not None
):
model_kwargs["cache_position"] = model_kwargs["cache_position"][-1:] + num_new_tokens

return model_kwargs
Expand Down Expand Up @@ -1293,6 +1297,10 @@ def _prepare_generation_config(

def _get_initial_cache_position(self, input_ids, model_kwargs):
"""Calculates `cache_position` for the pre-fill stage based on `input_ids` and optionally past length"""
if not model_kwargs.get("use_cache", True):
model_kwargs["cache_position"] = None
return model_kwargs

past_length = 0
if "past_key_values" in model_kwargs:
if isinstance(model_kwargs["past_key_values"], Cache):
Expand Down
Loading