fixes

Author: xadupre

.github/workflows/ci.yml

@@ -37,7 +37,7 @@ jobs:
           - python: '3.11'  # 3.11
             torch: 'main'
           - python: '3.11'
-            torch: '2.9'
+            torch: '2.8'
           - python: '3.11'
             transformers: 'main'
           - python: '3.11'

CHANGELOGS.rst

@@ -4,6 +4,8 @@ Change Logs
 0.7.15
 ++++++
 
+* :pr:`261`: updates to support ``transformers>=5.0``
+
 0.7.14
 ++++++
 

_unittests/ut_torch_models/test_validate_whole_models.py

@@ -107,13 +107,14 @@ def test_g_validate_model_onnx_dynamo_os_ort(self):
             verbose=10,
             exporter="onnx-dynamo",
             dump_folder="dump_test/validate_model_onnx_dynamo_os_ort",
-            patch=True,
+            patch=dict(patch_torch=False, patch_transformers=True, patch_sympy=True),
             stop_if_static=2 if pv.Version(torch.__version__) > pv.Version("2.6.1") else 0,
             optimization="os_ort",
+            quiet_input_sets={"inputs", "inputs22"},
         )
         self.assertIsInstance(summary, dict)
         self.assertIsInstance(data, dict)
-        self.assertLess(summary["disc_onnx_ort_run_abs"], 1e-4)
+        self.assertLess(summary["disc_onnx_ort_run2_batch1_abs"], 1e-4)
         onnx_filename = data["onnx_filename"]
         self.assertExists(onnx_filename)
 

onnx_diagnostic/torch_export_patches/onnx_export_errors.py

@@ -422,7 +422,7 @@ def torch_export_patches(
                 )
             )
 
-        if stop_if_static:
+        if patch_torch and stop_if_static:
             ShapeEnv._log_guard_remember = ShapeEnv._log_guard
 
             if verbose:

onnx_diagnostic/torch_models/validate.py

@@ -4,7 +4,7 @@
 import os
 import pprint
 import sys
-from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union
+from typing import Any, Callable, Dict, List, Optional, Sequence, Set, Tuple, Union
 import time
 import numpy as np
 import onnx
@@ -319,6 +319,7 @@ def validate_model(
     inputs2: int = 1,
     output_names: Optional[List[str]] = None,
     ort_logs: bool = False,
+    quiet_input_sets: Optional[Set[str]] = None,
 ) -> Tuple[Dict[str, Union[int, float, str]], Dict[str, Any]]:
     """
     Validates a model.
@@ -373,6 +374,8 @@ def validate_model(
         or an empty cache for example
     :param output_names: output names the onnx exporter should use
     :param ort_logs: increases onnxruntime verbosity when creating the session
+    :param quiet_input_sets: avoid raising an exception if the inputs belongs to that set
+        even if quiet is False
     :return: two dictionaries, one with some metrics,
         another one with whatever the function produces
 
@@ -842,6 +845,7 @@ def validate_model(
             warmup=warmup,
             second_input_keys=second_input_keys,
             ort_logs=ort_logs,
+            quiet_input_sets=quiet_input_sets,
         )
         summary.update(summary_valid)
         summary["time_total_validation_onnx"] = time.perf_counter() - validation_begin
@@ -904,6 +908,7 @@ def validate_model(
                     repeat=repeat,
                     warmup=warmup,
                     second_input_keys=second_input_keys,
+                    quiet_input_sets=quiet_input_sets,
                 )
                 summary.update(summary_valid)
 
@@ -1289,6 +1294,7 @@ def validate_onnx_model(
     warmup: int = 0,
     second_input_keys: Optional[List[str]] = None,
     ort_logs: bool = False,
+    quiet_input_sets: Optional[Set[str]] = None,
 ) -> Tuple[Dict[str, Any], Dict[str, Any]]:
     """
     Verifies that an onnx model produces the same
@@ -1308,6 +1314,7 @@ def validate_onnx_model(
         to make sure the exported model supports dynamism, the value is
         used as an increment added to the first set of inputs (added to dimensions)
     :param ort_logs: triggers the logs for onnxruntime
+    :param quiet_input_sets: avoid raising an exception for these sets of inputs
     :return: two dictionaries, one with some metrics,
         another one with whatever the function produces
     """
@@ -1455,10 +1462,12 @@ def _mk(key, flavour=flavour):
 
         # run ort
         if verbose:
-            print("[validate_onnx_model] run session...")
+            print(f"[validate_onnx_model] run session on inputs 'inputs{suffix}'...")
+            if quiet_input_sets:
+                print(f"[validate_onnx_model] quiet_input_sets={quiet_input_sets}")
 
         got = _quiet_or_not_quiet(
-            quiet,
+            quiet or (quiet_input_sets is not None and f"inputs{suffix}" in quiet_input_sets),
             _mk(f"run_onnx_ort{suffix}"),
             summary,
             data,