From be2a31e2289faccdb7712ff931ea60db3c037f3e Mon Sep 17 00:00:00 2001
From: chenyemeng <chenyemeng@huawei.com>
Date: Tue, 5 Jan 2021 19:28:51 +0800
Subject: [PATCH] rm macro

---
 ge/CMakeLists.txt                       | 1 -
 ge/client/ge_api.cc                     | 8 --------
 inc/framework/common/ge_types.h         | 3 ---
 inc/framework/omg/parser/model_parser.h | 2 --
 tests/ut/ge/CMakeLists.txt              | 5 -----
 5 files changed, 19 deletions(-)

diff --git a/ge/CMakeLists.txt b/ge/CMakeLists.txt
index 5181bb61..317ff00a 100755
--- a/ge/CMakeLists.txt
+++ b/ge/CMakeLists.txt
@@ -654,7 +654,6 @@ target_compile_definitions(ge_runner PRIVATE
     FMK_SUPPORT_DUMP
     DAVINCI_CLOUD
     google=ascend_private
-    $<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC>
 )
 
 target_compile_options(ge_runner PRIVATE
diff --git a/ge/client/ge_api.cc b/ge/client/ge_api.cc
index 75cc92d4..d65d7667 100644
--- a/ge/client/ge_api.cc
+++ b/ge/client/ge_api.cc
@@ -32,9 +32,7 @@
 #include "graph/common/ge_call_wrapper.h"
 #include "register/op_registry.h"
 #include "common/ge/tbe_plugin_manager.h"
-#ifndef ONLY_COMPILE_OPEN_SRC
 #include "toolchain/plog.h"
-#endif
 
 using domi::OpRegistry;
 using std::map;
@@ -132,11 +130,9 @@ Status GEInitializeImpl(const std::map<string, string> &options) {
 
 // Initialize GE, prepare for execution, call GELib::Initialize
 Status GEInitialize(const std::map<string, string> &options) {
-#ifndef ONLY_COMPILE_OPEN_SRC
   if (DlogReportInitialize() != SUCCESS) {
     GELOGW("Dlog report device log initialize failed.");
   }
-#endif
   return GEInitializeImpl(options);
 }
 
@@ -151,11 +147,9 @@ Status GEInitialize(const std::map<AscendString, AscendString> &options) {
     std::string val = option.second.GetString();
     str_options[key] = val;
   }
-#ifndef ONLY_COMPILE_OPEN_SRC
   if (DlogReportInitialize() != SUCCESS) {
     GELOGW("Dlog report device log initialize failed.");
   }
-#endif
   return GEInitializeImpl(str_options);
 }
 
@@ -200,11 +194,9 @@ Status GEFinalize() {
   // to avoid memory fragment, use malloc_trim to back free stack to system
   malloc_trim(0);
 
-#ifndef ONLY_COMPILE_OPEN_SRC
   if (DlogReportFinalize() != SUCCESS) {
     GELOGW("Dlog report device log finalize failed.");
   }
-#endif
 
   GELOGT(TRACE_STOP, "GEFinalize finished");
   return ret;
diff --git a/inc/framework/common/ge_types.h b/inc/framework/common/ge_types.h
index d845654e..8327b72c 100644
--- a/inc/framework/common/ge_types.h
+++ b/inc/framework/common/ge_types.h
@@ -37,10 +37,7 @@ enum FrameworkType {
   MINDSPORE = 1,
   TENSORFLOW = 3,
   ANDROID_NN,
-#ifndef ONLY_COMPILE_OPEN_SRC
   ONNX,
-#endif
-  FRAMEWORK_RESERVED,
 };
 
 enum OpEngineType {
diff --git a/inc/framework/omg/parser/model_parser.h b/inc/framework/omg/parser/model_parser.h
index 57cff9a7..9eda685d 100644
--- a/inc/framework/omg/parser/model_parser.h
+++ b/inc/framework/omg/parser/model_parser.h
@@ -65,7 +65,6 @@ class ModelParser {
    */
   virtual Status ParseFromMemory(const char *data, uint32_t size, ge::ComputeGraphPtr &graph) = 0;
 
-#ifndef ONLY_COMPILE_OPEN_SRC
   /**
    * @ingroup domi_omg
    * @brief Parse relevant data from memory and save it to graph
@@ -77,7 +76,6 @@ class ModelParser {
    * @author
    */
   virtual Status ParseFromMemory(const char *data, uint32_t size, ge::Graph &graph) = 0;
-#endif
 
   /**
    * @ingroup domi_omg
diff --git a/tests/ut/ge/CMakeLists.txt b/tests/ut/ge/CMakeLists.txt
index 9af3719b..3a06507c 100755
--- a/tests/ut/ge/CMakeLists.txt
+++ b/tests/ut/ge/CMakeLists.txt
@@ -723,7 +723,6 @@ add_library(ge_ut_common STATIC ${COMMON_SRC_FILES} ${PROTO_SRCS} ${PROTO_HDRS})
 
 target_compile_definitions(ge_ut_common PRIVATE
     google=ascend_private
-    $<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC>
 )
 
 target_link_libraries(ge_ut_common PRIVATE
@@ -738,7 +737,6 @@ add_library(ge_ut_common_format STATIC ${COMMON_SRC_FILES} ${COMMON_FORMAT_SRC_F
 
 target_compile_definitions(ge_ut_common_format PRIVATE
     google=ascend_private
-    $<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC>
 )
 
 target_link_libraries(ge_ut_common_format PRIVATE
@@ -795,7 +793,6 @@ add_library(ge_load_common STATIC ${GRAPH_LOAD_COMMON_SRC_FILES} ${PROTO_SRCS} $
 
 target_compile_definitions(ge_load_common PRIVATE
     google=ascend_private
-    $<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC>
 )
 
 target_link_libraries(ge_load_common PRIVATE
@@ -810,7 +807,6 @@ add_library(ge_execute_common STATIC ${GRAPH_EXECUTE_COMMON_SRC_FILES} ${PROTO_S
 
 target_compile_definitions(ge_execute_common PRIVATE
     google=ascend_private
-    $<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC>
 )
 
 target_link_libraries(ge_execute_common PRIVATE
@@ -825,7 +821,6 @@ add_library(ge_build_common STATIC ${GRAPH_BUILD_COMMON_SRC_FILES} ${PROTO_SRCS}
 
 target_compile_definitions(ge_build_common PRIVATE
     google=ascend_private
-    $<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC>
 )
 
 target_link_libraries(ge_build_common PRIVATE