onnx 1.16.2__cp310-cp310-win_amd64.whl → 1.17.0__cp310-cp310-win_amd64.whl

onnx/test/test_backend_onnxruntime.py

@@ -185,6 +185,268 @@ if ort is not None:
         "|test_transpose_"
         "|test_unsqueeze_"
         "|test_wrap_pad_"
+        "|test_acos_cpu"
+        "|test_acos_example_cpu"
+        "|test_acosh_cpu"
+        "|test_acosh_example_cpu"
+        "|test_asin_cpu"
+        "|test_asin_example_cpu"
+        "|test_asinh_cpu"
+        "|test_asinh_example_cpu"
+        "|test_atan_cpu"
+        "|test_atan_example_cpu"
+        "|test_atanh_cpu"
+        "|test_atanh_example_cpu"
+        "|test_averagepool_1d_default_cpu"
+        "|test_averagepool_2d_ceil_cpu"
+        "|test_averagepool_2d_default_cpu"
+        "|test_averagepool_2d_dilations_cpu"
+        "|test_averagepool_2d_pads_count_include_pad_cpu"
+        "|test_averagepool_2d_pads_cpu"
+        "|test_averagepool_2d_precomputed_pads_count_include_pad_cpu"
+        "|test_averagepool_2d_precomputed_pads_cpu"
+        "|test_averagepool_2d_precomputed_same_upper_cpu"
+        "|test_averagepool_2d_precomputed_strides_cpu"
+        "|test_averagepool_2d_same_lower_cpu"
+        "|test_averagepool_2d_same_upper_cpu"
+        "|test_averagepool_2d_strides_cpu"
+        "|test_averagepool_3d_default_cpu"
+        "|test_averagepool_3d_dilations_large_count_include_pad_is_0_ceil_mode_is_False_cpu"
+        "|test_averagepool_3d_dilations_large_count_include_pad_is_0_ceil_mode_is_True_cpu"
+        "|test_averagepool_3d_dilations_large_count_include_pad_is_1_ceil_mode_is_False_cpu"
+        "|test_averagepool_3d_dilations_large_count_include_pad_is_1_ceil_mode_is_True_cpu"
+        "|test_averagepool_3d_dilations_small_cpu"
+        "|test_basic_conv_with_padding_cpu"
+        "|test_basic_conv_without_padding_cpu"
+        "|test_conv_with_autopad_same_cpu"
+        "|test_conv_with_strides_and_asymmetric_padding_cpu"
+        "|test_conv_with_strides_no_padding_cpu"
+        "|test_conv_with_strides_padding_cpu"
+        "|test_convtranspose_1d_cpu"
+        "|test_convtranspose_3d_cpu"
+        "|test_convtranspose_autopad_same_cpu"
+        "|test_convtranspose_cpu"
+        "|test_convtranspose_dilations_cpu"
+        "|test_convtranspose_kernel_shape_cpu"
+        "|test_convtranspose_output_shape_cpu"
+        "|test_convtranspose_pad_cpu"
+        "|test_convtranspose_pads_cpu"
+        "|test_cos_cpu"
+        "|test_cos_example_cpu"
+        "|test_cosh_cpu"
+        "|test_cosh_example_cpu"
+        "|test_det_2d_cpu"
+        "|test_det_nd_cpu"
+        "|test_dropout_default_cpu"
+        "|test_dropout_default_mask_cpu"
+        "|test_dropout_default_mask_ratio_cpu"
+        "|test_dropout_default_ratio_cpu"
+        "|test_elu_cpu"
+        "|test_elu_default_cpu"
+        "|test_elu_example_cpu"
+        "|test_eyelike_populate_off_main_diagonal_cpu"
+        "|test_eyelike_with_dtype_cpu"
+        "|test_eyelike_without_dtype_cpu"
+        "|test_globalaveragepool_cpu"
+        "|test_globalaveragepool_precomputed_cpu"
+        "|test_gridsample_aligncorners_true_cpu"
+        "|test_gridsample_bicubic_align_corners_0_additional_1_cpu"
+        "|test_gridsample_bicubic_align_corners_1_additional_1_cpu"
+        "|test_gridsample_bicubic_cpu"
+        "|test_gridsample_bilinear_align_corners_0_additional_1_cpu"
+        "|test_gridsample_bilinear_align_corners_1_additional_1_cpu"
+        "|test_gridsample_bilinear_cpu"
+        "|test_gridsample_border_padding_cpu"
+        "|test_gridsample_cpu"
+        "|test_gridsample_nearest_align_corners_0_additional_1_cpu"
+        "|test_gridsample_nearest_align_corners_1_additional_1_cpu"
+        "|test_gridsample_nearest_cpu"
+        "|test_gridsample_reflection_padding_cpu"
+        "|test_gridsample_volumetric_bilinear_align_corners_0_cpu"
+        "|test_gridsample_volumetric_bilinear_align_corners_1_cpu"
+        "|test_gridsample_volumetric_nearest_align_corners_0_cpu"
+        "|test_gridsample_volumetric_nearest_align_corners_1_cpu"
+        "|test_gridsample_zeros_padding_cpu"
+        "|test_gru_defaults_cpu"
+        "|test_gru_seq_length_cpu"
+        "|test_gru_with_initial_bias_cpu"
+        "|test_hardsigmoid_cpu"
+        "|test_hardsigmoid_default_cpu"
+        "|test_hardsigmoid_example_cpu"
+        "|test_hardswish_cpu"
+        "|test_hardswish_expanded_cpu"
+        "|test_lppool_1d_default_cpu"
+        "|test_lppool_2d_default_cpu"
+        "|test_lppool_2d_dilations_cpu"
+        "|test_lppool_2d_pads_cpu"
+        "|test_lppool_2d_same_lower_cpu"
+        "|test_lppool_2d_same_upper_cpu"
+        "|test_lppool_2d_strides_cpu"
+        "|test_lppool_3d_default_cpu"
+        "|test_lstm_defaults_cpu"
+        "|test_lstm_with_initial_bias_cpu"
+        "|test_lstm_with_peepholes_cpu"
+        "|test_maxpool_1d_default_cpu"
+        "|test_maxpool_2d_ceil_cpu"
+        "|test_maxpool_2d_default_cpu"
+        "|test_maxpool_2d_dilations_cpu"
+        "|test_maxpool_2d_pads_cpu"
+        "|test_maxpool_2d_precomputed_pads_cpu"
+        "|test_maxpool_2d_precomputed_same_upper_cpu"
+        "|test_maxpool_2d_precomputed_strides_cpu"
+        "|test_maxpool_2d_same_lower_cpu"
+        "|test_maxpool_2d_same_upper_cpu"
+        "|test_maxpool_2d_strides_cpu"
+        "|test_maxpool_2d_uint8_cpu"
+        "|test_maxpool_3d_default_cpu"
+        "|test_maxpool_3d_dilations_cpu"
+        "|test_maxpool_3d_dilations_use_ref_impl_cpu"
+        "|test_maxpool_3d_dilations_use_ref_impl_large_cpu"
+        "|test_maxpool_with_argmax_2d_precomputed_pads_cpu"
+        "|test_maxpool_with_argmax_2d_precomputed_strides_cpu"
+        "|test_maxunpool_export_without_output_shape_cpu"
+        "|test_mish_cpu"
+        "|test_mish_expanded_cpu"
+        "|test_nllloss_NC_cpu"
+        "|test_nllloss_NC_expanded_cpu"
+        "|test_nllloss_NCd1_cpu"
+        "|test_nllloss_NCd1_expanded_cpu"
+        "|test_nllloss_NCd1_ii_cpu"
+        "|test_nllloss_NCd1_ii_expanded_cpu"
+        "|test_nllloss_NCd1_mean_weight_negative_ii_cpu"
+        "|test_nllloss_NCd1_mean_weight_negative_ii_expanded_cpu"
+        "|test_nllloss_NCd1_weight_cpu"
+        "|test_nllloss_NCd1_weight_expanded_cpu"
+        "|test_nllloss_NCd1_weight_ii_cpu"
+        "|test_nllloss_NCd1_weight_ii_expanded_cpu"
+        "|test_nllloss_NCd1d2_cpu"
+        "|test_nllloss_NCd1d2_expanded_cpu"
+        "|test_nllloss_NCd1d2_no_weight_reduction_mean_ii_cpu"
+        "|test_nllloss_NCd1d2_no_weight_reduction_mean_ii_expanded_cpu"
+        "|test_nllloss_NCd1d2_reduction_mean_cpu"
+        "|test_nllloss_NCd1d2_reduction_mean_expanded_cpu"
+        "|test_nllloss_NCd1d2_reduction_sum_cpu"
+        "|test_nllloss_NCd1d2_reduction_sum_expanded_cpu"
+        "|test_nllloss_NCd1d2_with_weight_cpu"
+        "|test_nllloss_NCd1d2_with_weight_expanded_cpu"
+        "|test_nllloss_NCd1d2_with_weight_reduction_mean_cpu"
+        "|test_nllloss_NCd1d2_with_weight_reduction_mean_expanded_cpu"
+        "|test_nllloss_NCd1d2_with_weight_reduction_sum_cpu"
+        "|test_nllloss_NCd1d2_with_weight_reduction_sum_expanded_cpu"
+        "|test_nllloss_NCd1d2_with_weight_reduction_sum_ii_cpu"
+        "|test_nllloss_NCd1d2_with_weight_reduction_sum_ii_expanded_cpu"
+        "|test_nllloss_NCd1d2d3_none_no_weight_negative_ii_cpu"
+        "|test_nllloss_NCd1d2d3_none_no_weight_negative_ii_expanded_cpu"
+        "|test_nllloss_NCd1d2d3_sum_weight_high_ii_cpu"
+        "|test_nllloss_NCd1d2d3_sum_weight_high_ii_expanded_cpu"
+        "|test_nllloss_NCd1d2d3d4d5_mean_weight_cpu"
+        "|test_nllloss_NCd1d2d3d4d5_mean_weight_expanded_cpu"
+        "|test_nllloss_NCd1d2d3d4d5_none_no_weight_cpu"
+        "|test_nllloss_NCd1d2d3d4d5_none_no_weight_expanded_cpu"
+        "|test_rnn_seq_length_cpu"
+        "|test_roialign_aligned_false_cpu"
+        "|test_roialign_aligned_true_cpu"
+        "|test_roialign_mode_max_cpu"
+        "|test_round_cpu"
+        "|test_selu_cpu"
+        "|test_selu_default_cpu"
+        "|test_selu_example_cpu"
+        "|test_simple_rnn_defaults_cpu"
+        "|test_simple_rnn_with_initial_bias_cpu"
+        "|test_sin_cpu"
+        "|test_sin_example_cpu"
+        "|test_sinh_cpu"
+        "|test_sinh_example_cpu"
+        "|test_softplus_cpu"
+        "|test_softplus_example_cpu"
+        "|test_softsign_cpu"
+        "|test_softsign_example_cpu"
+        "|test_tan_cpu"
+        "|test_tan_example_cpu"
+        "|test_thresholdedrelu_cpu"
+        "|test_thresholdedrelu_default_cpu"
+        "|test_thresholdedrelu_example_cpu"
+        "|test_resize_downsample_scales_cubic_A_n0p5_exclude_outside_cpu"
+        "|test_resize_downsample_scales_cubic_antialias_cpu"
+        "|test_resize_downsample_scales_cubic_cpu"
+        "|test_resize_downsample_scales_linear_antialias_cpu"
+        "|test_resize_downsample_scales_linear_cpu"
+        "|test_resize_downsample_scales_linear_half_pixel_symmetric_cpu"
+        "|test_resize_downsample_scales_nearest_cpu"
+        "|test_resize_downsample_sizes_cubic_antialias_cpu"
+        "|test_resize_downsample_sizes_cubic_cpu"
+        "|test_resize_downsample_sizes_linear_antialias_cpu"
+        "|test_resize_downsample_sizes_linear_pytorch_half_pixel_cpu"
+        "|test_resize_downsample_sizes_nearest_cpu"
+        "|test_resize_downsample_sizes_nearest_not_larger_cpu"
+        "|test_resize_downsample_sizes_nearest_not_smaller_cpu"
+        "|test_resize_tf_crop_and_resize_axes_2_3_cpu"
+        "|test_resize_tf_crop_and_resize_axes_3_2_cpu"
+        "|test_resize_tf_crop_and_resize_cpu"
+        "|test_resize_upsample_scales_cubic_A_n0p5_exclude_outside_cpu"
+        "|test_resize_upsample_scales_cubic_align_corners_cpu"
+        "|test_resize_upsample_scales_cubic_asymmetric_cpu"
+        "|test_resize_upsample_scales_cubic_cpu"
+        "|test_resize_upsample_scales_linear_align_corners_cpu"
+        "|test_resize_upsample_scales_linear_cpu"
+        "|test_resize_upsample_scales_linear_half_pixel_symmetric_cpu"
+        "|test_resize_upsample_scales_nearest_axes_2_3_cpu"
+        "|test_resize_upsample_scales_nearest_axes_3_2_cpu"
+        "|test_resize_upsample_scales_nearest_cpu"
+        "|test_resize_upsample_sizes_cubic_cpu"
+        "|test_resize_upsample_sizes_nearest_axes_2_3_cpu"
+        "|test_resize_upsample_sizes_nearest_axes_3_2_cpu"
+        "|test_resize_upsample_sizes_nearest_ceil_half_pixel_cpu"
+        "|test_resize_upsample_sizes_nearest_cpu"
+        "|test_resize_upsample_sizes_nearest_floor_align_corners_cpu"
+        "|test_resize_upsample_sizes_nearest_not_larger_cpu"
+        "|test_resize_upsample_sizes_nearest_round_prefer_ceil_asymmetric_cpu"
+        "|test_qlinearmatmul_2D_uint8_float32_cuda"
+        "|test_qlinearmatmul_2D_int8_float32_cpu"
+        "|test_image_decoder_decode_jpeg_rgb_cpu"
+        "|test_basic_deform_conv_without_padding_cuda"
+        "|test_qlinearmatmul_3D_int8_float16_cuda"
+        "|test_image_decoder_decode_bmp_rgb_cuda"
+        "|test_qlinearmatmul_2D_uint8_float16_cpu"
+        "|test_image_decoder_decode_jpeg2k_rgb_cuda"
+        "|test_image_decoder_decode_jpeg_bgr_cuda"
+        "|test_qlinearmatmul_3D_uint8_float32_cpu"
+        "|test_qlinearmatmul_3D_uint8_float16_cuda"
+        "|test_deform_conv_with_mask_bias_cpu"
+        "|test_qlinearmatmul_2D_int8_float16_cuda"
+        "|test_image_decoder_decode_jpeg_grayscale_cpu"
+        "|test_basic_deform_conv_without_padding_cpu"
+        "|test_qlinearmatmul_3D_int8_float32_cuda"
+        "|test_qlinearmatmul_3D_int8_float16_cpu"
+        "|test_qlinearmatmul_2D_int8_float32_cuda"
+        "|test_deform_conv_with_mask_bias_cuda"
+        "|test_image_decoder_decode_tiff_rgb_cuda"
+        "|test_image_decoder_decode_jpeg2k_rgb_cpu"
+        "|test_image_decoder_decode_jpeg_rgb_cuda"
+        "|test_image_decoder_decode_jpeg_grayscale_cuda"
+        "|test_qlinearmatmul_3D_uint8_float32_cuda"
+        "|test_image_decoder_decode_png_rgb_cpu"
+        "|test_image_decoder_decode_png_rgb_cuda"
+        "|test_image_decoder_decode_bmp_rgb_cpu"
+        "|test_qlinearmatmul_3D_uint8_float16_cpu"
+        "|test_deform_conv_with_multiple_offset_groups_cuda"
+        "|test_image_decoder_decode_webp_rgb_cpu"
+        "|test_basic_deform_conv_with_padding_cpu"
+        "|test_qlinearmatmul_2D_uint8_float16_cuda"
+        "|test_image_decoder_decode_webp_rgb_cuda"
+        "|test_basic_deform_conv_with_padding_cuda"
+        "|test_image_decoder_decode_pnm_rgb_cpu"
+        "|test_qlinearmatmul_3D_int8_float32_cpu"
+        "|test_image_decoder_decode_jpeg_bgr_cpu"
+        "|test_qlinearmatmul_2D_int8_float16_cpu"
+        "|test_image_decoder_decode_pnm_rgb_cuda"
+        "|test_deform_conv_with_multiple_offset_groups_cpu"
+        "|test_qlinearmatmul_2D_uint8_float32_cpu"
+        "|test_image_decoder_decode_tiff_rgb_cpu"
+        "|test_globalmaxpool_cpu"
+        "|test_globalmaxpool_precomputed_cpu"
+        "|test_instancenorm_example_cpu"
+        "|test_instancenorm_epsilon_cpu"
         ")"
     )
 
