patch gemma attn functions

Author: IlyasMoutawwakil

optimum/exporters/openvino/model_patcher.py

@@ -421,9 +421,9 @@ def _llama_gemma_update_causal_mask_legacy(self, attention_mask, input_tensor, c
                 offset = 0
             mask_shape = attention_mask.shape
             mask_slice = (attention_mask.eq(0.0)).to(dtype=dtype) * min_dtype
-            causal_mask[
-                : mask_shape[0], : mask_shape[1], offset : mask_shape[2] + offset, : mask_shape[3]
-            ] = mask_slice
+            causal_mask[: mask_shape[0], : mask_shape[1], offset : mask_shape[2] + offset, : mask_shape[3]] = (
+                mask_slice
+            )
 
     if (
         self.config._attn_implementation == "sdpa"
@@ -2058,9 +2058,9 @@ def _dbrx_update_causal_mask_legacy(
                 offset = 0
             mask_shape = attention_mask.shape
             mask_slice = (attention_mask.eq(0.0)).to(dtype=dtype) * min_dtype
-            causal_mask[
-                : mask_shape[0], : mask_shape[1], offset : mask_shape[2] + offset, : mask_shape[3]
-            ] = mask_slice
+            causal_mask[: mask_shape[0], : mask_shape[1], offset : mask_shape[2] + offset, : mask_shape[3]] = (
+                mask_slice
+            )
 
     if (
         self.config._attn_implementation == "sdpa"
@@ -2712,7 +2712,14 @@ def patched_forward(*args, **kwargs):
 
     def __enter__(self):
         super().__enter__()
-        if is_transformers_version(">=", "4.45.0"):
+
+        if is_transformers_version(">=", "4.47.0"):
+            from transformers.models.gemma2.modeling_gemma2 import GEMMA2_ATTENTION_FUNCTION
+
+            GEMMA2_ATTENTION_FUNCTION["original_eager"] = GEMMA2_ATTENTION_FUNCTION["eager"]
+            GEMMA2_ATTENTION_FUNCTION["eager"] = GEMMA2_ATTENTION_FUNCTION["sdpa"]
+
+        elif is_transformers_version(">=", "4.45.0"):
             from transformers.models.gemma2.modeling_gemma2 import GEMMA2_ATTENTION_CLASSES
 
             sdpa_attn = GEMMA2_ATTENTION_CLASSES["sdpa"]
@@ -2725,7 +2732,14 @@ def __enter__(self):
 
     def __exit__(self, exc_type, exc_value, traceback):
         super().__exit__(exc_type, exc_value, traceback)
-        if is_transformers_version(">=", "4.45.0"):
+
+        if is_transformers_version(">=", "4.47.0"):
+            from transformers.models.gemma2.modeling_gemma2 import GEMMA2_ATTENTION_FUNCTION
+
+            GEMMA2_ATTENTION_FUNCTION["eager"] = GEMMA2_ATTENTION_FUNCTION["original_eager"]
+            del GEMMA2_ATTENTION_FUNCTION["original_eager"]
+
+        elif is_transformers_version(">=", "4.45.0"):
             for layer in self._model.model.layers:
                 if hasattr(layer.self_attn, "_orig_forward"):
                     layer.self_attn.forward = layer.self_attn._orig_forward