From bd08f644f1dd897478da44dad3d639b2713dfd06 Mon Sep 17 00:00:00 2001 From: baker Date: Fri, 11 Dec 2020 10:33:40 +0800 Subject: [PATCH] add onnx model parse api --- inc/external/parser/onnx_parser.h | 3 ++- parser/onnx/onnx_parser.cc | 6 +++--- parser/onnx/onnx_parser.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/inc/external/parser/onnx_parser.h b/inc/external/parser/onnx_parser.h index 76bf492..9712d78 100644 --- a/inc/external/parser/onnx_parser.h +++ b/inc/external/parser/onnx_parser.h @@ -27,7 +27,8 @@ graphStatus aclgrphParseONNX(const char *model_file, const std::map &parser_params, ge::Graph &graph); graphStatus aclgrphParseONNXFromMem(const char *buffer, size_t size, - const std::map &parser_params, ge::Graph &graph); + const std::map &parser_params, + ge::Graph &graph); } // namespace ge #endif // INC_EXTERNAL_PARSER_ONNX_PARSER_H_ diff --git a/parser/onnx/onnx_parser.cc b/parser/onnx/onnx_parser.cc index b191e24..1f53d7c 100644 --- a/parser/onnx/onnx_parser.cc +++ b/parser/onnx/onnx_parser.cc @@ -533,7 +533,7 @@ Status OnnxModelParser::GetModelFromMemory(const char *data, uint32_t size, ge:: return SUCCESS; } -Status OnnxModelParser::RealParse(const ge::onnx::ModelProto &onnx_model, ge::Graph &graph) { +Status OnnxModelParser::ModelParseToGraph(const ge::onnx::ModelProto &onnx_model, ge::Graph &graph) { if (!onnx_model.has_graph()) { ErrorManager::GetInstance().ATCReportErrMessage("E16004"); GELOGE(PARAM_INVALID, "Onnx model do not has graph."); @@ -635,7 +635,7 @@ Status OnnxModelParser::Parse(const char *file, ge::Graph &graph) { GELOGE(FAILED, "get model from file failed."); return FAILED; } - ret = RealParse(onnx_model, graph); + ret = ModelParseToGraph(onnx_model, graph); if (ret != SUCCESS) { GELOGE(FAILED, "parse model failed."); return FAILED; @@ -650,7 +650,7 @@ Status OnnxModelParser::ParseFromMemory(const char *data, uint32_t size, ge::Gra GELOGE(FAILED, "get model from file failed."); return FAILED; } - ret = RealParse(onnx_model, graph); + ret = ModelParseToGraph(onnx_model, graph); if (ret != SUCCESS) { GELOGE(FAILED, "parse model failed."); return FAILED; diff --git a/parser/onnx/onnx_parser.h b/parser/onnx/onnx_parser.h index a81c36e..1124a0d 100644 --- a/parser/onnx/onnx_parser.h +++ b/parser/onnx/onnx_parser.h @@ -84,7 +84,7 @@ class OnnxModelParser : public domi::ModelParser { Status GetModelFromMemory(const char *data, uint32_t size, ge::onnx::ModelProto &onnx_model); - Status RealParse(const ge::onnx::ModelProto &onnx_model, ge::Graph &graph); + Status ModelParseToGraph(const ge::onnx::ModelProto &onnx_model, ge::Graph &graph); void UpdateFormat(ge::Graph &graph);