@@ -305,7 +567,6 @@ if ort is not None:
         backend_test.exclude(
             "("
             "deform_conv"  # deform_conv is not supported in onnxruntime
-            "|dft"  # Max absolute difference > atol=1e-07. shall be able to set atol (https://github.com/onnx/onnx/issues/5897)
             "|group_normalization"  # new/updated test cases with opset and/or IR version not supported by onnxruntime 1.17
             "|identity_opt"  # fixed in ort 1.18 (https://github.com/microsoft/onnxruntime/pull/19273)
             "|image_decoder"  # image_decoder is not supported in onnxruntime
@@ -320,6 +581,16 @@ if ort is not None:
             ")"
         )
 
+    if ort_version is not None and ort_version < Version("1.20"):
+        backend_test.exclude(
+            "("
+            "tree_ensemble_set_membership"
+            "|tree_ensemble_single_tree"
+            "|convtranspose_group_2"
+            "|dft"
+            ")"
+        )
+
     # Import all test cases at global scope to make them visible to python.unittest
     globals().update(backend_test.test_cases)
 

onnx/test/test_backend_reference.py

@@ -1,6 +1,7 @@
 # Copyright (c) ONNX Project Contributors
 
 # SPDX-License-Identifier: Apache-2.0
+from __future__ import annotations
 
 import os
 import platform
