onnx 1.13.0__cp311-cp311-macosx_10_12_universal2.whl → 1.14.0__cp311-cp311-macosx_10_12_universal2.whl

onnx/examples/load_model.ipynb

@@ -3,7 +3,14 @@
   {
    "cell_type": "code",
    "execution_count": 1,
-   "metadata": {},
+   "metadata": {
+    "execution": {
+     "iopub.execute_input": "2023-03-06T20:16:24.630453Z",
+     "iopub.status.busy": "2023-03-06T20:16:24.630453Z",
+     "iopub.status.idle": "2023-03-06T20:16:24.689518Z",
+     "shell.execute_reply": "2023-03-06T20:16:24.689518Z"
+    }
+   },
    "outputs": [
     {
      "name": "stdout",
@@ -60,6 +67,9 @@
     }
    ],
    "source": [
+    "# NBVAL_SKIP\n",
+    "# Protobuf 4 and Protobuf 3 might output different order of protobuf fields\n",
+    "\n",
     "import onnx\n",
     "import os\n",
     "\n",
@@ -68,11 +78,18 @@
     "onnx_model = onnx.load(os.path.join(\"resources\", \"single_relu.onnx\"))\n",
     "print(onnx_model)"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -86,7 +103,12 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.2"
+   "version": "3.9.11"
+  },
+  "vscode": {
+   "interpreter": {
+    "hash": "f9fa6017a53cd3e89c2ae5d3938d7461048c25b2aa8e520267fca421440325a1"
+   }
   }
  },
  "nbformat": 4,

onnx/examples/make_model.ipynb

@@ -3,7 +3,14 @@
   {
    "cell_type": "code",
    "execution_count": 1,
-   "metadata": {},
+   "metadata": {
+    "execution": {
+     "iopub.execute_input": "2023-03-06T20:16:09.220355Z",
+     "iopub.status.busy": "2023-03-06T20:16:09.219355Z",
+     "iopub.status.idle": "2023-03-06T20:16:09.481504Z",
+     "shell.execute_reply": "2023-03-06T20:16:09.480694Z"
+    }
+   },
    "outputs": [
     {
      "name": "stdout",
@@ -84,6 +91,9 @@
     }
    ],
    "source": [
+    "# NBVAL_SKIP\n",
+    "# Protobuf 4 and Protobuf 3 might output different order of protobuf fields\n",
+    "\n",
     "import onnx\n",
     "from onnx import helper\n",
     "from onnx import AttributeProto, TensorProto, GraphProto\n",
@@ -104,10 +114,10 @@
     "\n",
     "# Create a node (NodeProto)\n",
     "node_def = helper.make_node(\n",
-    "    \"Pad\",  # node name\n",
-    "    [\"X\", \"Pads\"],  # inputs\n",
-    "    [\"Y\"],  # outputs\n",
-    "    mode=\"constant\",  # Attributes\n",
+    "    \"Pad\", # node name\n",
+    "    [\"X\", \"Pads\"], # inputs\n",
+    "    [\"Y\"], # outputs\n",
+    "    mode=\"constant\", # Attributes\n",
     ")\n",
     "\n",
     "# Create the graph (GraphProto)\n",
@@ -116,36 +126,30 @@
     "    \"test-model\",\n",
     "    [X, Pads],\n",
     "    [Y],\n",
-    "    [\n",
-    "        helper.make_tensor(\n",
-    "            \"Pads\",\n",
-    "            TensorProto.INT64,\n",
-    "            [\n",
-    "                4,\n",
-    "            ],\n",
-    "            [\n",
-    "                0,\n",
-    "                0,\n",
-    "                1,\n",
-    "                1,\n",
-    "            ],\n",
-    "        )\n",
-    "    ],\n",
+    "    [helper.make_tensor(\"Pads\", TensorProto.INT64, [4,], [0, 0, 1, 1,])],\n",
     ")\n",
     "\n",
     "# Create the model (ModelProto)\n",
-    "model_def = helper.make_model(graph_def, producer_name=\"onnx-example\")\n",
+    "model_def = helper.make_model(graph_def,\n",
+    "                              producer_name=\"onnx-example\")\n",
     "\n",
     "print(\"The producer_name in model: {}\\n\".format(model_def.producer_name))\n",
     "print(\"The graph in model:\\n{}\".format(model_def.graph))\n",
     "onnx.checker.check_model(model_def)\n",
     "print(\"The model is checked!\")"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3.9.11 64-bit",
    "language": "python",
    "name": "python3"
   },
@@ -159,7 +163,12 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.2"
+   "version": "3.9.11"
+  },
+  "vscode": {
+   "interpreter": {
+    "hash": "f9fa6017a53cd3e89c2ae5d3938d7461048c25b2aa8e520267fca421440325a1"
+   }
   }
  },
  "nbformat": 4,

onnx/external_data_helper.py

@@ -1,3 +1,5 @@
+# Copyright (c) ONNX Project Contributors
+#
 # SPDX-License-Identifier: Apache-2.0
 import os
 import re
@@ -6,7 +8,7 @@ import uuid
 from itertools import chain
 from typing import Callable, Iterable, Optional
 
-from .onnx_pb import AttributeProto, GraphProto, ModelProto, TensorProto
+from onnx.onnx_pb import AttributeProto, GraphProto, ModelProto, TensorProto
 
 
 class ExternalDataInfo:
@@ -41,7 +43,6 @@ def load_external_data_for_tensor(tensor: TensorProto, base_dir: str) -> None:
     external_data_file_path = os.path.join(base_dir, file_location)
 
     with open(external_data_file_path, "rb") as data_file:
-
         if info.offset:
             data_file.seek(info.offset)
 
