patch

Author: xadupre

CHANGELOGS.rst

@@ -4,6 +4,8 @@ Change Logs
 0.7.11
 ++++++
 
+* :pr:`220`: adds a patch for PR `#40791 <https://github.com/huggingface/transformers/pull/40791>`_ in transformers
+
 0.7.10
 ++++++
 

onnx_diagnostic/torch_export_patches/onnx_export_errors.py

@@ -426,6 +426,14 @@ def torch_export_patches(
                 patch_transformers_list, verbose=verbose
             )
 
+            if patch_transformers_list.patch_is_initialized:
+                if verbose:
+                    print(
+                        "[torch_export_patches] patches "
+                        "transformers.cache_utils.CacheLayerMixin.is_initialized"
+                    )
+                patch_transformers_list.apply_patch_for_is_initialized()
+
             if (
                 masking_utils
                 and patch_transformers_list.patch_masking_utils
@@ -689,6 +697,14 @@ def torch_export_patches(
                                 "in ALL_MASK_ATTENTION_FUNCTIONS"
                             )
 
+                if patch_transformers_list.patch_is_initialized:
+                    if verbose:
+                        print(
+                            "[torch_export_patches] restores "
+                            "transformers.cache_utils.CacheLayerMixin.is_initialized"
+                        )
+                    patch_transformers_list.disable_patch_for_is_initialized()
+
             ########
             # caches
             ########

onnx_diagnostic/torch_export_patches/patches/patch_transformers.py

@@ -35,6 +35,38 @@
 from ...ext_test_case import has_transformers
 from ...helpers.torch_helper import is_torchdynamo_exporting
 
+patch_is_initialized = pv.Version(transformers.__version__) > pv.Version("4.56.99")
+
+
+def _get_is_initialized(self):
+    return self.keys is not None
+
+
+def _set_is_initialized(self, value):
+    assert (value and self.keys is not None) or (not value and self.keys is None), (
+        f"The patch does not set is_initialized but checks the it is consistent with "
+        f"``self.keys is not None``, value={value}, "
+        f"self.keys is not None={self.keys is not None}"
+    )
+
+
+def apply_patch_for_is_initialized():
+    """
+    Fixes export issues introduced by PR `40791 <https://github.com/huggingface/transformers/pull/40791>`_.
+    The attribute is_initialized does not seem to be captured by :func:`torch.export.export`.
+    """
+    if patch_is_initialized:
+        transformers.cache_utils.CacheLayerMixin.is_initialized = property(
+            _get_is_initialized, _set_is_initialized
+        )
+
+
+def disable_patch_for_is_initialized():
+    """Disables the patch applied by function :func:`applies_patch_for_is_initialized`."""
+    if patch_is_initialized:
+        delattr(transformers.cache_utils.CacheLayerMixin, "is_initialized")
+
+
 if patch_masking_utils:
     # Introduced in 4.52
     from transformers.masking_utils import (

onnx_diagnostic/torch_models/validate.py

@@ -1518,6 +1518,8 @@ def call_torch_export_custom(
         "default+onnxruntime+os_ort",
         None,
     }
+    if optimization == "none":
+        optimization = ""
     assert (
         optimization in available
     ), f"unexpected value for optimization={optimization}, available={available}"