Move sorting of initialisers part of OVEP

Author: preetha-intel

onnxruntime/core/graph/graph_proto_serializer.cc

@@ -46,16 +46,10 @@ void GraphViewerToProto(const GraphViewer& graph_view,
     std::unordered_set<std::string> current_scope_initializer_set;
 
     auto& initializers = graph_view.GetAllInitializedTensors();
-    std::vector<std::string> const_inits;
     for (auto& it : initializers) {
-      const_inits.push_back(it.first);
-    }
-    std::sort(const_inits.begin(), const_inits.end());
-
-    for (auto& it : const_inits){
       auto* p_initializer = graph_proto.add_initializer();
-      *p_initializer = *(initializers.at(it));
-      current_scope_initializer_set.insert(it);
+      *p_initializer = *(it.second);
+      current_scope_initializer_set.insert(it.first);
     }
 
 

onnxruntime/core/providers/openvino/backend_manager.cc

@@ -195,7 +195,18 @@ BackendManager::GetModelProtoFromFusedNode(const onnxruntime::Node& fused_node,
 
   auto model_proto = model->ToProto();
   model_proto->set_ir_version(ONNX_NAMESPACE::Version::IR_VERSION);
-  subgraph.ToProto(*model_proto->mutable_graph(), true, true);
+  ONNX_NAMESPACE::GraphProto& graph_proto = *model_proto->mutable_graph();
+  auto& initializers = subgraph.GetAllInitializedTensors();
+  std::vector<std::string> const_inits;
+  for (auto& it : initializers) {
+    const_inits.push_back(it.first);
+  }
+  std::sort(const_inits.begin(), const_inits.end());
+
+  for (auto& it : const_inits){
+    *(graph_proto.mutable_initializer()->Add()) = *(initializers.at(it));
+  }
+  subgraph.ToProto(graph_proto, false, true);
 
 #ifndef NDEBUG
   if (openvino_ep::backend_utils::IsDebugEnabled()) {