onnx 1.17.0__cp310-cp310-macosx_12_0_universal2.whl → 1.19.0__cp310-cp310-macosx_12_0_universal2.whl

onnx/inliner/inliner.h

@@ -9,6 +9,7 @@
 #include <utility>
 #include <vector>
 
+#include "onnx/defs/schema.h"
 #include "onnx/onnx_pb.h"
 
 namespace ONNX_NAMESPACE {
@@ -38,9 +39,37 @@ class FunctionIdSet {
   static std::unique_ptr<FunctionIdSet> Create(FunctionIdVector&& function_ids, bool invert = false);
 };
 
-// Inlines the model-local functions in the given model that are in the given set.
-// The inlined functions are removed from the model's list of functions as well.
+/**
+ * @brief Inlines the schema-defined functions in the given model that are in the given set.
+ * @param model The model in which functions will be inlined.
+ * @param to_inline The set of functions to inline.
+ * @param schema_registry The schema registry used for function lookup. If nullptr,
+ *        the default schema registry is used.
+ * @note Only call-sites in the main graph are inlined.
+ */
+void InlineSelectedFunctions(ModelProto& model, const FunctionIdSet& to_inline, const ISchemaRegistry* schema_registry);
+
+/**
+ * @brief Inlines the model-local functions in the given model that are in the given set.
+ *
+ * This function processes the model and replaces all call-sites of the specified
+ * model-local functions with their inlined implementations. The inlined functions
+ * are also removed from the model's list of functions.
+ *
+ * @param model The model in which functions will be inlined.
+ * @param to_inline The set of functions to inline.
+ *
+ * @note This function does not perform schema-defined function inlining. For schema-defined
+ *       function inlining, use InlineSelectedFunctions instead.
+ */
+void InlineSelectedLocalFunctions(ModelProto& model, const FunctionIdSet& to_inline);
 
+/**
+ * @brief Inlines the model-local functions in the given model that are in the given set.
+ * @deprecated This function is deprecated. Use InlineSelectedLocalFunctions instead,
+ * to avoid confusion with the overloaded version of InlineSelectedFunctions that
+ * inlines schema-defined functions as well.
+ */
 void InlineSelectedFunctions(ModelProto& model, const FunctionIdSet& to_inline);
 
 // Inlines all model-local functions in the given model. This supports version
@@ -50,5 +79,67 @@ void InlineSelectedFunctions(ModelProto& model, const FunctionIdSet& to_inline);
 // functions that use opset versions that are compatible with the model.
 void InlineLocalFunctions(ModelProto& model, bool convert_version = false);
 
+/**
+ * @brief A utility class for renaming variables during graph inlining operations.
+ *
+ * This class provides a simplified interface to the InliningRenamer functionality,
+ * allowing users to bind formal parameter names to actual parameter names and
+ * rename nodes with unique prefixes.
+ */
+class Renamer {
+ public:
+  /**
+   * @brief Constructs a Renamer with the given prefix.
+   *
+   * @param prefix The prefix to add to intermediate variable names to ensure uniqueness.
+   * @param graph The graph context for name generation.
+   */
+  explicit Renamer(const std::string& prefix, const GraphProto& graph);
+
+  /**
+   * @brief Constructs a Renamer with the given prefix.
+   *
+   * @param prefix The prefix to add to intermediate variable names to ensure uniqueness.
+   * @param function The function context for name generation.
+   */
+  explicit Renamer(const std::string& prefix, const FunctionProto& function);
+
+  /**
+   * @brief Destructor.
+   */
+  ~Renamer();
+
+  /**
+   * @brief Binds a formal parameter name to an actual parameter name.
+   *
+   * @param formal_name The formal parameter name in the source graph.
+   * @param actual_name The actual parameter name to use in the target.
+   */
+  void BindName(const std::string& formal_name, const std::string& actual_name);
+
+  /**
+   * @brief Creates a unique name for the given name and binds it.
+   *
+   * This method creates a unique name based on the prefix and binds the original
+   * name to the unique name for later reference renaming.
+   *
+   * @param original_name The name to create a unique version of.
+   * @return The unique name that was created and bound.
+   */
+  std::string BindToUniqueName(const std::string& original_name);
+
+  /**
+   * @brief Renames all variables in the given node according to the current bindings.
+   *
+   * @param node The node to rename. Input and output names will be updated in place.
+   */
+  void RenameNode(NodeProto& node);
+
+ private:
+  // Pimpl pattern to hide internal implementation details
+  class Impl;
+  std::unique_ptr<Impl> pImpl_;
+};
+
 } // namespace inliner
 } // namespace ONNX_NAMESPACE