@@ -26,7 +27,7 @@ class ReferenceEvaluatorBackendRep(onnx.backend.base.BackendRep):
     def __init__(self, session):
         self._session = session
 
-    def run(self, inputs, **kwargs):
+    def run(self, inputs, **kwargs):  # noqa: ARG002
         if isinstance(inputs, numpy.ndarray):
             inputs = [inputs]
         if isinstance(inputs, list):
@@ -54,7 +55,7 @@ class ReferenceEvaluatorBackendRep(onnx.backend.base.BackendRep):
 
 class ReferenceEvaluatorBackend(onnx.backend.base.Backend):
     @classmethod
-    def is_opset_supported(cls, model):
+    def is_opset_supported(cls, model):  # noqa: ARG003
         return True, ""
 
     @classmethod
@@ -89,7 +90,19 @@ class ReferenceEvaluatorBackend(onnx.backend.base.Backend):
         raise NotImplementedError("Unable to run the model node by node.")
 
 
-backend_test = onnx.backend.test.BackendTest(ReferenceEvaluatorBackend, __name__)
+dft_atol = 1e-3 if sys.platform != "linux" else 1e-6
+backend_test = onnx.backend.test.BackendTest(
+    ReferenceEvaluatorBackend,
+    __name__,
+    test_kwargs={
+        "test_dft": {"atol": dft_atol},
+        "test_dft_axis": {"atol": dft_atol},
+        "test_dft_axis_opset19": {"atol": dft_atol},
+        "test_dft_inverse": {"atol": dft_atol},
+        "test_dft_inverse_opset19": {"atol": dft_atol},
+        "test_dft_opset19": {"atol": dft_atol},
+    },
+)
 
 if os.getenv("APPVEYOR"):
     backend_test.exclude("(test_vgg19|test_zfnet)")
