onnx 1.16.2__cp311-cp311-win32.whl → 1.18.0__cp311-cp311-win32.whl

onnx/backend/test/case/node/__init__.py

@@ -1,14 +1,13 @@
 # Copyright (c) ONNX Project Contributors
 #
 # SPDX-License-Identifier: Apache-2.0
+from __future__ import annotations
 
 import subprocess
 import sys
 from copy import deepcopy
 from pathlib import Path
-from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union
-
-import numpy as np
+from typing import TYPE_CHECKING, Any, Callable
 
 import onnx
 from onnx.backend.test.case.test_case import TestCase
@@ -23,15 +22,21 @@ from onnx.onnx_pb import (
     TypeProto,
 )
 
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+    import numpy as np
+
 _NodeTestCases = []
 _TargetOpType = None
 _DiffOpTypes = None
+_existing_names: dict[str, onnx.NodeProto] = {}
 
 
 def _rename_edges_helper(
     internal_node: NodeProto,
     rename_helper: Callable[[str], str],
-    attribute_map: Dict[str, AttributeProto],
+    attribute_map: dict[str, AttributeProto],
     prefix: str,
 ) -> NodeProto:
     new_node = NodeProto()
@@ -47,7 +52,7 @@ def _rename_edges_helper(
         if attr.HasField("ref_attr_name"):
             if attr.ref_attr_name in attribute_map:
                 new_attr = AttributeProto()
-                new_attr.CopyFrom(attribute_map[attr.ref_attr_name])  # type: ignore
+                new_attr.CopyFrom(attribute_map[attr.ref_attr_name])
                 new_attr.name = attr.name
                 new_node.attribute.extend([new_attr])
         else:
@@ -63,17 +68,13 @@ def _rename_edges_helper(
                 for init_desc in new_graph.initializer:
                     sg_rename[init_desc.name] = init_desc.name = prefix + init_desc.name
                 for sparse_init_desc in new_graph.sparse_initializer:
-                    sg_rename[
+                    sg_rename[sparse_init_desc.values.name] = (
                         sparse_init_desc.values.name
-                    ] = sparse_init_desc.values.name = (
-                        prefix + sparse_init_desc.values.name
-                    )
+                    ) = prefix + sparse_init_desc.values.name
                 for sparse_init_desc in new_graph.sparse_initializer:
-                    sg_rename[
+                    sg_rename[sparse_init_desc.indices.name] = (
                         sparse_init_desc.indices.name
-                    ] = sparse_init_desc.indices.name = (
-                        prefix + sparse_init_desc.indices.name
-                    )
+                    ) = prefix + sparse_init_desc.indices.name
 
                 def subgraph_rename_helper(name: str) -> Any:
                     if name in sg_rename:  # noqa: B023
@@ -95,16 +96,14 @@ def _rename_edges_helper(
 # FIXME(TMVector): Any reason we can't get rid of this and use the C++ helper directly?
 def function_expand_helper(
     node: NodeProto, function_proto: FunctionProto, op_prefix: str
-) -> List[NodeProto]:
+) -> list[NodeProto]:
     io_names_map = {}
     attribute_map = {a.name: a for a in node.attribute}
 
-    for idx in range(len(function_proto.input)):
-        io_names_map[function_proto.input[idx]] = (
-            node.input[idx] if idx in range(len(node.input)) else ""
-        )
+    for idx, input in enumerate(function_proto.input):
+        io_names_map[input] = node.input[idx] if idx in range(len(node.input)) else ""
 
-    for idx in range(len(function_proto.output)):
+    for idx, output in enumerate(function_proto.output):
         # Even if the node has been created with optional outputs missing, we
         # can't assume that the function body handles this correctly, such as in
         # the case that output is also an intermediate value.
@@ -112,7 +111,7 @@ def function_expand_helper(
         # name will be generated if the missing output is used, the same as any
         # other internal tensor.
         if idx in range(len(node.output)) and node.output[idx] != "":
-            io_names_map[function_proto.output[idx]] = node.output[idx]
+            io_names_map[output] = node.output[idx]
 
     def rename_helper(internal_name: str) -> Any:
         if internal_name in io_names_map:
@@ -129,8 +128,8 @@ def function_expand_helper(
 
 
 def function_testcase_helper(
-    node: NodeProto, input_types: List[TypeProto], name: str
-) -> Tuple[List[Tuple[List[NodeProto], Any]], int]:
+    node: NodeProto, input_types: list[TypeProto], name: str
+) -> tuple[list[tuple[list[NodeProto], Any]], int]:
     test_op = node.op_type
     op_prefix = test_op + "_" + name + "_expanded_function_"
     schema = onnx.defs.get_schema(test_op, domain=node.domain)
@@ -170,9 +169,9 @@ def function_testcase_helper(
 
 
 def _extract_value_info(
-    input: Union[List[Any], np.ndarray, None],
+    input: list[Any] | np.ndarray | None,
     name: str,
-    type_proto: Optional[TypeProto] = None,
+    type_proto: TypeProto | None = None,
 ) -> onnx.ValueInfoProto:
     if type_proto is None:
         if input is None:
@@ -197,7 +196,11 @@ def _extract_value_info(
 
 
 def _make_test_model_gen_version(graph: GraphProto, **kwargs: Any) -> ModelProto:
-    latest_onnx_version, latest_ml_version, latest_training_version = onnx.helper.VERSION_TABLE[-1][2:5]  # type: ignore
+    (
+        latest_onnx_version,
+        latest_ml_version,
+        latest_training_version,
+    ) = onnx.helper.VERSION_TABLE[-1][2:5]  # type: ignore
     if "opset_imports" in kwargs:
         for opset in kwargs["opset_imports"]:
             # If the test model uses an unreleased opset version (latest_version+1),
@@ -236,8 +239,8 @@ def _make_test_model_gen_version(graph: GraphProto, **kwargs: Any) -> ModelProto
 # the latest opset vesion that supports before targeted opset version
 def expect(
     node_op: onnx.NodeProto,
-    inputs: Sequence[Union[np.ndarray, TensorProto]],
-    outputs: Sequence[Union[np.ndarray, TensorProto]],
+    inputs: Sequence[np.ndarray | TensorProto],
+    outputs: Sequence[np.ndarray | TensorProto],
     name: str,
     **kwargs: Any,
 ) -> None:
@@ -246,6 +249,11 @@ def expect(
         return
     if _DiffOpTypes is not None and node_op.op_type.lower() not in _DiffOpTypes:
         return
+    if name in _existing_names:
+        raise ValueError(
+            f"Name {name!r} is already using by one test case for node type {node_op.op_type!r}."
+        )
+    _existing_names[name] = node_op
 
     # in case node_op is modified
     node = deepcopy(node_op)
@@ -303,8 +311,8 @@ def expect(
     # Create list of types for node.input, filling a default TypeProto for missing inputs:
     # E.g. merge(["x", "", "y"], [x-value-info, y-value-info]) will return [x-type, default-type, y-type]
     def merge(
-        node_inputs: List[str], present_value_info: List[onnx.ValueInfoProto]
-    ) -> List[TypeProto]:
+        node_inputs: list[str], present_value_info: list[onnx.ValueInfoProto]
+    ) -> list[TypeProto]:
         if node_inputs:
             if node_inputs[0] != "":
                 return [
@@ -372,7 +380,7 @@ def expect(
         )
 
 
-def collect_testcases(op_type: str) -> List[TestCase]:
+def collect_testcases(op_type: str) -> list[TestCase]:
     """Collect node test cases"""
     # only keep those tests related to this operator
     global _TargetOpType  # noqa: PLW0603
@@ -382,7 +390,7 @@ def collect_testcases(op_type: str) -> List[TestCase]:
     return _NodeTestCases
 
 
-def collect_diff_testcases() -> List[TestCase]:
+def collect_diff_testcases() -> list[TestCase]:
     """Collect node test cases which are different from the main branch"""
     global _DiffOpTypes  # noqa: PLW0603
     _DiffOpTypes = get_diff_op_types()
@@ -401,19 +409,19 @@ def get_diff_op_types():
         check=True,
     )
     # obtain list of added or modified files in this PR
-    obtain_diff = subprocess.Popen(
+    with subprocess.Popen(
         ["git", "diff", "--name-only", "--diff-filter=AM", "origin/main", "HEAD"],
         cwd=cwd_path,
         stdout=subprocess.PIPE,
         stderr=subprocess.PIPE,
-    )
-    stdoutput, _ = obtain_diff.communicate()
-    diff_list = stdoutput.split()
-    changed_op_types = []
-    for file in diff_list:
-        file_name = file.decode("utf-8")
-        if file_name.startswith("onnx/backend/test/case/node/") and file_name.endswith(
-            ".py"
-        ):
-            changed_op_types.append(file_name.split("/")[-1].replace(".py", ""))
-    return changed_op_types
+    ) as obtain_diff:
+        stdoutput, _ = obtain_diff.communicate()
+        diff_list = stdoutput.split()
+        changed_op_types = []
+        for file in diff_list:
+            file_name = file.decode("utf-8")
+            if file_name.startswith(
+                "onnx/backend/test/case/node/"
+            ) and file_name.endswith(".py"):
+                changed_op_types.append(file_name.split("/")[-1].replace(".py", ""))
+        return changed_op_types

onnx/backend/test/case/node/_image_decoder_data.py

@@ -6,6 +6,7 @@
 # They were generated by image_decoder.py's generate_test_data with pillow
 # To make ONNX backend test generation simple, use freeze NumPy array directly
 # People can still use generate_test_data to get these data here with installed pillow
+from __future__ import annotations
 
 from typing import NamedTuple
 

onnx/backend/test/case/node/abs.py

@@ -1,11 +1,11 @@
 # Copyright (c) ONNX Project Contributors
 #
 # SPDX-License-Identifier: Apache-2.0
+from __future__ import annotations
 
 import numpy as np
 
 import onnx
-from onnx.backend.sample.ops.abs import abs
 from onnx.backend.test.case.base import Base
 from onnx.backend.test.case.node import expect
 
@@ -19,6 +19,6 @@ class Abs(Base):
             outputs=["y"],
         )
         x = np.random.randn(3, 4, 5).astype(np.float32)
-        y = abs(x)
+        y = np.abs(x)
 
         expect(node, inputs=[x], outputs=[y], name="test_abs")

onnx/backend/test/case/node/acos.py

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

onnx/backend/test/case/node/acosh.py

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

onnx/backend/test/case/node/adagrad.py

@@ -1,6 +1,7 @@
 # Copyright (c) ONNX Project Contributors
 #
 # SPDX-License-Identifier: Apache-2.0
+from __future__ import annotations
 
 import numpy as np
 
@@ -10,7 +11,7 @@ from onnx.backend.test.case.node import expect
 from onnx.defs import AI_ONNX_PREVIEW_TRAINING_DOMAIN
 
 
-def apply_adagrad(r, t, x, g, h, norm_coefficient, epsilon, decay_factor):  # type: ignore
+def apply_adagrad(r, t, x, g, h, norm_coefficient, epsilon, decay_factor):
     # Compute adjusted learning-rate.
     r_ = r / (1 + t * decay_factor)
     # Add gradient of regularization term.
@@ -21,7 +22,7 @@ def apply_adagrad(r, t, x, g, h, norm_coefficient, epsilon, decay_factor):  # ty
     h_sqrt = np.sqrt(h_new) + epsilon
     # Apply ADAGRAD update rule.
     x_new = x - r_ * g_regularized / h_sqrt
-    return (x_new, h_new)
+    return (x_new.astype(x.dtype), h_new.astype(h.dtype))
 
 
 class Adagrad(Base):

onnx/backend/test/case/node/adam.py

@@ -1,6 +1,7 @@
 # Copyright (c) ONNX Project Contributors
 #
 # SPDX-License-Identifier: Apache-2.0
+from __future__ import annotations
 
 import numpy as np
 
@@ -10,7 +11,9 @@ from onnx.backend.test.case.node import expect
 from onnx.defs import AI_ONNX_PREVIEW_TRAINING_DOMAIN
 
 
-def apply_adam(r, t, x, g, v, h, norm_coefficient, norm_coefficient_post, alpha, beta, epsilon):  # type: ignore
+def apply_adam(
+    r, t, x, g, v, h, norm_coefficient, norm_coefficient_post, alpha, beta, epsilon
+):
     # Add gradient of regularization term.
     g_regularized = norm_coefficient * x + g
     # Update momentum.

onnx/backend/test/case/node/add.py

@@ -1,6 +1,7 @@
 # Copyright (c) ONNX Project Contributors
 #
 # SPDX-License-Identifier: Apache-2.0
+from __future__ import annotations
 
 import numpy as np
 
@@ -22,18 +23,30 @@ class Add(Base):
         y = np.random.randn(3, 4, 5).astype(np.float32)
         expect(node, inputs=[x, y], outputs=[x + y], name="test_add")
 
-    @staticmethod
-    def export_add_uint8() -> None:
-        node = onnx.helper.make_node(
-            "Add",
-            inputs=["x", "y"],
-            outputs=["sum"],
-        )
+        x = np.random.randint(24, size=(3, 4, 5), dtype=np.int8)
+        y = np.random.randint(24, size=(3, 4, 5), dtype=np.int8)
+        expect(node, inputs=[x, y], outputs=[x + y], name="test_add_int8")
+
+        x = np.random.randint(24, size=(3, 4, 5), dtype=np.int16)
+        y = np.random.randint(24, size=(3, 4, 5), dtype=np.int16)
+        expect(node, inputs=[x, y], outputs=[x + y], name="test_add_int16")
 
         x = np.random.randint(24, size=(3, 4, 5), dtype=np.uint8)
         y = np.random.randint(24, size=(3, 4, 5), dtype=np.uint8)
         expect(node, inputs=[x, y], outputs=[x + y], name="test_add_uint8")
 
+        x = np.random.randint(24, size=(3, 4, 5), dtype=np.uint16)
+        y = np.random.randint(24, size=(3, 4, 5), dtype=np.uint16)
+        expect(node, inputs=[x, y], outputs=[x + y], name="test_add_uint16")
+
+        x = np.random.randint(24, size=(3, 4, 5), dtype=np.uint32)
+        y = np.random.randint(24, size=(3, 4, 5), dtype=np.uint32)
+        expect(node, inputs=[x, y], outputs=[x + y], name="test_add_uint32")
+
+        x = np.random.randint(24, size=(3, 4, 5), dtype=np.uint64)
+        y = np.random.randint(24, size=(3, 4, 5), dtype=np.uint64)
+        expect(node, inputs=[x, y], outputs=[x + y], name="test_add_uint64")
+
     @staticmethod
     def export_add_broadcast() -> None:
         node = onnx.helper.make_node(

onnx/backend/test/case/node/affinegrid.py

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

onnx/backend/test/case/node/ai_onnx_ml/array_feature_extractor.py

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

onnx/backend/test/case/node/ai_onnx_ml/binarizer.py

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

onnx/backend/test/case/node/ai_onnx_ml/label_encoder.py

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

onnx/backend/test/case/node/ai_onnx_ml/tree_ensemble.py

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

onnx/backend/test/case/node/and.py

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

onnx/backend/test/case/node/argmax.py

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

onnx/backend/test/case/node/argmin.py

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

onnx/backend/test/case/node/asin.py

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

onnx/backend/test/case/node/asinh.py

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

onnx/backend/test/case/node/atan.py

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

onnx/backend/test/case/node/atanh.py

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