delay import

Author: xadupre

CHANGELOGS.rst

@@ -1,12 +1,16 @@
 Change Logs
 ===========
 
+0.7.4
++++++
+
+* :pr:`174`: changes for the next version of onnx
+
 0.7.3
 +++++
 
 * :pr:`173`: fixes function to_any for BaseModelOutput
 
-
 0.7.2
 +++++
 

_doc/index.rst

@@ -237,7 +237,7 @@ The function replaces dynamic dimensions defined as strings by
 Older versions
 ==============
 
-* `0.7.3 <../v0.7.3/index.html>`_
+* `0.7.4 <../v0.7.4/index.html>`_
 * `0.6.3 <../v0.6.3/index.html>`_
 * `0.5.0 <../v0.5.0/index.html>`_
 * `0.4.4 <../v0.4.4/index.html>`_

_unittests/ut_export/test_shape_helper.py

@@ -37,10 +37,10 @@ def test_all_dynamic_shape_from_inputs_dynamic_cache(self):
                 "input_ids": {0: "d_0_0", 1: "d_0_1"},
                 "attention_mask": {0: "d_1_0", 1: "d_1_1"},
                 "position_ids": {0: "d_2_0", 1: "d_2_1"},
-                "past_key_values": {
-                    "key_cache": [{0: "d_3_0", 1: "d_3_1", 2: "d_3_2", 3: "d_3_3"}],
-                    "value_cache": [{0: "d_4_0", 1: "d_4_1", 2: "d_4_2", 3: "d_4_3"}],
-                },
+                "past_key_values": [
+                    [{0: "d_3_0", 1: "d_3_1", 2: "d_3_2", 3: "d_3_3"}],
+                    [{0: "d_4_0", 1: "d_4_1", 2: "d_4_2", 3: "d_4_3"}],
+                ],
             },
             ds,
         )

onnx_diagnostic/__init__.py

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

onnx_diagnostic/reference/ops/op_cast_like.py

@@ -1,13 +1,17 @@
 from onnx.onnx_pb import TensorProto
 from onnx.reference.op_run import OpRun
-from onnx.reference.ops.op_cast import (
-    bfloat16,
-    cast_to,
-    float8e4m3fn,
-    float8e4m3fnuz,
-    float8e5m2,
-    float8e5m2fnuz,
-)
+
+try:
+    from onnx.reference.ops.op_cast import (
+        bfloat16,
+        cast_to,
+        float8e4m3fn,
+        float8e4m3fnuz,
+        float8e5m2,
+        float8e5m2fnuz,
+    )
+except ImportError:
+    from onnx.reference.ops.op_cast import cast_to
 from ...helpers.onnx_helper import np_dtype_to_tensor_dtype
 
 

onnx_diagnostic/torch_models/validate.py

@@ -18,7 +18,6 @@
 from ..tasks import random_input_kwargs
 from ..torch_export_patches import torch_export_patches
 from ..torch_export_patches.patch_inputs import use_dyn_not_str
-from ..reference import TorchOnnxEvaluator
 from .hghub import get_untrained_model_with_inputs
 
 
@@ -1113,6 +1112,9 @@ def _mk(key):
             f"{providers}..., flavour={flavour!r}"
         )
 
+    if runtime == "onnxruntime":
+        from ..reference import TorchOnnxEvaluator
+
     cls_runtime = (
         (
             lambda model, providers: onnxruntime.InferenceSession(