From 1a3258ba63a7bcb8629f381d04098aca43ff9512 Mon Sep 17 00:00:00 2001
From: wqtshg <wqtshg@126.com>
Date: Wed, 6 Jan 2021 00:28:07 +0800
Subject: [PATCH] update slog to alog

---
 parser/caffe/caffe_parser.h           |  2 --
 parser/onnx/onnx_parser.cc            | 10 +---------
 parser/onnx/onnx_parser.h             |  4 ----
 parser/tensorflow/tensorflow_parser.h |  2 --
 4 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/parser/caffe/caffe_parser.h b/parser/caffe/caffe_parser.h
index dc7e665..b210555 100644
--- a/parser/caffe/caffe_parser.h
+++ b/parser/caffe/caffe_parser.h
@@ -65,11 +65,9 @@ class CaffeModelParser : public domi::ModelParser {
    */
   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 {
     return domi::SUCCESS;
   }
-#endif
 
   /**
    * @ingroup domi_omg
diff --git a/parser/onnx/onnx_parser.cc b/parser/onnx/onnx_parser.cc
index 06ed9f7..1731254 100644
--- a/parser/onnx/onnx_parser.cc
+++ b/parser/onnx/onnx_parser.cc
@@ -83,8 +83,7 @@ graphStatus HandleAfterParse(AclGrphParseUtil &acl_graph_parse_util,
 }
 
 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);
   // load custom plugin so and proto
   AclGrphParseUtil acl_graph_parse_util;
@@ -110,13 +109,11 @@ graphStatus aclgrphParseONNX(const char *model_file,
   }
 
   GELOGI("AclgrphParse graph %s success.", graph.GetName().c_str());
-#endif
   return ge::SUCCESS;
 }
 
 graphStatus aclgrphParseONNXFromMem(const char *buffer, size_t size,
                                     const std::map<AscendString, AscendString> &parser_params, ge::Graph &graph) {
-#ifndef ONLY_COMPILE_OPEN_SRC
   GE_CHECK_NOTNULL(buffer);
   // load custom plugin so and proto
   AclGrphParseUtil acl_graph_parse_util;
@@ -140,7 +137,6 @@ graphStatus aclgrphParseONNXFromMem(const char *buffer, size_t size,
     return ge::FAILED;
   }
     GELOGI("AclgrphParse graph %s success.", graph.GetName().c_str());
-#endif
     return ge::SUCCESS;
 }
 } // namespace ge
@@ -535,7 +531,6 @@ Status OnnxModelParser::GetModelFromFile(const char *file, ge::onnx::ModelProto
   return SUCCESS;
 }
 
-#ifndef ONLY_COMPILE_OPEN_SRC
 Status OnnxModelParser::GetModelFromMemory(const char *data, uint32_t size, ge::onnx::ModelProto &onnx_model) {
   GE_CHECK_NOTNULL(data);
 
@@ -548,7 +543,6 @@ Status OnnxModelParser::GetModelFromMemory(const char *data, uint32_t size, ge::
   }
   return SUCCESS;
 }
-#endif
 
 Status OnnxModelParser::ModelParseToGraph(const ge::onnx::ModelProto &onnx_model, ge::Graph &graph) {
   if (!onnx_model.has_graph()) {
@@ -661,7 +655,6 @@ Status OnnxModelParser::Parse(const char *file, ge::Graph &graph) {
   return SUCCESS;
 }
 
-#ifndef ONLY_COMPILE_OPEN_SRC
 Status OnnxModelParser::ParseFromMemory(const char *data, uint32_t size, ge::Graph &graph) {
   ge::onnx::ModelProto 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;
 }
-#endif
 
 Status OnnxModelParser::ToJson(const char *model_file, const char *json_file) {
   if (model_file == nullptr) {
diff --git a/parser/onnx/onnx_parser.h b/parser/onnx/onnx_parser.h
index 245cd77..2d7b765 100644
--- a/parser/onnx/onnx_parser.h
+++ b/parser/onnx/onnx_parser.h
@@ -40,9 +40,7 @@ class OnnxModelParser : public domi::ModelParser {
 
   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;
-#endif
 
   Status ParseProto(const google::protobuf::Message *proto, ge::ComputeGraphPtr &graph) override {
     return domi::SUCCESS;
@@ -84,9 +82,7 @@ class OnnxModelParser : public domi::ModelParser {
   
   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);
-#endif
 
   Status ModelParseToGraph(const ge::onnx::ModelProto &onnx_model, ge::Graph &graph);
 
diff --git a/parser/tensorflow/tensorflow_parser.h b/parser/tensorflow/tensorflow_parser.h
index 8ea455c..cd7e650 100644
--- a/parser/tensorflow/tensorflow_parser.h
+++ b/parser/tensorflow/tensorflow_parser.h
@@ -101,11 +101,9 @@ class TensorFlowModelParser : public domi::ModelParser {
    */
   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 {
     return domi::SUCCESS;
   }
-#endif
 
   /**
    * @ingroup domi_omg