@@ -85,7 +86,7 @@ def set_external_data(
 
     del tensor.external_data[:]
     tensor.data_location = TensorProto.EXTERNAL
-    for (k, v) in {
+    for k, v in {
         "location": location,
         "offset": int(offset) if offset is not None else None,
         "length": int(length) if length is not None else None,
@@ -180,7 +181,8 @@ def save_external_data(tensor: TensorProto, base_path: str) -> None:
 
     # Create file if it doesn't exist
     if not os.path.isfile(external_data_file_path):
-        open(external_data_file_path, "ab").close()
+        with open(external_data_file_path, "ab"):
+            pass
 
     # Open file for reading and writing at random locations ('r+b')
     with open(external_data_file_path, "r+b") as data_file:
@@ -264,10 +266,7 @@ def _is_valid_filename(filename: str) -> bool:
     """Utility to check whether the provided filename is valid."""
     exp = re.compile('^[^<>:;,?"*|/]+$')
     match = exp.match(filename)
-    if match:
-        return True
-    else:
-        return False
+    return bool(match)
 
 
 def uses_external_data(tensor: TensorProto) -> bool:
@@ -288,7 +287,7 @@ def remove_external_data_field(tensor: TensorProto, field_key: str) -> None:
         tensor (TensorProto): Tensor object from which value will be removed
         field_key (string): The key of the field to be removed
     """
-    for (i, field) in enumerate(tensor.external_data):
+    for i, field in enumerate(tensor.external_data):
         if field.key == field_key:
             del tensor.external_data[i]
 

onnx/frontend/__init__.py

@@ -1 +1,3 @@
+# Copyright (c) ONNX Project Contributors
+#
 # SPDX-License-Identifier: Apache-2.0

onnx/gen_proto.py

@@ -36,20 +36,20 @@ def process_ifs(lines: Iterable[str], onnx_ml: bool) -> Iterable[str]:
     in_if = 0
     for line in lines:
         if IF_ONNX_ML_REGEX.match(line):
-            assert 0 == in_if
+            assert in_if == 0
             in_if = 1
         elif ELSE_ONNX_ML_REGEX.match(line):
-            assert 1 == in_if
+            assert in_if == 1
             in_if = 2
         elif ENDIF_ONNX_ML_REGEX.match(line):
-            assert 1 == in_if or 2 == in_if
+            assert in_if == 1 or in_if == 2  # pylint: disable=consider-using-in
             in_if = 0
         else:
-            if 0 == in_if:
+            if in_if == 0:
                 yield line
-            elif 1 == in_if and onnx_ml:
+            elif in_if == 1 and onnx_ml:
                 yield line
-            elif 2 == in_if and not onnx_ml:
+            elif in_if == 2 and not onnx_ml:
                 yield line
 
 
@@ -127,7 +127,7 @@ def qualify(f: str, pardir: Optional[str] = None) -> str:
     return os.path.join(pardir, f)
 
 
-def convert(
+def convert(  # pylint: disable=too-many-branches,too-many-statements
     stem: str,
     package_name: str,
     output: str,
@@ -152,10 +152,10 @@ def convert(
     proto3 = qualify(f"{proto_base}.proto3", pardir=output)
 
     print(f"Processing {proto_in}")
-    with open(proto_in) as fin:
+    with open(proto_in, encoding="utf-8") as fin:
         source = fin.read()
         print(f"Writing {proto}")
-        with open(proto, "w", newline="") as fout:
+        with open(proto, "w", newline="", encoding="utf-8") as fout:
             fout.write(autogen_header)
             fout.write(
                 translate(source, proto=2, onnx_ml=import_ml, package_name=package_name)
@@ -163,7 +163,7 @@ def convert(
             if lite:
                 fout.write(LITE_OPTION)
         print(f"Writing {proto3}")
-        with open(proto3, "w", newline="") as fout:
+        with open(proto3, "w", newline="", encoding="utf-8") as fout:
             fout.write(autogen_header)
             fout.write(
                 translate(source, proto=3, onnx_ml=import_ml, package_name=package_name)
@@ -174,9 +174,7 @@ def convert(
             porto3_dir = os.path.dirname(proto3)
             base_dir = os.path.dirname(porto3_dir)
             gen_proto3_code(protoc_path, proto3, base_dir, base_dir, base_dir)
-            pb3_files = glob.glob(
-                os.path.join(porto3_dir, "{}.proto3.*".format(proto_base))
-            )
+            pb3_files = glob.glob(os.path.join(porto3_dir, f"{proto_base}.proto3.*"))
             for pb3_file in pb3_files:
                 print(f"Removing {pb3_file}")
                 os.remove(pb3_file)
@@ -187,7 +185,7 @@ def convert(
             else:
                 proto_header = qualify(f"{stem}.pb.h", pardir=output)
             print(f"Writing {proto_header}")
-            with open(proto_header, "w", newline="") as fout:
+            with open(proto_header, "w", newline="", encoding="utf-8") as fout:
                 fout.write("#pragma once\n")
                 fout.write(f'#include "{proto_base}.pb.h"\n')
 
@@ -203,19 +201,15 @@ def convert(
             pb2_py = qualify(f"{stem.replace('-', '_')}_pb2.py", pardir=output)
 
     print(f"generating {pb_py}")
-    with open(pb_py, "w") as f:
+    with open(pb_py, "w", encoding="utf-8") as f:
         f.write(
-            str(
-                dedent(
-                    """\
-        # This file is generated by setup.py. DO NOT EDIT!
+            dedent(
+                f"""\
+                # This file is generated by setup.py. DO NOT EDIT!
 
 
-        from .{} import *  # noqa
-        """.format(
-                        os.path.splitext(os.path.basename(pb2_py))[0]
-                    )
-                )
+                from .{os.path.splitext(os.path.basename(pb2_py))[0]} import *  # noqa
+                """
             )
         )