!193 update slog to alog

Merge pull request !193 from 王涛/development

CMakeLists.txt

@@ -33,7 +33,7 @@ if (ENABLE_OPEN_SRC)
             message(FATAL_ERROR "Running on a unsupported architecture: ${SYSTEM_TYPE}, build terminated")
         endif()
         set(GE_LIB_PATH ${GE_LIB_PATH}/${GE_SYS_ARCH})
-        find_module(slog libslog.so ${GE_LIB_PATH})
+        find_module(slog libalog.so ${GE_LIB_PATH})
         find_module(static_mmpa libmmpa.a ${GE_LIB_PATH})
         find_module(error_manager liberror_manager.so ${GE_LIB_PATH})
     elseif(ENABLE_GE_COV OR ENABLE_GE_UT)
@@ -47,7 +47,7 @@ if (ENABLE_OPEN_SRC)
 
         set(ASCEND_ATC_DIR ${ASCEND_DIR}/atc/lib64)
 
-        find_module(slog libslog.so ${ASCEND_ATC_DIR})
+        find_module(slog libalog.so ${ASCEND_ATC_DIR})
         find_module(static_mmpa libmmpa.a ${ASCEND_ATC_DIR})
         find_module(error_manager liberror_manager.so ${ASCEND_ATC_DIR})
     endif()

cmake/intf_pub_linux.cmake

@@ -16,6 +16,7 @@ target_compile_definitions(intf_pub INTERFACE
     $<$<CONFIG:Debug>:CFG_BUILD_DEBUG>   
     WIN64=1
     LINUX=0
+	LOG_CPP
 )
 target_link_options(intf_pub INTERFACE
     -Wl,-z,relro

metadef

@@ -1 +1 @@
-Subproject commit fe37bc343ea52c76d35e9e9ec83cea0151bfa900
+Subproject commit 6d05942ebe59d644c5f079dde9b02739ff62d71c

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

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) {

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

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