feat: fix nasa model bug

Author: yangxinyu7427

Diff for: 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/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 path1="../examples/onnx_input_model/neo_nb2.onnx";
+  std::string path2="../examples/onnx_input_model/neo_lr2.onnx";
+  std::string path3="../examples/onnx_input_model/neo_sgd2.onnx";
   //  std::string pre1="model_lr_1_";
   //  std::string pre2="model_linear_1_";
   std::string pre1="nb_1_";

Diff for: examples/onnx_input_model/model_out.onnx

@@ -22,8 +22,9 @@ int main(int argc, char* argv[]) {
   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);
-
+  //add_prefix_on_model(path13, path_pre, pre);
+  //std::vector<std::string> tmp = check_redundant(path_pre,path12);
+  std::vector<std::string> tmp = check_redundant(path13,path6);
+  //change_models(path_pre,outpath,inpath,tmp);
+  change_models(path13,outpath,inpath,tmp);
 }

Diff for: examples/onnx_input_model/model_reg.onnx

@@ -100,7 +100,7 @@ void merge_single_model_with_predicate(std::string& onnx_model_path, std::string
   *onnx_model.mutable_graph()->add_node()=reshape_node;
   *onnx_model.mutable_graph()->add_input()=input;
   *onnx_model.mutable_graph()->add_node()=node;
-  std::regex pattern_output_label("_output_label$");
+  std::regex pattern_output_label("_label$");
   std::vector<onnx::ValueInfoProto> output_list;
   std::vector<onnx::ValueInfoProto> save_output_list;
   for(int i=0;i<onnx_model.graph().output_size();i++){
@@ -175,10 +175,11 @@ void merge_double_models_with_predicate(std::string& onnx_model_path,std::string
 
   // change onnx_model
   *onnx_model.mutable_graph()->add_node()=node;
-  std::regex pattern_output_label("_output_label$");
+  std::regex pattern_output_label("_label$");
   std::vector<onnx::ValueInfoProto> output_list;
   std::vector<onnx::ValueInfoProto> save_output_list;
   for(int i=0;i<onnx_model.graph().output_size();i++){
+      std::string tmp=onnx_model.graph().output(i).name();
       if(!std::regex_search(onnx_model.graph().output(i).name(), pattern_l) &&
           !std::regex_search(onnx_model.graph().output(i).name(), pattern_r)){
         output_list.push_back(onnx_model.graph().output(i));