Pre Merge pull request !2002 from 王涛/master

CMakeLists.txt

@@ -29,6 +29,7 @@ set(ASCEND_RUNTIME_DIR ${ASCEND_DIR}/fwkacllib/lib64)
 set(ASCEND_ATC_DIR ${ASCEND_DIR}/atc/lib64)
 set(ASCEND_ACL_DIR ${ASCEND_DIR}/acllib/lib64)
 set(STATIC_ACL_LIB ${ASCEND_ACL_DIR})
+set(ASCEND_RUNTIME_PATH ${ASCEND_RUNTIME_DIR} ${ASCEND_ACL_DIR} ${ASCEND_ATC_DIR})
 
 set(ASCEND_MS_RUNTIME_PATH ${ASCEND_RUNTIME_DIR} ${ASCEND_ACL_DIR} ${ASCEND_ATC_DIR})
 set(ASCEND_MS_DRIVER_PATH ${ASCEND_DRIVER_DIR} ${ASCEND_DRIVER_COMMON_DIR})
@@ -88,7 +89,6 @@ else ()
             find_module(hccl libhccl.so ${GE_LIB_PATH})
             find_module(adump_server libadump_server.a ${GE_LIB_PATH})
             find_module(runtime libruntime.so ${GE_LIB_PATH})
-            find_module(runtime_compile libruntime_compile.so ${GE_LIB_PATH})
             find_module(resource libresource.so ${GE_LIB_PATH})
             find_module(ascend_hal_stub libascend_hal.so ${GE_LIB_PATH})
             find_module(msprofiler_fwk_ext libmsprofiler_fwk.a ${GE_LIB_PATH})
@@ -108,7 +108,6 @@ else ()
             elseif(PLATFORM STREQUAL "inference")
                 find_module(adump_server libadump_server.a ${ASCEND_ACL_DIR})
                 find_module(runtime libruntime.so ${ASCEND_ACL_DIR})
-                find_module(runtime_compile libruntime_compile.so ${ASCEND_ATC_DIR})
                 find_module(msprofiler_ext libmsprofiler.a ${ASCEND_ACL_DIR})
                 if(PRODUCT STREQUAL "flr3")
                 elseif(PRODUCT STREQUAL "flr1")
@@ -120,10 +119,9 @@ else ()
                 endif()
             elseif(PLATFORM STREQUAL "all")
                 find_module(adump_server libadump_server.a ${ASCEND_RUNTIME_DIR})
-                find_module(runtime libruntime.so ${ASCEND_RUNTIME_DIR})
+                find_module(runtime libruntime.so ${ASCEND_RUNTIME_PATH})
                 find_module(msprofiler_fwk_ext libmsprofiler_fwk.a ${ASCEND_RUNTIME_DIR})
                 find_module(ascend_hal_stub libascend_hal.so ${ASCEND_DRIVER_DIR})
-                find_module(runtime_compile libruntime_compile.so ${ASCEND_ATC_DIR})
                 find_module(msprofiler_ext libmsprofiler.a ${ASCEND_ACL_DIR})
             else()
                 message(STATUS "PLATFORM param is invalid, should be train or inference, you choose nothing!")

ge/CMakeLists.txt

@@ -593,7 +593,6 @@ target_compile_definitions(ge_compiler PRIVATE
     REUSE_MEMORY=1
     FMK_SUPPORT_DUMP
     FMK_HOST_INFER
-    COMPILE_OMG_PACKAGE
     google=ascend_private
     FUNC_VISIBILITY
     $<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC>
@@ -655,8 +654,7 @@ target_link_libraries(ge_compiler PRIVATE
     c_sec
     error_manager
     slog
-    $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:runtime>>
-    $<$<BOOL:${ENABLE_OPEN_SRC}>:$<BUILD_INTERFACE:runtime_compile>>
+    runtime
     opt_feature
     -Wl,--as-needed
     json

ge/offline/CMakeLists.txt

@@ -22,7 +22,6 @@ target_compile_options(atc_atc.bin PRIVATE
 
 target_compile_definitions(atc_atc.bin PRIVATE
     PROTOBUF_INLINE_NOT_IN_HEADERS=0
-    COMPILE_OMG_PACKAGE
     google=ascend_private
     LOG_CPP
     FUNC_VISIBILITY
@@ -62,8 +61,7 @@ target_link_libraries(atc_atc.bin PRIVATE
     parser_common
     gflags
     json
-    $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:runtime>>
-    $<$<BOOL:${ENABLE_OPEN_SRC}>:$<BUILD_INTERFACE:runtime_compile>>
+    runtime
     slog
     static_mmpa
     -lrt
@@ -92,7 +90,6 @@ target_compile_options(fwk_atc.bin PRIVATE
 
 target_compile_definitions(fwk_atc.bin PRIVATE
     PROTOBUF_INLINE_NOT_IN_HEADERS=0
-    COMPILE_OMG_PACKAGE
     google=ascend_private
     LOG_CPP
     FUNC_VISIBILITY

ge/opskernel_manager/ops_kernel_builder_manager.cc

@@ -20,15 +20,6 @@
 
 namespace ge {
 namespace {
-#ifdef ONLY_COMPILE_OPEN_SRC
-const std::vector<std::string> kBasicBuilderLibs = {
-    "libge_local_opskernel_builder.so",
-    "libhost_cpu_opskernel_builder.so",
-    "librts_kernel_builder.so",
-    "libaicpu_ascend_builder.so",
-    "libaicpu_tf_builder.so"
-};
-#else
 const std::vector<std::string> kBasicBuilderLibs = {
     "libge_local_opskernel_builder.so",
     "libhost_cpu_opskernel_builder.so",
@@ -36,7 +27,6 @@ const std::vector<std::string> kBasicBuilderLibs = {
     "libaicpu_ascend_engine.so",
     "libaicpu_tf_engine.so"
 };
-#endif
 
 const std::vector<std::string> kHcclBuilderLibs = {
     "libhcom_opskernel_builder.so",

metadef

@@ -1 +1 @@
-Subproject commit 5a9605f6cb1204a729a51fe36bc614cf1d94a496
+Subproject commit a725349b65aef2940555af2ddb7b9461fbe0d5fd