onnx/inliner.py

@@ -28,9 +28,12 @@ def inline_local_functions(
 
 
 def inline_selected_functions(
-    model: onnx.ModelProto, function_ids: list[tuple[str, str]], exclude: bool = False
+    model: onnx.ModelProto,
+    function_ids: list[tuple[str, str]],
+    exclude: bool = False,
+    inline_schema_functions: bool = False,
 ) -> onnx.ModelProto:
-    """Inline selected model-local functions in given model.
+    """Inline selected functions in given model.
 
     Arguments:
         model: an ONNX ModelProto
@@ -38,13 +41,20 @@ def inline_selected_functions(
             element is a tuple of (function domain, function name).
         exclude: if true, inlines all functions except those specified in function_ids.
            if false, inlines all functions specified in function_ids.
+        inline_schema_functions: if true, inlines schema-defined functions as well
+            as model-local functions. Otherwise, only model-local functions are inlined.
 
     Returns:
         ModelProto with all calls to model-local functions inlined (recursively)
     """
-    result = C.inline_selected_functions(
-        model.SerializeToString(), function_ids, exclude
-    )
+    if inline_schema_functions:
+        result = C.inline_selected_functions2(
+            model.SerializeToString(), function_ids, exclude
+        )
+    else:
+        result = C.inline_selected_functions(
+            model.SerializeToString(), function_ids, exclude
+        )
     inlined_model = onnx.ModelProto()
     inlined_model.ParseFromString(result)
     return inlined_model

onnx/model_container.py

@@ -4,11 +4,12 @@
 """Implements function make_large_model to easily create and save models
 bigger than 2 Gb.
 """
+
 from __future__ import annotations
 
 import os
 import sys
-from typing import Any, Iterable
+from typing import TYPE_CHECKING, Any
 
 import numpy as np
 
@@ -17,6 +18,9 @@ import onnx.external_data_helper as ext_data
 import onnx.helper
 import onnx.onnx_cpp2py_export.checker as c_checker
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
 
 def _set_external_data(
     tensor: onnx.TensorProto,
@@ -79,7 +83,7 @@ class ModelContainer:
     No tensor is stored on disk until the user explicitly saves the model.
     """
 
-    def __init__(self):
+    def __init__(self) -> None:
         self.model_proto_: onnx.ModelProto | None = None
         self.large_initializers: dict[str, np.ndarray] = {}
 
@@ -126,13 +130,13 @@ class ModelContainer:
                 )
         self.large_initializers = large_initializers
 
-    def check_large_initializers(self):
+    def check_large_initializers(self) -> None:
         for tensor in ext_data._get_all_tensors(self.model_proto):
             if not ext_data.uses_external_data(tensor):
                 continue
             prop: onnx.StringStringEntryProto | None = None
-            for ext in tensor.external_data:  # type: ignore[assignment]
-                if ext.key == "location":  # type: ignore[attr-defined]
+            for ext in tensor.external_data:
+                if ext.key == "location":
                     prop = ext
             if prop is None:
                 raise RuntimeError(
@@ -195,9 +199,9 @@ class ModelContainer:
             if not ext_data.uses_external_data(tensor):
                 continue
             prop: onnx.StringStringEntryProto | None = None
-            for ext in tensor.external_data:  # type: ignore[assignment]
-                if ext.key == "location":  # type: ignore[attr-defined]
-                    prop = ext  # type: ignore[assignment]
+            for ext in tensor.external_data:
+                if ext.key == "location":
+                    prop = ext
             if prop is None:
                 raise RuntimeError(
                     f"No location found for tensor name {tensor.name!r}."