onnx-diagnostic 0.4.2__py3-none-any.whl → 0.4.3__py3-none-any.whl

onnx_diagnostic/__init__.py

@@ -3,5 +3,5 @@ Investigates onnx models.
 Functions, classes to dig into a model when this one is right, slow, wrong...
 """
 
-__version__ = "0.4.2"
+__version__ = "0.4.3"
 __author__ = "Xavier Dupré"

onnx_diagnostic/torch_export_patches/__init__.py

@@ -1,4 +1,8 @@
 from .onnx_export_errors import (
-    bypass_export_some_errors,
+    torch_export_patches,
     register_additional_serialization_functions,
 )
+
+
+# bypass_export_some_errors is the first name given to the patches.
+bypass_export_some_errors = torch_export_patches  # type: ignore

onnx_diagnostic/torch_export_patches/onnx_export_errors.py

@@ -93,7 +93,7 @@ def register_additional_serialization_functions(
 
 
 @contextlib.contextmanager
-def bypass_export_some_errors(
+def torch_export_patches(
     patch_sympy: bool = True,
     patch_torch: bool = True,
     patch_transformers: bool = False,
@@ -145,13 +145,13 @@ def bypass_export_some_errors(
 
     ::
 
-        with bypass_export_some_errors(patch_transformers=True) as modificator:
+        with torch_export_patches(patch_transformers=True) as modificator:
             inputs = modificator(inputs)
             onx = to_onnx(..., inputs, ...)
 
     ::
 
-        with bypass_export_some_errors(patch_transformers=True) as modificator:
+        with torch_export_patches(patch_transformers=True) as modificator:
             inputs = modificator(inputs)
             onx = torch.onnx.export(..., inputs, ...)
 
@@ -159,7 +159,7 @@ def bypass_export_some_errors(
 
     ::
 
-        with bypass_export_some_errors(patch_transformers=True) as modificator:
+        with torch_export_patches(patch_transformers=True) as modificator:
             inputs = modificator(inputs)
             ep = torch.export.export(..., inputs, ...)
 
@@ -190,7 +190,7 @@ def bypass_export_some_errors(
 
         if verbose:
             print(
-                "[bypass_export_some_errors] replace torch.jit.isinstance, "
+                "[torch_export_patches] replace torch.jit.isinstance, "
                 "torch._dynamo.mark_static_address"
             )
 
@@ -210,8 +210,8 @@ def bypass_export_some_errors(
             f_sympy_name = getattr(sympy.core.numbers.IntegerConstant, "name", None)
 
             if verbose:
-                print(f"[bypass_export_some_errors] sympy.__version__={sympy.__version__!r}")
-                print("[bypass_export_some_errors] patch sympy")
+                print(f"[torch_export_patches] sympy.__version__={sympy.__version__!r}")
+                print("[torch_export_patches] patch sympy")
 
             sympy.core.numbers.IntegerConstant.name = lambda self: f"IntCst{str(self)}"
 
@@ -228,9 +228,9 @@ def bypass_export_some_errors(
             )
 
             if verbose:
-                print(f"[bypass_export_some_errors] torch.__version__={torch.__version__!r}")
-                print(f"[bypass_export_some_errors] stop_if_static={stop_if_static!r}")
-                print("[bypass_export_some_errors] patch pytorch")
+                print(f"[torch_export_patches] torch.__version__={torch.__version__!r}")
+                print(f"[torch_export_patches] stop_if_static={stop_if_static!r}")
+                print("[torch_export_patches] patch pytorch")
 
             # torch.jit.isinstance
             f_jit_isinstance = torch.jit.isinstance
@@ -252,7 +252,7 @@ def bypass_export_some_errors(
         # torch._export.non_strict_utils.produce_guards_and_solve_constraints
         if catch_constraints:
             if verbose:
-                print("[bypass_export_some_errors] modifies shape constraints")
+                print("[torch_export_patches] modifies shape constraints")
             f_produce_guards_and_solve_constraints = (
                 torch._export.non_strict_utils.produce_guards_and_solve_constraints
             )
@@ -277,22 +277,20 @@ def bypass_export_some_errors(
             ShapeEnv._log_guard_remember = ShapeEnv._log_guard
 
             if verbose:
-                print(
-                    "[bypass_export_some_errors] assert when a dynamic dimension turns static"
-                )
-                print("[bypass_export_some_errors] replaces ShapeEnv._set_replacement")
+                print("[torch_export_patches] assert when a dynamic dimension turns static")
+                print("[torch_export_patches] replaces ShapeEnv._set_replacement")
 
             f_shape_env__set_replacement = ShapeEnv._set_replacement
             ShapeEnv._set_replacement = patched_ShapeEnv._set_replacement
 
             if verbose:
-                print("[bypass_export_some_errors] replaces ShapeEnv._log_guard")
+                print("[torch_export_patches] replaces ShapeEnv._log_guard")
             f_shape_env__log_guard = ShapeEnv._log_guard
             ShapeEnv._log_guard = patched_ShapeEnv._log_guard
 
             if stop_if_static > 1:
                 if verbose:
-                    print("[bypass_export_some_errors] replaces ShapeEnv._check_frozen")
+                    print("[torch_export_patches] replaces ShapeEnv._check_frozen")
                 f_shape_env__check_frozen = ShapeEnv._check_frozen
                 ShapeEnv._check_frozen = patched_ShapeEnv._check_frozen
 
@@ -305,7 +303,7 @@ def bypass_export_some_errors(
                 import transformers
 
                 print(
-                    f"[bypass_export_some_errors] transformers.__version__="
+                    f"[torch_export_patches] transformers.__version__="
                     f"{transformers.__version__!r}"
                 )
             revert_patches_info = patch_module_or_classes(
@@ -314,7 +312,7 @@ def bypass_export_some_errors(
 
         if custom_patches:
             if verbose:
-                print("[bypass_export_some_errors] applies custom patches")
+                print("[torch_export_patches] applies custom patches")
             revert_custom_patches_info = patch_module_or_classes(
                 custom_patches, verbose=verbose
             )
@@ -326,7 +324,7 @@ def bypass_export_some_errors(
         fct_callable = replacement_before_exporting if patch_transformers else (lambda x: x)
 
         if verbose:
-            print("[bypass_export_some_errors] done patching")
+            print("[torch_export_patches] done patching")
 
         try:
             yield fct_callable
@@ -336,7 +334,7 @@ def bypass_export_some_errors(
             #######
 
             if verbose:
-                print("[bypass_export_some_errors] remove patches")
+                print("[torch_export_patches] remove patches")
 
             if patch_sympy:
                 # tracked by https://github.com/pytorch/pytorch/issues/143494
@@ -346,7 +344,7 @@ def bypass_export_some_errors(
                     delattr(sympy.core.numbers.IntegerConstant, "name")
 
                 if verbose:
-                    print("[bypass_export_some_errors] restored sympy functions")
+                    print("[torch_export_patches] restored sympy functions")
 
             #######
             # torch
@@ -362,22 +360,22 @@ def bypass_export_some_errors(
                 torch._meta_registrations._broadcast_shapes = f__broadcast_shapes
 
                 if verbose:
-                    print("[bypass_export_some_errors] restored pytorch functions")
+                    print("[torch_export_patches] restored pytorch functions")
 
             if stop_if_static:
                 if verbose:
-                    print("[bypass_export_some_errors] restored ShapeEnv._set_replacement")
+                    print("[torch_export_patches] restored ShapeEnv._set_replacement")
 
                 ShapeEnv._set_replacement = f_shape_env__set_replacement
 
                 if verbose:
-                    print("[bypass_export_some_errors] restored ShapeEnv._log_guard")
+                    print("[torch_export_patches] restored ShapeEnv._log_guard")
 
                 ShapeEnv._log_guard = f_shape_env__log_guard
 
                 if stop_if_static > 1:
                     if verbose:
-                        print("[bypass_export_some_errors] restored ShapeEnv._check_frozen")
+                        print("[torch_export_patches] restored ShapeEnv._check_frozen")
                     ShapeEnv._check_frozen = f_shape_env__check_frozen
 
             if catch_constraints:
@@ -389,11 +387,11 @@ def bypass_export_some_errors(
                     f__check_input_constraints_for_graph
                 )
                 if verbose:
-                    print("[bypass_export_some_errors] restored shape constraints")
+                    print("[torch_export_patches] restored shape constraints")
 
             if custom_patches:
                 if verbose:
-                    print("[bypass_export_some_errors] unpatch custom patches")
+                    print("[torch_export_patches] unpatch custom patches")
                 unpatch_module_or_classes(
                     custom_patches, revert_custom_patches_info, verbose=verbose
                 )
@@ -404,7 +402,7 @@ def bypass_export_some_errors(
 
             if patch_transformers:
                 if verbose:
-                    print("[bypass_export_some_errors] unpatch transformers")
+                    print("[torch_export_patches] unpatch transformers")
                 unpatch_module_or_classes(
                     patch_transformers_list, revert_patches_info, verbose=verbose
                 )

onnx_diagnostic/torch_models/hghub/hub_data.py

@@ -38,12 +38,14 @@ __data_arch__ = textwrap.dedent(
     DeiTModel,image-feature-extraction
     DetrModel,image-feature-extraction
     Dinov2Model,image-feature-extraction
+    DistilBertForSequenceClassification,text-classification
     DistilBertModel,feature-extraction
     DonutSwinModel,feature-extraction
     ElectraModel,feature-extraction
     EsmModel,feature-extraction
     FalconMambaForCausalLM,text-generation
     GLPNModel,image-feature-extraction
+    GPT2LMHeadModel,text-generation
     GPTBigCodeModel,feature-extraction
     GPTJModel,feature-extraction
     GPTNeoModel,feature-extraction
@@ -64,6 +66,7 @@ __data_arch__ = textwrap.dedent(
     LongT5Model,feature-extraction
     LongformerModel,feature-extraction
     MCTCTModel,feature-extraction
+    MPNetForMaskedLM,sentence-similarity
     MPNetModel,feature-extraction
     MT5Model,feature-extraction
     MarianMTModel,text2text-generation
@@ -96,11 +99,13 @@ __data_arch__ = textwrap.dedent(
     PoolFormerModel,image-feature-extraction
     PvtForImageClassification,image-classification
     Qwen2ForCausalLM,text-generation
+    Qwen2_5_VLForConditionalGeneration,image-text-to-text
     RTDetrForObjectDetection,object-detection
     RegNetModel,image-feature-extraction
     RemBertModel,feature-extraction
     ResNetForImageClassification,image-classification
     RoFormerModel,feature-extraction
+    RobertaForMaskedLM,sentence-similarity
     RobertaModel,feature-extraction
     RtDetrV2ForObjectDetection,object-detection
     SEWDModel,feature-extraction
@@ -118,6 +123,7 @@ __data_arch__ = textwrap.dedent(
     Swinv2Model,image-feature-extraction
     T5ForConditionalGeneration,text2text-generation
     TableTransformerModel,image-feature-extraction
+    TableTransformerForObjectDetection,object-detection
     UniSpeechForSequenceClassification,audio-classification
     ViTForImageClassification,image-classification
     ViTMAEModel,image-feature-extraction
@@ -130,6 +136,9 @@ __data_arch__ = textwrap.dedent(
     WhisperForConditionalGeneration,automatic-speech-recognition
     XLMModel,feature-extraction
     XLMRobertaForCausalLM,text-generation
+    XLMRobertaForMaskedLM,fill-mask
+    XLMRobertaModel,sentence-similarity
+    Wav2Vec2ForCTC,automatic-speech-recognition
     YolosForObjectDetection,object-detection
     YolosModel,image-feature-extraction"""
 )

