Browse Source

add onnx model parse api

pull/134/head
baker 5 years ago
parent
commit
bd08f644f1
3 changed files with 6 additions and 5 deletions
  1. +2
    -1
      inc/external/parser/onnx_parser.h
  2. +3
    -3
      parser/onnx/onnx_parser.cc
  3. +1
    -1
      parser/onnx/onnx_parser.h

+ 2
- 1
inc/external/parser/onnx_parser.h View File

@@ -27,7 +27,8 @@ graphStatus aclgrphParseONNX(const char *model_file,
const std::map<ge::AscendString, ge::AscendString> &parser_params, ge::Graph &graph);

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

#endif // INC_EXTERNAL_PARSER_ONNX_PARSER_H_

+ 3
- 3
parser/onnx/onnx_parser.cc View File

@@ -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;


+ 1
- 1
parser/onnx/onnx_parser.h View File

@@ -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);



Loading…
Cancel
Save