@@ -187,6 +200,10 @@ if sys.platform == "win32":
     backend_test.exclude("test_regex_full_match_empty_cpu")
     backend_test.exclude("test_image_decoder_decode_")
 
+if sys.version_info <= (3, 10):
+    #  AttributeError: module 'numpy.typing' has no attribute 'NDArray'
+    backend_test.exclude("test_image_decoder_decode_")
+
 if sys.platform == "darwin":
     # FIXME: https://github.com/onnx/onnx/issues/5792
     backend_test.exclude("test_qlinearmatmul_3D_int8_float16_cpu")
@@ -204,6 +221,10 @@ if version_utils.numpy_older_than("1.21.5"):
     backend_test.exclude("test_dft_axis_opset19")
     backend_test.exclude("test_dft_inverse_opset19")
 
+if version_utils.pillow_older_than("10.0"):
+    backend_test.exclude("test_image_decoder_decode_webp_rgb")
+    backend_test.exclude("test_image_decoder_decode_jpeg2k_rgb")
+
 # import all test cases at global scope to make them visible to python.unittest
 globals().update(backend_test.test_cases)
 

onnx/test/test_backend_test.py

@@ -1,12 +1,13 @@
 # Copyright (c) ONNX Project Contributors
 
 # SPDX-License-Identifier: Apache-2.0
