Browse Source

update slog to alog

pull/193/head
wqtshg 5 years ago
parent
commit
1a3258ba63
4 changed files with 1 additions and 17 deletions
  1. +0
    -2
      parser/caffe/caffe_parser.h
  2. +1
    -9
      parser/onnx/onnx_parser.cc
  3. +0
    -4
      parser/onnx/onnx_parser.h
  4. +0
    -2
      parser/tensorflow/tensorflow_parser.h

+ 0
- 2
parser/caffe/caffe_parser.h View File

@@ -65,11 +65,9 @@ class CaffeModelParser : public domi::ModelParser {
*/ */
Status ParseFromMemory(const char *data, uint32_t size, ge::ComputeGraphPtr &graph) override; Status ParseFromMemory(const char *data, uint32_t size, ge::ComputeGraphPtr &graph) override;


#ifndef ONLY_COMPILE_OPEN_SRC
Status ParseFromMemory(const char *data, uint32_t size, ge::Graph &graph) override { Status ParseFromMemory(const char *data, uint32_t size, ge::Graph &graph) override {
return domi::SUCCESS; return domi::SUCCESS;
} }
#endif


/** /**
* @ingroup domi_omg * @ingroup domi_omg


+ 1
- 9
parser/onnx/onnx_parser.cc View File

@@ -83,8 +83,7 @@ graphStatus HandleAfterParse(AclGrphParseUtil &acl_graph_parse_util,
} }


graphStatus aclgrphParseONNX(const char *model_file, graphStatus aclgrphParseONNX(const char *model_file,
const std::map<AscendString, AscendString> &parser_params, ge::Graph &graph) {
#ifndef ONLY_COMPILE_OPEN_SRC
const std::map<AscendString, AscendString> &parser_params, ge::Graph &graph) {
GE_CHECK_NOTNULL(model_file); GE_CHECK_NOTNULL(model_file);
// load custom plugin so and proto // load custom plugin so and proto
AclGrphParseUtil acl_graph_parse_util; AclGrphParseUtil acl_graph_parse_util;
@@ -110,13 +109,11 @@ graphStatus aclgrphParseONNX(const char *model_file,
} }


GELOGI("AclgrphParse graph %s success.", graph.GetName().c_str()); GELOGI("AclgrphParse graph %s success.", graph.GetName().c_str());
#endif
return ge::SUCCESS; return ge::SUCCESS;
} }


graphStatus aclgrphParseONNXFromMem(const char *buffer, size_t size, graphStatus aclgrphParseONNXFromMem(const char *buffer, size_t size,
const std::map<AscendString, AscendString> &parser_params, ge::Graph &graph) { const std::map<AscendString, AscendString> &parser_params, ge::Graph &graph) {
#ifndef ONLY_COMPILE_OPEN_SRC
GE_CHECK_NOTNULL(buffer); GE_CHECK_NOTNULL(buffer);
// load custom plugin so and proto // load custom plugin so and proto
AclGrphParseUtil acl_graph_parse_util; AclGrphParseUtil acl_graph_parse_util;
@@ -140,7 +137,6 @@ graphStatus aclgrphParseONNXFromMem(const char *buffer, size_t size,
return ge::FAILED; return ge::FAILED;
} }
GELOGI("AclgrphParse graph %s success.", graph.GetName().c_str()); GELOGI("AclgrphParse graph %s success.", graph.GetName().c_str());
#endif
return ge::SUCCESS; return ge::SUCCESS;
} }
} // namespace ge } // namespace ge
@@ -535,7 +531,6 @@ Status OnnxModelParser::GetModelFromFile(const char *file, ge::onnx::ModelProto
return SUCCESS; return SUCCESS;
} }


#ifndef ONLY_COMPILE_OPEN_SRC
Status OnnxModelParser::GetModelFromMemory(const char *data, uint32_t size, ge::onnx::ModelProto &onnx_model) { Status OnnxModelParser::GetModelFromMemory(const char *data, uint32_t size, ge::onnx::ModelProto &onnx_model) {
GE_CHECK_NOTNULL(data); GE_CHECK_NOTNULL(data);


@@ -548,7 +543,6 @@ Status OnnxModelParser::GetModelFromMemory(const char *data, uint32_t size, ge::
} }
return SUCCESS; return SUCCESS;
} }
#endif


Status OnnxModelParser::ModelParseToGraph(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()) { if (!onnx_model.has_graph()) {
@@ -661,7 +655,6 @@ Status OnnxModelParser::Parse(const char *file, ge::Graph &graph) {
return SUCCESS; return SUCCESS;
} }


#ifndef ONLY_COMPILE_OPEN_SRC
Status OnnxModelParser::ParseFromMemory(const char *data, uint32_t size, ge::Graph &graph) { Status OnnxModelParser::ParseFromMemory(const char *data, uint32_t size, ge::Graph &graph) {
ge::onnx::ModelProto onnx_model; ge::onnx::ModelProto onnx_model;
Status ret = GetModelFromMemory(data, size, onnx_model); Status ret = GetModelFromMemory(data, size, onnx_model);
@@ -676,7 +669,6 @@ Status OnnxModelParser::ParseFromMemory(const char *data, uint32_t size, ge::Gra
} }
return SUCCESS; return SUCCESS;
} }
#endif


Status OnnxModelParser::ToJson(const char *model_file, const char *json_file) { Status OnnxModelParser::ToJson(const char *model_file, const char *json_file) {
if (model_file == nullptr) { if (model_file == nullptr) {


+ 0
- 4
parser/onnx/onnx_parser.h View File

@@ -40,9 +40,7 @@ class OnnxModelParser : public domi::ModelParser {


Status ParseFromMemory(const char *data, uint32_t size, ge::ComputeGraphPtr &graph) override { return domi::SUCCESS; } Status ParseFromMemory(const char *data, uint32_t size, ge::ComputeGraphPtr &graph) override { return domi::SUCCESS; }


#ifndef ONLY_COMPILE_OPEN_SRC
Status ParseFromMemory(const char *data, uint32_t size, ge::Graph &graph) override; Status ParseFromMemory(const char *data, uint32_t size, ge::Graph &graph) override;
#endif


Status ParseProto(const google::protobuf::Message *proto, ge::ComputeGraphPtr &graph) override { Status ParseProto(const google::protobuf::Message *proto, ge::ComputeGraphPtr &graph) override {
return domi::SUCCESS; return domi::SUCCESS;
@@ -84,9 +82,7 @@ class OnnxModelParser : public domi::ModelParser {
Status GetModelFromFile(const char *file, ge::onnx::ModelProto &onnx_model); Status GetModelFromFile(const char *file, ge::onnx::ModelProto &onnx_model);


#ifndef ONLY_COMPILE_OPEN_SRC
Status GetModelFromMemory(const char *data, uint32_t size, ge::onnx::ModelProto &onnx_model); Status GetModelFromMemory(const char *data, uint32_t size, ge::onnx::ModelProto &onnx_model);
#endif


Status ModelParseToGraph(const ge::onnx::ModelProto &onnx_model, ge::Graph &graph); Status ModelParseToGraph(const ge::onnx::ModelProto &onnx_model, ge::Graph &graph);




+ 0
- 2
parser/tensorflow/tensorflow_parser.h View File

@@ -101,11 +101,9 @@ class TensorFlowModelParser : public domi::ModelParser {
*/ */
Status ParseFromMemory(const char *data, uint32_t size, ge::ComputeGraphPtr &graph) override; Status ParseFromMemory(const char *data, uint32_t size, ge::ComputeGraphPtr &graph) override;


#ifndef ONLY_COMPILE_OPEN_SRC
Status ParseFromMemory(const char *data, uint32_t size, ge::Graph &graph) override { Status ParseFromMemory(const char *data, uint32_t size, ge::Graph &graph) override {
return domi::SUCCESS; return domi::SUCCESS;
} }
#endif


/** /**
* @ingroup domi_omg * @ingroup domi_omg


Loading…
Cancel
Save