feat: add prefix on compared model

Author: yangxinyu7427

examples/onnx_input_model/model_in.onnx

@@ -20,9 +20,9 @@ int main(int argc, char* argv[]) {
   //  std::string path1="../examples/onnx_input_model/model_lr.onnx";
   //  std::string path2="../examples/onnx_input_model/model_linear.onnx";
 
-  std::string path1="../examples/onnx_input_model/news_nb.onnx";
-  std::string path2="../examples/onnx_input_model/news_lr.onnx";
-  std::string path3="../examples/onnx_input_model/news_sgd.onnx";
+  std::string path1="../examples/onnx_input_model/model_nb.onnx";
+  std::string path2="../examples/onnx_input_model/model_lr.onnx";
+  std::string path3="../examples/onnx_input_model/model_sgd.onnx";
   //  std::string pre1="model_lr_1_";
   //  std::string pre2="model_linear_1_";
   std::string pre1="nb_1_";

examples/onnx_input_model/model_opted.onnx

@@ -14,12 +14,16 @@ int main(int argc, char* argv[]) {
   std::string path7="../examples/onnx_input_model/model_nb.onnx";
   std::string path8="../examples/onnx_input_model/flights_lr.onnx";
   std::string path9="../examples/onnx_input_model/flights_nb.onnx";
-  std::string path10="../examples/onnx_input_model/fakenews_lr.onnx";
-  std::string path11="../examples/onnx_input_model/fakenews_nb.onnx";
+  std::string path10="../examples/onnx_input_model/fakenews_lr_test.onnx";
+  std::string path11="../examples/onnx_input_model/fakenews_nb";
+  std::string path12="../examples/onnx_input_model/model_opted.onnx";
   std::string outpath="../examples/onnx_input_model/model_out.onnx";
   std::string inpath="../examples/onnx_input_model/model_in.onnx";
-
-  std::vector<std::string> tmp = check_redundant(path10,path11);
-  change_models(path10,outpath,inpath,tmp);
+  std::string path13="../examples/onnx_input_model/model_reg.onnx";
+  std::string pre="sgd_1_";
+  std::string path_pre="../examples/onnx_input_model/model_reg_prefix.onnx";
+  add_prefix_on_model(path13, path_pre, pre);
+  std::vector<std::string> tmp = check_redundant(path_pre,path12);
+  change_models(path_pre,outpath,inpath,tmp);
 
 }

examples/onnx_input_model/model_out.onnx

@@ -5,7 +5,7 @@
 #include <fstream>
 
 #include "optimize_c_api.h"
-#include "onnxoptimizer/query_c_api/model_merge.cpp"
+//#include "onnxoptimizer/query_c_api/model_merge.cpp"
 #include "onnxoptimizer/query_c_api/predicate_push_down.cpp"
 #include "onnxoptimizer/query_c_api/redundant_calculation_detection.cpp"
 
@@ -49,3 +49,6 @@ void change_models(std::string& changed_model_path,std::string& output_model_pat
                    const std::vector<std::string>& output_name){
     onnx::optimization::change_models(changed_model_path, output_model_path, changed_input_model_path, output_name);
 }
+void add_prefix_on_model(std::string& changed_model_path, std::string& output_model_path, std::string& prefix){
+    onnx::optimization::add_prefix_on_model(changed_model_path, output_model_path, prefix);
+}

examples/onnx_input_model/model_reg.onnx

@@ -32,5 +32,6 @@ std::vector<std::string> check_redundant(std::string& changed_model_path,
 void change_models(std::string& changed_model_path,std::string& output_model_path,
                 std::string& changed_input_model_path,
                 const std::vector<std::string>& output_name);
+void add_prefix_on_model(std::string& changed_model_path, std::string& output_model_path, std::string& prefix);
 #endif  // ONNX_OPTIMIZER_OPTIMIZE_C_API_H
 

examples/onnx_input_model/model_reg_prefix.onnx

@@ -4,6 +4,7 @@
 #include <onnx/checker.h>
 #include <onnx/onnx_pb.h>
 #include <onnxoptimizer/optimize.h>
+#include <onnxoptimizer/query_c_api/model_merge.cpp>
 #include <onnxoptimizer/model_util.h>
 #include <vector>
 #include "onnx/common/ir.h"
@@ -13,6 +14,13 @@
 #include "onnxoptimizer/pass_manager.h"
 #include "onnxoptimizer/pass_registry.h"
 namespace onnx::optimization {
+  void add_prefix_on_model(std::string& changed_model_path, std::string& output_model_path, std::string& prefix){
+    ModelProto model_changed, model_output;
+    onnx::optimization::loadModel(&model_changed, changed_model_path, true);
+    add_model_prefix(&model_changed,prefix,&model_output);
+    saveModel(&model_output,output_model_path);
+  }
+
   void mark_reachable_nodes(std::shared_ptr<Graph> graph, const std::string& input_name, std::unordered_set<std::string>& reachable_nodes) {
     for(auto node:graph->nodes()){
       if(reachable_nodes.find(node->name())!=reachable_nodes.end())
@@ -32,7 +40,6 @@ namespace onnx::optimization {
     ModelProto model_changed, model_compared;
     onnx::optimization::loadModel(&model_changed, changed_model_path, true);
     onnx::optimization::loadModel(&model_compared, compared_model_path, true);
-
     std::shared_ptr<Graph> g_changed(ImportModelProto(model_changed));
     std::shared_ptr<Graph> g_compared(ImportModelProto(model_compared));
     auto node_list_changed = g_changed->nodes();
@@ -60,6 +67,7 @@ namespace onnx::optimization {
       }
     }
     std::vector<Node *> same_node_input_list(same_node_list);
+    //将那些输出均有下一个相同结点将其作为输入的结点删掉
     for(int i = 0;i<same_node_list.size(); i++){
       auto node=same_node_list[i];
       auto outputs = node->outputs();
@@ -116,13 +124,13 @@ namespace onnx::optimization {
     }
 
     std::vector<std::string> value_name_list;
-    for(int i=0;i<final_node_list.size();i++){
-      for(auto node: final_node_list){
-        for(auto value:node->outputs()){
-          value_name_list.push_back(value->uniqueName());
-        }
+    //for(int i=0;i<final_node_list.size();i++){
+    for(auto node: final_node_list){
+      for(auto value:node->outputs()){
+        value_name_list.push_back(value->uniqueName());
       }
     }
+    //}
     return value_name_list;
   }