+from __future__ import annotations
 
 import itertools
 import os
 import platform
 import unittest
-from typing import Any, Optional, Sequence, Tuple
+from typing import Any, Sequence
 
 import numpy
 
@@ -34,7 +35,7 @@ class DummyBackend(onnx.backend.base.Backend):
     @classmethod
     def prepare(
         cls, model: ModelProto, device: str = "CPU", **kwargs: Any
-    ) -> Optional[onnx.backend.base.BackendRep]:
+    ) -> onnx.backend.base.BackendRep | None:
         super().prepare(model, device, **kwargs)
 
         onnx.checker.check_model(model)
@@ -69,9 +70,9 @@ class DummyBackend(onnx.backend.base.Backend):
         node: NodeProto,
         inputs: Any,
         device: str = "CPU",
-        outputs_info: Optional[Sequence[Tuple[numpy.dtype, Tuple[int, ...]]]] = None,
-        **kwargs: Any,
-    ) -> Optional[Tuple[Any, ...]]:
+        outputs_info: Sequence[tuple[numpy.dtype, tuple[int, ...]]] | None = None,
+        **kwargs: Any,  # noqa: ARG003
+    ) -> tuple[Any, ...] | None:
         super().run_node(node, inputs, device=device, outputs_info=outputs_info)
         raise BackendIsNotSupposedToImplementIt(
             "This is the dummy backend test that doesn't verify the results but does run the checker"

onnx/test/test_external_data.py

@@ -9,13 +9,21 @@ import pathlib
 import tempfile
 import unittest
 import uuid
-from typing import Any
+from typing import Any, Sequence
 
 import numpy as np
 import parameterized
 
 import onnx
-from onnx import ModelProto, TensorProto, checker, helper, shape_inference
+from onnx import (
+    ModelProto,
+    NodeProto,
+    TensorProto,
+    checker,
+    helper,
+    parser,
+    shape_inference,
+)
 from onnx.external_data_helper import (
     convert_model_from_external_data,
     convert_model_to_external_data,
@@ -794,5 +802,86 @@ class TestExternalDataToArrayWithPath(TestExternalDataToArray):
         return pathlib.Path(self._model_file_path)
 
 
+class TestFunctionsAndSubGraphs(unittest.TestCase):
+    def setUp(self) -> None:
+        self._temp_dir_obj = tempfile.TemporaryDirectory()
+        temp_dir = self._temp_dir_obj.name
+        self._model_file_path: str = os.path.join(temp_dir, "model.onnx")
+        array = np.arange(4096).astype(np.float32)
+        self._tensor = from_array(array, "tensor")
+
+    def tearDown(self) -> None:
+        self._temp_dir_obj.cleanup()
+
+    def _check_is_internal(self, tensor: TensorProto) -> None:
+        self.assertEqual(tensor.data_location, TensorProto.DEFAULT)
+
+    def _check_is_external(self, tensor: TensorProto) -> None:
+        self.assertEqual(tensor.data_location, TensorProto.EXTERNAL)
+
+    def _check(self, model: ModelProto, nodes: Sequence[NodeProto]) -> None:
+        """Check that the tensors in the model are externalized.
+
+        The tensors in the specified sequence of Constant nodes are set to self._tensor,
+        an internal tensor. The model is then converted to external data format.
+        The tensors are then checked to ensure that they are externalized.
+
+        Arguments:
+            model: The model to check.
+            nodes: A sequence of Constant nodes.
+
+        """
+        for node in nodes:
+            self.assertEqual(node.op_type, "Constant")
+            tensor = node.attribute[0].t
+            tensor.CopyFrom(self._tensor)
+            self._check_is_internal(tensor)
+
+        convert_model_to_external_data(model, size_threshold=0, convert_attribute=True)
+
+        for node in nodes:
+            tensor = node.attribute[0].t
+            self._check_is_external(tensor)
+
+    def test_function(self) -> None:
+        model_text = """
+           <ir_version: 7,  opset_import: ["": 15, "local": 1]>
+           agraph (float[N] X) => (float[N] Y)
+            {
+              Y = local.add(X)
+            }
+
+            <opset_import: ["" : 15],  domain: "local">
+            add (float[N] X) => (float[N] Y) {
+              C = Constant <value = float[1] {1.0}> ()
+              Y = Add (X, C)
+           }
+        """
+        model = parser.parse_model(model_text)
+        self._check(model, [model.functions[0].node[0]])
+
+    def test_subgraph(self) -> None:
+        model_text = """
+           <ir_version: 7,  opset_import: ["": 15, "local": 1]>
+           agraph (bool flag, float[N] X) => (float[N] Y)
+            {
+              Y = if (flag) <
+                then_branch = g1 () => (float[N] Y_then) {
+                    B = Constant <value = float[1] {0.0}> ()
+                    Y_then = Add (X, C)
+                },
+                else_branch = g2 () => (float[N] Y_else) {
+                    C = Constant <value = float[1] {1.0}> ()
+                    Y_else = Add (X, C)
+                }
+              >
+            }
+        """
+        model = parser.parse_model(model_text)
+        if_node = model.graph.node[0]
+        constant_nodes = [attr.g.node[0] for attr in if_node.attribute]
+        self._check(model, constant_nodes)
+
+
 if __name__ == "__main__":
     unittest.main()

onnx/test/test_with_ort.py

@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # This file is for testing ONNX with ONNX Runtime
 # Create a general scenario to use ONNX Runtime with ONNX
+from __future__ import annotations
 
 import unittest
 

onnx/test/tools_test.py

@@ -1,6 +1,7 @@
 # Copyright (c) ONNX Project Contributors
 
 # SPDX-License-Identifier: Apache-2.0
+from __future__ import annotations
 
 import unittest
 
@@ -74,14 +75,14 @@ class TestToolsFunctions(unittest.TestCase):
 
         x = np.array([1, 2, 4, 5, 5, 4]).astype(np.float32).reshape((3, 2))
         oinf1 = ReferenceEvaluator(model_def)
-        y1 = oinf1.run(None, {"X": x})[0]
+        y1 = oinf1.run(None, {"X": x})[0]  # type: ignore[index]
         repl = replace_initializer_by_constant_of_shape(model_def)
         node_types = {n.op_type for n in repl.graph.node}
         self.assertIn("ConstantOfShape", node_types)
         oinf2 = ReferenceEvaluator(repl)
         y1[:, :] = 3.5
         y1[0, :] = 0.5
-        y2 = oinf2.run(None, {"X": x})[0]
+        y2 = oinf2.run(None, {"X": x})[0]  # type: ignore[index]
         assert_allclose(y1, y2)
 
     def test_replace_constant(self):
@@ -101,14 +102,14 @@ class TestToolsFunctions(unittest.TestCase):
 
         x = np.array([1, 2, 4, 5, 5, 4]).astype(np.float32).reshape((3, 2))
         oinf1 = ReferenceEvaluator(model_def)
-        y1 = oinf1.run(None, {"X": x})[0]
+        y1 = oinf1.run(None, {"X": x})[0]  # type: ignore[index]
         repl = replace_initializer_by_constant_of_shape(model_def)
         node_types = {n.op_type for n in repl.graph.node}
         self.assertIn("ConstantOfShape", node_types)
         oinf2 = ReferenceEvaluator(repl)
         y1[:, :] = 3.5
         y1[0, :] = 0.5
-        y2 = oinf2.run(None, {"X": x})[0]
+        y2 = oinf2.run(None, {"X": x})[0]  # type: ignore[index]
         assert_allclose(y1, y2)
 
     def test_replace_range(self):
@@ -128,13 +129,13 @@ class TestToolsFunctions(unittest.TestCase):
 
         x = np.array([1, 2, 4, 5, 5, 4]).astype(np.float32).reshape((3, 2))
         oinf1 = ReferenceEvaluator(model_def)
-        y1 = oinf1.run(None, {"X": x})[0]
+        y1 = oinf1.run(None, {"X": x})[0]  # type: ignore[index]
         repl = replace_initializer_by_constant_of_shape(model_def, use_range=True)
         node_types = {n.op_type for n in repl.graph.node}
         self.assertIn("Range", node_types)
         self.assertNotIn("ConstantOfShape", node_types)
         oinf2 = ReferenceEvaluator(repl)
-        y2 = oinf2.run(None, {"X": x})[0]
+        y2 = oinf2.run(None, {"X": x})[0]  # type: ignore[index]
         assert_allclose(y1.shape, y2.shape)
 
     def test_replace_constant_function(self):
@@ -171,14 +172,14 @@ class TestToolsFunctions(unittest.TestCase):
 
         x = np.array([1, 2, 4, 5, 5, 4]).astype(np.float32).reshape((3, 2))
         oinf1 = ReferenceEvaluator(model_def)
-        y1 = oinf1.run(None, {"X": x})[0]
+        y1 = oinf1.run(None, {"X": x})[0]  # type: ignore[index]
         repl = replace_initializer_by_constant_of_shape(model_def)
         node_types = {n.op_type for n in repl.functions[0].node}
         self.assertIn("ConstantOfShape", node_types)
         oinf2 = ReferenceEvaluator(repl)
         y1[:, :] = 3.5
         y1[0, :] = 0.5
-        y2 = oinf2.run(None, {"X": x})[0]
+        y2 = oinf2.run(None, {"X": x})[0]  # type: ignore[index]
         assert_allclose(y1, y2)
 
     def test_replace_range_function(self):
@@ -215,13 +216,13 @@ class TestToolsFunctions(unittest.TestCase):
 
         x = np.array([1, 2, 4, 5, 5, 4]).astype(np.float32).reshape((3, 2))
         oinf1 = ReferenceEvaluator(model_def)
-        y1 = oinf1.run(None, {"X": x})[0]
+        y1 = oinf1.run(None, {"X": x})[0]  # type: ignore[index]
         repl = replace_initializer_by_constant_of_shape(model_def, use_range=True)
         node_types = {n.op_type for n in repl.functions[0].node}
         self.assertIn("Range", node_types)
         self.assertNotIn("ConstantOfShape", node_types)
         oinf2 = ReferenceEvaluator(repl)
-        y2 = oinf2.run(None, {"X": x})[0]
+        y2 = oinf2.run(None, {"X": x})[0]  # type: ignore[index]
         assert_allclose(y1.shape, y2.shape)
 
     def test_replace_constant_graph(self):
@@ -264,11 +265,11 @@ class TestToolsFunctions(unittest.TestCase):
 
         x = np.ones((3, 2), dtype=np.float32)
         oinf1 = ReferenceEvaluator(onnx_model)
-        y1 = oinf1.run(None, {"X": x})[0]
+        y1 = oinf1.run(None, {"X": x})[0]  # type: ignore[index]
         repl = replace_initializer_by_constant_of_shape(onnx_model)
         self.assertIn("ConstantOfShape", str(repl))
         oinf2 = ReferenceEvaluator(repl)
-        y2 = oinf2.run(None, {"X": x})[0]
+        y2 = oinf2.run(None, {"X": x})[0]  # type: ignore[index]
         y1 = y1.copy()
         y1[:] = 0.5
         assert_allclose(y1, y2)
@@ -313,12 +314,12 @@ class TestToolsFunctions(unittest.TestCase):
 
         x = np.ones((3, 2), dtype=np.float32)
         oinf1 = ReferenceEvaluator(onnx_model)
-        y1 = oinf1.run(None, {"X": x})[0]
+        y1 = oinf1.run(None, {"X": x})[0]  # type: ignore[index]
         repl = replace_initializer_by_constant_of_shape(onnx_model, use_range=True)
         self.assertNotIn("ConstantOfShape", str(repl))
         self.assertIn("Range", str(repl))
         oinf2 = ReferenceEvaluator(repl)
-        y2 = oinf2.run(None, {"X": x})[0]
+        y2 = oinf2.run(None, {"X": x})[0]  # type: ignore[index]
         assert_allclose(y1.shape, y2.shape)
 
 

onnx/test/training_tool_test.py

@@ -1,6 +1,7 @@
 # Copyright (c) ONNX Project Contributors
 
 # SPDX-License-Identifier: Apache-2.0
+from __future__ import annotations
 
 import unittest
 

onnx/test/utils_test.py

@@ -1,6 +1,7 @@
 # Copyright (c) ONNX Project Contributors
 
 # SPDX-License-Identifier: Apache-2.0
+from __future__ import annotations
 
 import os
 import shutil

onnx/test/version_converter/automatic_downgrade_test.py

@@ -1,6 +1,8 @@
 # Copyright (c) ONNX Project Contributors
 
 # SPDX-License-Identifier: Apache-2.0
+from __future__ import annotations
+
 import unittest
 
 import automatic_conversion_test_base

onnx/test/version_converter/automatic_upgrade_test.py

@@ -1,6 +1,8 @@
 # Copyright (c) ONNX Project Contributors
 
 # SPDX-License-Identifier: Apache-2.0
+from __future__ import annotations
+
 import unittest
 
 import automatic_conversion_test_base