Considering identity for output

daquexian · daquexian · commit a75548d19375 · 2019-06-24T15:27:38.000+08:00
diff --git a/tools/onnx2daq/OnnxConverter.cpp b/tools/onnx2daq/OnnxConverter.cpp
@@ -933,7 +933,7 @@ std::vector<flatbuffers::Offset<flatbuffers::String>>
 OnnxConverter::GetOutputOfOnnxModel() {
     std::vector<std::string> outputs;
     for (const auto &output : model_proto_.graph().output()) {
-        outputs.push_back(output.name());
+        outputs.push_back(m(output.name()));
     }
     return FbStrVector(outputs);
 }
@@ -1165,7 +1165,6 @@ void OnnxConverter::Convert(const ONNX_NAMESPACE::ModelProto &model_proto,
     HandleInitializer();
 
     const auto inputs = GetInputOfOnnxModel();
-    const auto outputs = GetOutputOfOnnxModel();
 
     bool has_reshape = false;
     for (int i = 0; i < model_proto_.graph().node_size(); i++) {
@@ -1410,6 +1409,8 @@ void OnnxConverter::Convert(const ONNX_NAMESPACE::ModelProto &model_proto,
             }
         }
     }
+    const auto outputs = GetOutputOfOnnxModel();
+
     const auto flat_layers = builder_.CreateVector(layers_);
     const auto flat_inputs = builder_.CreateVector(inputs);
     const auto flat_tensors = builder_.CreateVector(tensors_);

Original file line number	Diff line number	Diff line change
`@@ -933,7 +933,7 @@ std::vector<flatbuffers::Offset<flatbuffers::String>>`
`933`	`933`	`OnnxConverter::GetOutputOfOnnxModel() {`
`934`	`934`	`std::vector<std::string> outputs;`
`935`	`935`	`for (const auto &output : model_proto_.graph().output()) {`
`936`		`- outputs.push_back(output.name());`
	`936`	`+ outputs.push_back(m(output.name()));`
`937`	`937`	`}`
`938`	`938`	`return FbStrVector(outputs);`
`939`	`939`	`}`
`@@ -1165,7 +1165,6 @@ void OnnxConverter::Convert(const ONNX_NAMESPACE::ModelProto &model_proto,`
`1165`	`1165`	`HandleInitializer();`
`1166`	`1166`
`1167`	`1167`	`const auto inputs = GetInputOfOnnxModel();`
`1168`		`- const auto outputs = GetOutputOfOnnxModel();`
`1169`	`1168`
`1170`	`1169`	`bool has_reshape = false;`
`1171`	`1170`	`for (int i = 0; i < model_proto_.graph().node_size(); i++) {`
`@@ -1410,6 +1409,8 @@ void OnnxConverter::Convert(const ONNX_NAMESPACE::ModelProto &model_proto,`
`1410`	`1409`	`}`
`1411`	`1410`	`}`
`1412`	`1411`	`}`
	`1412`	`+ const auto outputs = GetOutputOfOnnxModel();`
	`1413`	`+`
`1413`	`1414`	`const auto flat_layers = builder_.CreateVector(layers_);`
`1414`	`1415`	`const auto flat_inputs = builder_.CreateVector(inputs);`
`1415`	`1416`	`const auto flat_tensors = builder_.CreateVector(tensors_);`