Simplify model error message in test | test(torchlib)

Remove the duplicate check_model message when displaying

ghstack-source-id: 35dc813
Pull Request resolved: #882

Author: justinchuby

onnxscript/tests/function_libs/torch_lib/ops_test.py

@@ -16,7 +16,7 @@
 from __future__ import annotations
 
 import unittest
-from typing import Any, Callable, Optional, Sequence, Tuple
+from typing import Callable, Optional, Sequence, Tuple
 
 import numpy as np
 import onnx
@@ -72,18 +72,6 @@ def _should_skip_xfail_test_sample(
     return None, None
 
 
-def _split_function_and_wrangler(
-    onnx_function_and_wrangler: Callable[..., Any]
-    | tuple[Callable[..., Any], Callable[..., Any]]
-) -> tuple[Callable[..., Any], Callable[..., Any] | None]:
-    """Splits a function with an optional input wrangler into a function and an input wrangler."""
-    if isinstance(onnx_function_and_wrangler, tuple):
-        return onnx_function_and_wrangler
-
-    assert callable(onnx_function_and_wrangler)
-    return onnx_function_and_wrangler, None
-
-
 class TestFunctionValidity(unittest.TestCase):
     def test_all_script_functions_are_onnx_functions(self):
         for info in ops_test_data.TESTED_TORCHLIB_OPS:

onnxscript/tests/function_libs/torch_lib/ops_test_common.py

@@ -517,9 +517,7 @@ def _capture_graph_and_evaluate_torch_script_evaluator(function: Callable, args,
             onnx.checker.check_model(onnx_model, full_check=True)
         except onnx.checker.ValidationError as e:
             raise AssertionError(
-                f"ONNX model is invalid: {e}. "
-                f"Model:\n"
-                f"{onnxscript.proto2text(onnx_model)}"
+                f"ONNX model is invalid. Model:\n{onnxscript.proto2text(onnx_model)}"
             ) from e
 
         try: