Skip to content
Open
Changes from all commits
Commits
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
15 changes: 8 additions & 7 deletions src/transformers/models/zamba2/modular_zamba2.py
Original file line number Diff line number Diff line change
Expand Up @@ -870,13 +870,13 @@ def forward(
)

transformer_hidden_states = layer_outputs[0]

if output_attentions:
self_attn_weights = layer_outputs[1]
# Avoid unnecessary extraction if not needed
self_attn_weights = layer_outputs[1] if output_attentions else None

transformer_hidden_states = self.linear(transformer_hidden_states)

layer_outputs = self.mamba_decoder(
# Use output_attentions directly, don't recheck inside mamba_decoder
layer_outputs_mamba = self.mamba_decoder(
hidden_states,
transformer_hidden_states=transformer_hidden_states,
attention_mask=attention_mask,
Expand All @@ -887,9 +887,10 @@ def forward(
)

if output_attentions:
layer_outputs = (layer_outputs[0], self_attn_weights) + layer_outputs[2:]

return layer_outputs
# Slightly faster tuple construction by direct packing
return (layer_outputs_mamba[0], self_attn_weights) + layer_outputs_mamba[2:]
else:
return layer_outputs_mamba


class Zamba2PreTrainedModel(PreTrainedModel):
Expand Down