| @@ -41,10 +41,12 @@ | |||||
| #include "graph/types.h" | #include "graph/types.h" | ||||
| namespace ge { | namespace ge { | ||||
| PARSER_FUNC_VISIBILITY graphStatus aclgrphParseCaffe(const char *model_file, const char *weights_file, ge::Graph &graph); | |||||
| PARSER_FUNC_VISIBILITY graphStatus aclgrphParseCaffe(const char *model_file, const char *weights_file, | |||||
| ge::Graph &graph); | |||||
| PARSER_FUNC_VISIBILITY graphStatus aclgrphParseCaffe(const char *model_file, const char *weights_file, | PARSER_FUNC_VISIBILITY graphStatus aclgrphParseCaffe(const char *model_file, const char *weights_file, | ||||
| const std::map<ge::AscendString, ge::AscendString> &parser_params, ge::Graph &graph); | |||||
| const std::map<ge::AscendString, ge::AscendString> &parser_params, | |||||
| ge::Graph &graph); | |||||
| } // namespace ge | } // namespace ge | ||||
| #endif // INC_EXTERNAL_ACL_GRAPH_CAFFE_H_ | #endif // INC_EXTERNAL_ACL_GRAPH_CAFFE_H_ | ||||
| @@ -38,11 +38,10 @@ | |||||
| namespace ge { | namespace ge { | ||||
| PARSER_FUNC_VISIBILITY graphStatus aclgrphParseONNX(const char *model_file, | PARSER_FUNC_VISIBILITY graphStatus aclgrphParseONNX(const char *model_file, | ||||
| const std::map<ge::AscendString, ge::AscendString> &parser_params, ge::Graph &graph); | |||||
| const std::map<ge::AscendString, ge::AscendString> &parser_params, ge::Graph &graph); | |||||
| PARSER_FUNC_VISIBILITY graphStatus aclgrphParseONNXFromMem(const char *buffer, size_t size, | PARSER_FUNC_VISIBILITY graphStatus aclgrphParseONNXFromMem(const char *buffer, size_t size, | ||||
| const std::map<ge::AscendString, ge::AscendString> &parser_params, | |||||
| ge::Graph &graph); | |||||
| const std::map<ge::AscendString, ge::AscendString> &parser_params, ge::Graph &graph); | |||||
| } // namespace ge | } // namespace ge | ||||
| #endif // INC_EXTERNAL_PARSER_ONNX_PARSER_H_ | #endif // INC_EXTERNAL_PARSER_ONNX_PARSER_H_ | ||||
| @@ -44,7 +44,8 @@ | |||||
| namespace ge { | namespace ge { | ||||
| PARSER_FUNC_VISIBILITY graphStatus aclgrphParseTensorFlow(const char *model_file, ge::Graph &graph); | PARSER_FUNC_VISIBILITY graphStatus aclgrphParseTensorFlow(const char *model_file, ge::Graph &graph); | ||||
| PARSER_FUNC_VISIBILITY graphStatus aclgrphParseTensorFlow(const char *model_file, | PARSER_FUNC_VISIBILITY graphStatus aclgrphParseTensorFlow(const char *model_file, | ||||
| const std::map<ge::AscendString, ge::AscendString> &parser_params, ge::Graph &graph); | |||||
| const std::map<ge::AscendString, ge::AscendString> &parser_params, | |||||
| ge::Graph &graph); | |||||
| } // namespace ge | } // namespace ge | ||||
| #endif // INC_EXTERNAL_ACL_PARSER_TENSORFLOW_H_ | #endif // INC_EXTERNAL_ACL_PARSER_TENSORFLOW_H_ | ||||
| @@ -700,8 +700,8 @@ Status TensorFlowModelParser::AddEdges(ge::ComputeGraphPtr &graph) { | |||||
| ErrorManager::GetInstance().ATCReportErrMessage("E12021", {"opname1", "index1", "opname2", "index2"}, | ErrorManager::GetInstance().ATCReportErrMessage("E12021", {"opname1", "index1", "opname2", "index2"}, | ||||
| {src_op_name, std::to_string(input_iter->second.size()), | {src_op_name, std::to_string(input_iter->second.size()), | ||||
| dest_op_name, std::to_string(src_output_iter.second.size())}); | dest_op_name, std::to_string(src_output_iter.second.size())}); | ||||
| GELOGE(INTERNAL_ERROR, "Input size of op[%s]:%zu is not equal to Output size of op[%s]:%zu.", src_op_name.c_str(), | |||||
| input_iter->second.size(), dest_op_name.c_str(), src_output_iter.second.size()); | |||||
| GELOGE(INTERNAL_ERROR, "Input size of op[%s]:%zu is not equal to Output size of op[%s]:%zu.", | |||||
| src_op_name.c_str(), input_iter->second.size(), dest_op_name.c_str(), src_output_iter.second.size()); | |||||
| return INTERNAL_ERROR; | return INTERNAL_ERROR; | ||||
| } | } | ||||
| for (auto &outputpair : src_output_iter.second) { | for (auto &outputpair : src_output_iter.second) { | ||||