Merge branch 'main' into xiaowu/addOps(scalar_tensor)

Author: xiaowuhu

noxfile.py

@@ -25,9 +25,9 @@
     "pytest!=7.1.0",
     "pyyaml",
 )
-ONNX = "onnx==1.13"
-ONNX_RUNTIME = "onnxruntime==1.14"
-PYTORCH = "torch==1.13"
+ONNX = "onnx==1.13.1"
+ONNX_RUNTIME = "onnxruntime==1.14.1"
+PYTORCH = "torch==1.13.1"
 
 
 @nox.session(tags=["build"])

onnxscript/backend/onnx_export_test.py

@@ -63,7 +63,7 @@ def skip(pattern: str | Pattern, reason: str, *, condition: bool = True):
     skip(
         r"^test_optional_get_element_tensor",
         "ORT Unable to create onnxruntime InferenceSession for executing .OptionalGetElement op with onnx model",
-        condition=ort.__version__ == "1.14.0",
+        condition=ort.__version__[:4] == "1.14",
     ),
     skip(
         r"test_loop",
@@ -123,7 +123,6 @@ def exec_main(f, *inputs):
 
 
 class TestOnnxBackEnd(unittest.TestCase):
-
     test_folder = pathlib.Path(__file__).parent.parent / "tests" / "onnx_backend_test_code"
 
     def test_export2python(self):

onnxscript/tests/function_libs/torch_aten/ops_correctness_test.py

@@ -464,16 +464,6 @@ def _where_input_wrangler(
 TESTED_OPS = frozenset(OPINFO_FUNCTION_MAPPING)
 
 EXPECTED_SKIPS_OR_FAILS = (
-    xfail(
-        "logsumexp",
-        reason="ONNX Runtime 1.13 does not support ReduceLogSumExp-18",
-        enabled_if=version_utils.onnxruntime_older_than("1.14"),
-    ),
-    xfail(
-        "nn.functional.upsample_nearest2d",
-        reason="ONNX Runtime 1.13 does support opset18",
-        enabled_if=version_utils.onnxruntime_older_than("1.14"),
-    ),
     xfail("logcumsumexp", reason="naive implementation not numerically stable"),
     xfail("round", variant_name="decimals_0", reason="The op does not support decimals"),
     xfail("round", variant_name="decimals_3", reason="The op does not support decimals"),

onnxscript/tests/functions/onnxfns2_test.py

@@ -116,11 +116,10 @@ def test_onnxfns_hardmax(self):
     #         skip_test_names=[])
 
     @unittest.skipIf(
-        Version(onnxruntime.__version__) == Version("1.14"),
+        onnxruntime.__version__[:4] == "1.14",
         reason="onnxruntime 1.14 Segfaults.",
     )
     def test_onnxfns_space_to_depth(self):
-
         self.run_onnx_test(onnxfns2.SpaceToDepth, skip_test_names=[], skip_eager_test=True)