Skip to content

[llama-vision] Remove token_idx_cpu parameter #2018

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

Merged
IlyasMoutawwakil merged 1 commit into from
Jun 5, 2025
Merged

[llama-vision] Remove token_idx_cpu parameter #2018

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 2 additions & 5 deletions optimum/habana/transformers/models/mllama/modeling_mllama.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def _prepare_cross_attention_mask(
cross_attention_mask: torch.Tensor,
num_vision_tokens: int,
dtype: str,
token_idx: Optional[int] = None,
token_idx: Optional[torch.Tensor] = None,
) -> Tuple[torch.Tensor, torch.Tensor]:
"""
Copied from _prepare_cross_attention_mask: https://github.com/huggingface/transformers/blob/v4.45.2/src/transformers/models/mllama/modeling_mllama.py#L99
Expand Down Expand Up @@ -1017,7 +1017,6 @@ def forward(
use_flash_attention: Optional[bool] = False,
flash_attention_recompute: Optional[bool] = False,
logits_bf16: Optional[bool] = False,
token_idx_cpu: Optional[int] = None,
**kwargs,
) -> Union[Tuple, CausalLMOutputWithPast]:
"""
Expand Down Expand Up @@ -1066,7 +1065,7 @@ def forward(
cross_attention_mask,
num_vision_tokens=self.vision_model.num_patches,
dtype=self.dtype,
token_idx=token_idx_cpu,
token_idx=token_idx,
)
else:
full_text_row_masked_out_mask = None
Expand Down Expand Up @@ -1133,7 +1132,6 @@ def prepare_inputs_for_generation(
- add use_flash_attention and flash_attention_recompute
"""
token_idx = kwargs.get("token_idx", None)
token_idx_cpu = kwargs.get("token_idx_cpu", None)
bucket_internal = kwargs.get("bucket_internal", None)
if past_key_values is not None:
if token_idx is not None:
Expand Down Expand Up @@ -1185,7 +1183,6 @@ def prepare_inputs_for_generation(
"attention_mask": attention_mask,
"cross_attention_mask": cross_attention_mask,
"token_idx": token_idx,
"token_idx_cpu": token_idx_cpu,
"trim_logits": kwargs.get("trim_logits"),
"use_flash_attention": kwargs.get("use_flash_attention"),
"flash_attention_recompute": kwargs.get("flash_attention_recompute"),
Expand Down