onnx-diagnostic 0.7.2__py3-none-any.whl → 0.7.3__py3-none-any.whl

onnx_diagnostic/__init__.py

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

onnx_diagnostic/helpers/rt_helper.py

@@ -112,4 +112,14 @@ def make_feeds(
 
     if copy:
         flat = [t.copy() if hasattr(t, "copy") else t.clone() for t in flat]
-    return dict(zip(names, flat))
+    # bool, int, float, onnxruntime does not support float, bool, int
+    new_flat = []
+    for i in flat:
+        if isinstance(i, bool):
+            i = np.array(i, dtype=np.bool_)
+        elif isinstance(i, int):
+            i = np.array(i, dtype=np.int64)
+        elif isinstance(i, float):
+            i = np.array(i, dtype=np.float32)
+        new_flat.append(i)
+    return dict(zip(names, new_flat))

onnx_diagnostic/helpers/torch_helper.py

@@ -717,7 +717,7 @@ def to_any(value: Any, to_value: Union[torch.dtype, torch.device, str]) -> Any:
         return tuple(to_any(t, to_value) for t in value)
     if isinstance(value, set):
         return {to_any(t, to_value) for t in value}
-    if isinstance(value, dict):
+    if type(value) is dict:
         return {k: to_any(t, to_value) for k, t in value.items()}
     if value.__class__.__name__ == "DynamicCache":
         return make_dynamic_cache(

onnx_diagnostic/torch_export_patches/eval/__init__.py

@@ -337,7 +337,7 @@ def _make_exporter_onnx(
         from experimental_experiment.torch_interpreter import to_onnx, ExportOptions
 
         opts = {}
-        opts["strict"] = "-nostrict" not in exporter
+        opts["strict"] = "-strict" in exporter
         opts["fallback"] = "-fallback" in exporter
         opts["tracing"] = "-tracing" in exporter
         opts["jit"] = "-jit" in exporter
@@ -520,6 +520,8 @@ def run_exporter(
             return res
 
         onx, builder = res
+        base["onx"] = onx
+        base["builder"] = builder
         if verbose >= 9:
             print("[run_exporter] onnx model")
             print(

onnx_diagnostic/torch_export_patches/onnx_export_serialization.py

@@ -28,7 +28,8 @@ def register_class_serialization(
 ) -> bool:
     """
     Registers a class.
-    It can be undone with :func:`unregister`.
+    It can be undone with
+    :func:`onnx_diagnostic.torch_export_patches.onnx_export_serialization.unregister_class_serialization`.
 
     :param cls: class to register
     :param f_flatten: see ``torch.utils._pytree.register_pytree_node``
@@ -77,7 +78,8 @@ def register_cache_serialization(
     patch_transformers: bool = False, patch_diffusers: bool = True, verbose: int = 0
 ) -> Dict[str, bool]:
     """
-    Registers many classes with :func:`register_class_serialization`.
+    Registers many classes with
+    :func:`onnx_diagnostic.torch_export_patches.onnx_export_serialization.register_class_serialization`.
     Returns information needed to undo the registration.
 
     :param patch_transformers: add serialization function for

onnx_diagnostic/torch_export_patches/patches/patch_transformers.py

@@ -214,8 +214,8 @@ class patched_DynamicCache:
             if len(self.key_cache) <= layer_idx:
                 # There may be skipped layers, fill them with empty lists
                 for _ in range(len(self.key_cache), layer_idx):
-                    self.key_cache.append(torch.tensor([]))
-                    self.value_cache.append(torch.tensor([]))
+                    self.key_cache.append(torch.tensor([], dtype=key_states.dtype))
+                    self.value_cache.append(torch.tensor([], dtype=key_states.dtype))
                 self.key_cache.append(key_states)
                 self.value_cache.append(value_states)
             elif not self.key_cache[
@@ -231,7 +231,6 @@ class patched_DynamicCache:
                 self.value_cache[layer_idx] = torch.cat(
                     [self.value_cache[layer_idx], value_states], dim=-2
                 )
-
         return self.key_cache[layer_idx], self.value_cache[layer_idx]
 
     def crop(self, max_length: int):

{onnx_diagnostic-0.7.2.dist-info → onnx_diagnostic-0.7.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onnx-diagnostic
-Version: 0.7.2
+Version: 0.7.3
 Summary: Investigate ONNX models
 Home-page: https://github.com/sdpython/onnx-diagnostic
 Author: Xavier Dupré
@@ -64,13 +64,26 @@ onnx-diagnostic: investigate onnx models
 
 The main feature is about `patches <https://github.com/sdpython/onnx-diagnostic/tree/main/onnx_diagnostic/torch_export_patches>`_:
 it helps exporting **pytorch models into ONNX**, mostly designed for LLMs using dynamic caches.
+Patches can be enabled as follows:
 
 .. code-block:: python
 
+  from onnx_diagnostic.torch_export_patches import torch_export_patches
+
   with torch_export_patches(patch_transformers=True) as f:
       ep = torch.export.export(model, args, kwargs=kwargs, dynamic_shapes=dynamic_shapes)
       # ...
 
+Dynamic shapes are difficult to guess for caches, one function
+returns a structure defining all dimensions as dynamic.
+You need then to remove those which are not dynamic in your model.
+
+.. code-block:: python
+
+  from onnx_diagnostic.export.shape_helper import all_dynamic_shape_from_inputs
+
+  dynamic_shapes = all_dynamic_shape_from_inputs(cache)
+
 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
 `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>`_.
@@ -127,14 +140,26 @@ Snapshot of usefuls tools
 
 .. code-block:: python
 
+  from onnx_diagnostic.torch_export_patches import torch_export_patches
+
   with torch_export_patches(patch_transformers=True) as f:
       ep = torch.export.export(model, args, kwargs=kwargs, dynamic_shapes=dynamic_shapes)
       # ...
 
+**all_dynamic_shape_from_inputs**
+
+.. code-block:: python
+
+  from onnx_diagnostic.export.shape_helper import all_dynamic_shape_from_inputs
+
+  dynamic_shapes = all_dynamic_shape_from_inputs(cache)
+
 **torch_export_rewrite**
 
 .. code-block:: python
 
+  from onnx_diagnostic.torch_export_patches import torch_export_rewrite
+
   with torch_export_rewrite(rewrite=[Model.forward]) as f:
       ep = torch.export.export(model, args, kwargs=kwargs, dynamic_shapes=dynamic_shapes)
       # ...

{onnx_diagnostic-0.7.2.dist-info → onnx_diagnostic-0.7.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-onnx_diagnostic/__init__.py,sha256=Lt-QBr--poshkZCAn2mvNtBcQfTKfBUI7__zuZCXklo,173
+onnx_diagnostic/__init__.py,sha256=N1lf8_afRytDUnulPCeDVDPA-M4k7y9x7LbWwX0USZs,173
 onnx_diagnostic/__main__.py,sha256=YmyV_Aq_ianDlHyKLHMa6h8YK3ZmFPpLVHLKjM91aCk,79
 onnx_diagnostic/_command_lines_parser.py,sha256=TliHXedXFerv-zO6cBigxKbuKHE0-6TUhhsk1pdkz9M,28072
 onnx_diagnostic/api.py,sha256=BhCl_yCd78N7TlVtPOHjeYv1QBEy39TjZ647rcHqLh0,345
@@ -22,8 +22,8 @@ onnx_diagnostic/helpers/mini_onnx_builder.py,sha256=p0Xh2Br38xAqUjB2214GiNOIbCgi
 onnx_diagnostic/helpers/model_builder_helper.py,sha256=RvDyPFqRboEU3HsQV_xi9oy-o3_4KuGFVzs5MhksduY,12552
 onnx_diagnostic/helpers/onnx_helper.py,sha256=pXXQjfyNTSUF-Kt72U4fnBDkYAnWYMxdSw8m0qk3xmE,39670
 onnx_diagnostic/helpers/ort_session.py,sha256=UgUUeUslDxEFBc6w6f3HMq_a7bn4TBlItmojqWquSj4,29281
-onnx_diagnostic/helpers/rt_helper.py,sha256=BXU_u1syk2RyM0HTFHKEiO6rHHhZW2UFPyUTVdeq8BU,4251
-onnx_diagnostic/helpers/torch_helper.py,sha256=MJpoiKZoKzp_ed5LK_2ssIMPo0eohn9WrVAcgPvT2Gk,32362
+onnx_diagnostic/helpers/rt_helper.py,sha256=qbV6zyMs-iH6H65WHC2tu4h0psnHg0TX5fwfO_k-glg,4623
+onnx_diagnostic/helpers/torch_helper.py,sha256=QfUXUPx0lZEqJBgyA97daPRDlT9duTM5Jq5Yjq1jJd8,32358
 onnx_diagnostic/reference/__init__.py,sha256=rLZsxOlnb7-81F2CzepGnZLejaROg4JvgFaGR9FwVQA,208
 onnx_diagnostic/reference/evaluator.py,sha256=RzNzjFDeMe-4X51Tb22N6aagazY5ktNq-mRmPcfY5EU,8848
 onnx_diagnostic/reference/ort_evaluator.py,sha256=1O7dHj8Aspolidg6rB2Nm7hT3HaGb4TxAgjCCD0XVcQ,26159
@@ -88,16 +88,16 @@ onnx_diagnostic/tasks/text_to_image.py,sha256=6z-rFG6MX9aBi8YoYtYI_8OV3M3Tfoi45V
 onnx_diagnostic/tasks/zero_shot_image_classification.py,sha256=GKaXm8g7cK23h3wJEUc6Q-6mpmLAzQ4YkJbd-eGP7Y4,4496
 onnx_diagnostic/torch_export_patches/__init__.py,sha256=0SaZedwznm1hQUCvXZsGZORV5vby954wEExr5faepGg,720
 onnx_diagnostic/torch_export_patches/onnx_export_errors.py,sha256=h_txSp30QmF1R_Q2wL4qpPqY59Dund2P9nAAsvucS8A,21245
-onnx_diagnostic/torch_export_patches/onnx_export_serialization.py,sha256=4fXsuQjJq_Ko_EehiVZYypdWTBgFgaaK8ryhAFaR0yo,10561
+onnx_diagnostic/torch_export_patches/onnx_export_serialization.py,sha256=wFE2fNxihAA3iua79AEB97_RBVv4wvGxwS9g4RJaSIc,10715
 onnx_diagnostic/torch_export_patches/patch_expressions.py,sha256=vr4tt61cbDnaaaduzMj4UBZ8OUtr6GfDpIWwOYqjWzs,3213
 onnx_diagnostic/torch_export_patches/patch_inputs.py,sha256=9b4pmyT00BwLqi7WG-gliep1RUy3gXEgW6BDnlSSA-M,7689
 onnx_diagnostic/torch_export_patches/patch_module.py,sha256=R2d9IHM-RwsBKDsxuBIJnEqMoxbS9gd4YWFGG2wwV5A,39881
 onnx_diagnostic/torch_export_patches/patch_module_helper.py,sha256=2U0AdyZuU0W54QTdE7tY7imVzMnpQ5091ADNtTCkT8Y,6967
-onnx_diagnostic/torch_export_patches/eval/__init__.py,sha256=VtkQB1o3Q2Fh99OOF6vQ2dynkhwzx2Wx6oB-rRbvTI0,23954
+onnx_diagnostic/torch_export_patches/eval/__init__.py,sha256=57x62uZNA80XiWgkG8Fe0_8YJcIVrvKLPqvwLDPJwgc,24008
 onnx_diagnostic/torch_export_patches/eval/model_cases.py,sha256=DTvdHPtNQh25Akv5o3D4Jxf1L1-SJ7w14tgvj8AAns8,26577
 onnx_diagnostic/torch_export_patches/patches/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 onnx_diagnostic/torch_export_patches/patches/patch_torch.py,sha256=KaZ8TjDa9ATgT4HllYzzoNf_51q_yOj_GuF5NYjPCrU,18913
-onnx_diagnostic/torch_export_patches/patches/patch_transformers.py,sha256=XyLqG4w4ALCVF8Dc8_Meu903saFYGBEBG0utziw9i3Q,44014
+onnx_diagnostic/torch_export_patches/patches/patch_transformers.py,sha256=QGfXf1IlsOToQKF9NOHau_l62u1alQbJ6KeiSKFb980,44061
 onnx_diagnostic/torch_export_patches/serialization/__init__.py,sha256=BHLdRPtNAtNPAS-bPKEj3-foGSPvwAbZXrHzGGPDLEw,1876
 onnx_diagnostic/torch_export_patches/serialization/diffusers_impl.py,sha256=drq3EH_yjcSuIWYsVeUWm8Cx6YCZFU6bP_1PLtPfY5I,945
 onnx_diagnostic/torch_export_patches/serialization/transformers_impl.py,sha256=9u2jkqnuyBkIF3R2sDEO0Jlkedl-cQhBNXxXXDLSEwE,8885
@@ -115,8 +115,8 @@ onnx_diagnostic/torch_models/untrained/llm_tiny_llm.py,sha256=QXw_Bs2SzfeiQMf-tm
 onnx_diagnostic/torch_onnx/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 onnx_diagnostic/torch_onnx/runtime_info.py,sha256=1g9F_Jf9AAgYQU4stbsrFXwQl-30mWlQrFbQ7val8Ps,9268
 onnx_diagnostic/torch_onnx/sbs.py,sha256=1EL25DeYFzlBSiFG_XjePBLvsiItRXbdDrr5-QZW2mA,16878
-onnx_diagnostic-0.7.2.dist-info/licenses/LICENSE.txt,sha256=Vv6TXglX6Rc0d-f8aREhayhT-6PMQXEyOmI2NKlUCMc,1045
-onnx_diagnostic-0.7.2.dist-info/METADATA,sha256=2jkNpfMIypu51qway6NIH1olWbeF_soM-e8rbwc3jVc,6631
-onnx_diagnostic-0.7.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-onnx_diagnostic-0.7.2.dist-info/top_level.txt,sha256=KwNkXewmcobM3ZT1DJLVWH6ebJzA5qKg7cWqKfpGNT4,16
-onnx_diagnostic-0.7.2.dist-info/RECORD,,
+onnx_diagnostic-0.7.3.dist-info/licenses/LICENSE.txt,sha256=Vv6TXglX6Rc0d-f8aREhayhT-6PMQXEyOmI2NKlUCMc,1045
+onnx_diagnostic-0.7.3.dist-info/METADATA,sha256=uMYdGJbm6K04yoi5UidH3uA0nK_PXrnVXe83s9v6yPE,7431
+onnx_diagnostic-0.7.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+onnx_diagnostic-0.7.3.dist-info/top_level.txt,sha256=KwNkXewmcobM3ZT1DJLVWH6ebJzA5qKg7cWqKfpGNT4,16
+onnx_diagnostic-0.7.3.dist-info/RECORD,,