Convert Initializers to OrtValues Phase 2

include/onnxruntime/core/graph/graph.h

@@ -1198,8 +1198,16 @@ class Graph {  // NOLINT(clang-analyzer-optin.performance.Padding): preserve exi
 #endif
 
 #if !defined(ORT_MINIMAL_BUILD)
-  /** Gets the GraphProto representation of this Graph. */
+  /** Gets the GraphProto representation of this Graph only. */
   const ONNX_NAMESPACE::GraphProto& ToGraphProto();
+
+  /// <summary>
+  // This function recurses subgraphs and examines each initializer
+  // If initializer data points to in-memory location, it is inlined
+  // otherwise, the initializer is copied as is including any
+  // external data references.
+  /// </summary>
+  /// <returns>GraphProto</returns>
   ONNX_NAMESPACE::GraphProto ToGraphProto() const;
 
   /** Gets the GraphProto representation of this Graph
@@ -1561,6 +1569,14 @@ class Graph {  // NOLINT(clang-analyzer-optin.performance.Padding): preserve exi
   Status AddConstantProtoAsInitializer(const ONNX_NAMESPACE::NodeProto& constant_node_proto,
                                        std::optional<std::string_view> new_name);
 
+  /// <summary>
+  /// Subgraph initializers are already copied using Node::ToProto()
+  /// </summary>
+  /// <param name="output_graph_proto"></param>
+  /// <param name="process_main">process main graph if true</param>
+  /// <returns>Status</returns>
+  Status ProcessSubgraphsInMemoryData(ONNX_NAMESPACE::GraphProto& output_graph_proto, bool process_main) const;
+
   /// <summary>
   /// This function traverses the graph bottom up and externalizes
   /// constant initializers along with their pre-packed blobs from different

onnxruntime/core/framework/tensorprotoutils.cc

@@ -171,6 +171,7 @@ DEFINE_INT4_UNPACK_TENSOR_WITH_RAW_DATA_IMPL(UInt4x2)
 Status ReadExternalDataForTensor(const ONNX_NAMESPACE::TensorProto& tensor_proto,
                                  const std::filesystem::path& tensor_proto_dir,
                                  std::vector<uint8_t>& unpacked_tensor) {
+  ORT_RETURN_IF(utils::HasString(tensor_proto), "This function does not support string data");
   PathString external_file_path;
   onnxruntime::FileOffsetType file_offset;
   SafeInt<size_t> tensor_byte_size;
@@ -264,12 +265,32 @@ Status TensorProtoWithExternalDataToTensorProto(
   result.set_data_type(ten_proto.data_type());
   result.mutable_dims()->CopyFrom(ten_proto.dims());
 
-  // Load the external data into memory
-  std::vector<uint8_t> unpacked_data;
-  ORT_RETURN_IF_ERROR(ReadExternalDataForTensor(ten_proto, model_path, unpacked_data));
+  // Strings can only be in memory
+  if (utils::HasString(ten_proto)) {
+    ORT_RETURN_IF_NOT(HasExternalDataInMemory(ten_proto),
+                      "TensorProto with string data can only be in memory");
+
+    std::unique_ptr<onnxruntime::ExternalDataInfo> external_data_info;
+    ORT_RETURN_IF_ERROR(onnxruntime::ExternalDataInfo::Create(ten_proto.external_data(), external_data_info));
+
+    // file_offset is address
+    if (utils::HasString(ten_proto)) {
+      auto tensor_shape = utils::GetTensorShapeFromTensorProto(ten_proto);
+      std::string* data = reinterpret_cast<std::string*>(external_data_info->GetOffset());
+      for (size_t i = 0, lim = narrow<size_t>(tensor_shape.Size()); i < lim; ++i) {
+        // set in raw data
+        result.add_string_data(*data);
+        ++data;
+      }
+    }
+  } else {
+    // Load the external data into memory
+    std::vector<uint8_t> unpacked_data;
+    ORT_RETURN_IF_ERROR(ReadExternalDataForTensor(ten_proto, model_path, unpacked_data));
 
-  // Set the raw data in the new tensor
-  result.set_raw_data(unpacked_data.data(), unpacked_data.size());
+    // Set the raw data in the new tensor
+    result.set_raw_data(unpacked_data.data(), unpacked_data.size());
+  }
 
   new_tensor_proto = std::move(result);
 

onnxruntime/core/framework/tensorprotoutils.h

@@ -500,7 +500,7 @@ inline bool HasName(const ONNX_NAMESPACE::TypeProto_Opaque& op_proto) {
 /// </summary>
 /// <param name="tensor_proto">tensor_proto</param>
 /// <returns>true if ten_proto has external data and it is in memory</returns>
-bool HasExternalDataInMemory(const ONNX_NAMESPACE::TensorProto& tensor_proto);
+[[nodiscard]] bool HasExternalDataInMemory(const ONNX_NAMESPACE::TensorProto& tensor_proto);
 
 /// <summary>
 /// This function converts TensorProto with external data to TensorProto with inline data.