onnx_diagnostic/torch_models/test_helper.py

@@ -12,7 +12,7 @@ from ..helpers.rt_helper import make_feeds
 from ..helpers.torch_test_helper import to_any, torch_deepcopy
 from ..helpers.cache_helper import flatten_unflatten_for_dynamic_shapes
 from ..tasks import random_input_kwargs
-from ..torch_export_patches import bypass_export_some_errors
+from ..torch_export_patches import torch_export_patches
 from ..torch_export_patches.patch_inputs import use_dyn_not_str
 from .hghub import get_untrained_model_with_inputs
 
@@ -242,9 +242,9 @@ def validate_model(
         depend on the the exporter
     :param quiet: if quiet, catches exception if any issue
     :param patch: applies patches (``patch_transformers=True``) before exporting,
-        see :func:`onnx_diagnostic.torch_export_patches.bypass_export_some_errors`
+        see :func:`onnx_diagnostic.torch_export_patches.torch_export_patches`
     :param stop_if_static: stops if a dynamic dimension becomes static,
-        see :func:`onnx_diagnostic.torch_export_patches.bypass_export_some_errors`
+        see :func:`onnx_diagnostic.torch_export_patches.torch_export_patches`
     :param dump_folder: dumps everything in a subfolder of this one
     :param drop_inputs: drops this list of inputs (given their names)
     :param ortfusiontype: runs ort fusion, the parameters defines the fusion type,
@@ -417,7 +417,7 @@ def validate_model(
                     f"[validate_model] applies patches before exporting "
                     f"stop_if_static={stop_if_static}"
                 )
-            with bypass_export_some_errors(  # type: ignore
+            with torch_export_patches(  # type: ignore
                 patch_transformers=True,
                 stop_if_static=stop_if_static,
                 verbose=max(0, verbose - 1),

{onnx_diagnostic-0.4.2.dist-info → onnx_diagnostic-0.4.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onnx-diagnostic
-Version: 0.4.2
+Version: 0.4.3
 Summary: Investigate ONNX models
 Home-page: https://github.com/sdpython/onnx-diagnostic
 Author: Xavier Dupré
@@ -67,13 +67,13 @@ it helps exporting **pytorch models into ONNX**, mostly designed for LLMs using
 
 .. code-block:: python
 
-  with bypass_export_some_errors(patch_transformers=True) as f:
+  with torch_export_patches(patch_transformers=True) as f:
       ep = torch.export.export(model, args, kwargs=kwargs, dynamic_shapes=dynamic_shapes)
       # ...
 
 It also implements tools to investigate, validate exported models (ExportedProgramm, ONNXProgram, ...).
 See `documentation of onnx-diagnostic <https://sdpython.github.io/doc/onnx-diagnostic/dev/>`_ and
-`bypass_export_some_errors <https://sdpython.github.io/doc/onnx-diagnostic/dev/api/torch_export_patches/index.html#onnx_diagnostic.torch_export_patches.bypass_export_some_errors>`_.
+`torch_export_patches <https://sdpython.github.io/doc/onnx-diagnostic/dev/api/torch_export_patches/index.html#onnx_diagnostic.torch_export_patches.torch_export_patches>`_.
 
 Getting started
 +++++++++++++++

{onnx_diagnostic-0.4.2.dist-info → onnx_diagnostic-0.4.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-onnx_diagnostic/__init__.py,sha256=wVSctxhjG5jNBmX9oZ_oUVWt2QU4P1s8bsgeKXDj0YI,164
+onnx_diagnostic/__init__.py,sha256=opPQ2jwxhWOe2Y2oDiKVTmNL4w0H1Gl0G921alsi0NM,164
 onnx_diagnostic/__main__.py,sha256=YmyV_Aq_ianDlHyKLHMa6h8YK3ZmFPpLVHLKjM91aCk,79
 onnx_diagnostic/_command_lines_parser.py,sha256=kOECT1BccZc38vmVc3jF3xvXGDpcocvLuUGoPkzte08,14753
 onnx_diagnostic/doc.py,sha256=MTuT7Kxyvn7KEy84liQeFeqhugJrUQhjjpx21F72Uxw,926
@@ -61,8 +61,8 @@ onnx_diagnostic/tasks/text2text_generation.py,sha256=jaJLQqKk38mAop7O3zCFQjUvmYm
 onnx_diagnostic/tasks/text_classification.py,sha256=OgC_G9iumzTjTNUEvMoFFNTHCD8_BkdvdYC4jUsfpHM,2412
 onnx_diagnostic/tasks/text_generation.py,sha256=fTasu-igW-f9dyhYN4qXYkTWZU1ppgK37cmpvXV3i08,10215
 onnx_diagnostic/tasks/zero_shot_image_classification.py,sha256=N3cEG1Lq95wS1N_CWUUUCU5j-4Tp5eR8Ce68U8THYAk,4380
-onnx_diagnostic/torch_export_patches/__init__.py,sha256=RZzVGgouNNXaPirQJYQThiq5wrliwH4unVszeU18oJw,116
-onnx_diagnostic/torch_export_patches/onnx_export_errors.py,sha256=xeMHu9VJcJ3suCg-OJiLtvNcR2Q8hYm8Y5aZdmcperk,16256
+onnx_diagnostic/torch_export_patches/__init__.py,sha256=uRqg0-KSs_DhDnzrVp-TG2vfcDBO4HlsNkEg7RomQL0,246
+onnx_diagnostic/torch_export_patches/onnx_export_errors.py,sha256=9WQUBAp5okQL9aJJKyp23ZumBnKt-qahcr94a9MYWxA,16083
 onnx_diagnostic/torch_export_patches/onnx_export_serialization.py,sha256=1s1LqgqOL_hV6yqT7sgxzTKSDAL267CcZgNq8K4oTZM,14898
 onnx_diagnostic/torch_export_patches/patch_inputs.py,sha256=FQrMjwvEgPqvYY7ptfULzfexW5yJHo6Pzq_p1HDkNrY,7680
 onnx_diagnostic/torch_export_patches/patches/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -70,10 +70,10 @@ onnx_diagnostic/torch_export_patches/patches/patch_torch.py,sha256=TKLxrIJUrQsy0
 onnx_diagnostic/torch_export_patches/patches/patch_transformers.py,sha256=exiIq8zNZsY6QTzZVDMgU2ywGzs6-54Ic4vzTQ-26YQ,21863
 onnx_diagnostic/torch_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 onnx_diagnostic/torch_models/llms.py,sha256=soyg4yC87ptGoeulJhKqw5opGmuLvH1pn_ZDXZ4Jr8E,90
-onnx_diagnostic/torch_models/test_helper.py,sha256=e-JuKDGJnbLA6FmwBLfeAPV122ZulEdEChbvKJWc9R0,46624
+onnx_diagnostic/torch_models/test_helper.py,sha256=ad4C1vpnYkLMTrPMBdyk0OuUIUIAa7wP-zgCzPH88zc,46604
 onnx_diagnostic/torch_models/hghub/__init__.py,sha256=vi1Q7YHdddj1soiBN42MSvJdFqe2_KUoWafHISjwOu8,58
 onnx_diagnostic/torch_models/hghub/hub_api.py,sha256=EjwsmdHhf9ub1K5UCQPxsKiTMZy1dsdcRvNmxoZrc98,8621
-onnx_diagnostic/torch_models/hghub/hub_data.py,sha256=6H3ui0R6kkvRcqL7KBCXu9XuvebodViaXg74bPcDcko,7445
+onnx_diagnostic/torch_models/hghub/hub_data.py,sha256=K9fu3NA530QEqYJcFTwACfsoRAIUrJoJLNtxDrUzM3c,7863
 onnx_diagnostic/torch_models/hghub/hub_data_cached_configs.py,sha256=IYinZGm6-Ob7fQHg7rE1OE0t5muCsEq5TpQiMgEsrgs,245009
 onnx_diagnostic/torch_models/hghub/model_inputs.py,sha256=B5c_-T_Ub9Mxs_DxpP4_yb4im-85ftVvAcUBgsISp1o,5743
 onnx_diagnostic/torch_models/untrained/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -81,8 +81,8 @@ onnx_diagnostic/torch_models/untrained/llm_phi2.py,sha256=ynBTDHJHCk44NjLT_t6OiF
 onnx_diagnostic/torch_models/untrained/llm_tiny_llm.py,sha256=7N3fGvT_4Mn4NbIo0Qk57c6DMc3OXGWyvj_P41rjwSY,3513
 onnx_diagnostic/torch_onnx/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 onnx_diagnostic/torch_onnx/sbs.py,sha256=HEGDHhV9pfXxpBQrpOWPNWGMsNfOebWewyAazi9poV8,16872
-onnx_diagnostic-0.4.2.dist-info/licenses/LICENSE.txt,sha256=Vv6TXglX6Rc0d-f8aREhayhT-6PMQXEyOmI2NKlUCMc,1045
-onnx_diagnostic-0.4.2.dist-info/METADATA,sha256=xkEoLhmlKpx91wddmUKXOpmDwdsEuW2y_c7bbk7cAVw,5511
-onnx_diagnostic-0.4.2.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-onnx_diagnostic-0.4.2.dist-info/top_level.txt,sha256=KwNkXewmcobM3ZT1DJLVWH6ebJzA5qKg7cWqKfpGNT4,16
-onnx_diagnostic-0.4.2.dist-info/RECORD,,
+onnx_diagnostic-0.4.3.dist-info/licenses/LICENSE.txt,sha256=Vv6TXglX6Rc0d-f8aREhayhT-6PMQXEyOmI2NKlUCMc,1045
+onnx_diagnostic-0.4.3.dist-info/METADATA,sha256=AI3BrV-xYBj8qVBlnpPOMsKnIAtERv1fsjx7sA6hD-A,5496
+onnx_diagnostic-0.4.3.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+onnx_diagnostic-0.4.3.dist-info/top_level.txt,sha256=KwNkXewmcobM3ZT1DJLVWH6ebJzA5qKg7cWqKfpGNT4,16
+onnx_diagnostic-0.4.3.dist-info/RECORD,,