Browse Source

all-in-one---runtime unitize

tags/v1.5.1
wqtshg 3 years ago
parent
commit
4e5b81838d
4 changed files with 32 additions and 10 deletions
  1. +19
    -8
      ge/CMakeLists.txt
  2. +2
    -1
      ge/offline/CMakeLists.txt
  3. +10
    -0
      ge/opskernel_manager/ops_kernel_builder_manager.cc
  4. +1
    -1
      metadef

+ 19
- 8
ge/CMakeLists.txt View File

@@ -786,12 +786,12 @@ target_include_directories(ge_runner SYSTEM PRIVATE
${GE_CODE_DIR}/../abl/licctrl
${GE_CODE_DIR}/../ace/comop/inc
${GE_CODE_DIR}/../ace/comop/inc/external
#### blue zone
#### blue zone ####
${ASCEND_DIR}/driver/include
${ASCEND_DIR}/fwkacllib/include
${GE_CODE_DIR}/third_party/fwkacllib/inc
${GE_CODE_DIR}/third_party/fwkacllib/inc/toolchain
${GE_CODE_DIR}/third_party/fwkacllib/inc/opt_info
$<$<BOOL:${ENABLE_OPEN_SRC}>:${GE_CODE_DIR}/third_party/fwkacllib/inc>
$<$<BOOL:${ENABLE_OPEN_SRC}>:${GE_CODE_DIR}/third_party/fwkacllib/inc/toolchain>
$<$<BOOL:${ENABLE_OPEN_SRC}>:${GE_CODE_DIR}/third_party/fwkacllib/inc/opt_info>
)

target_link_options(ge_runner PRIVATE
@@ -800,6 +800,11 @@ target_link_options(ge_runner PRIVATE

target_link_libraries(ge_runner PRIVATE
$<BUILD_INTERFACE:intf_pub>
$<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:slog_headers>>
$<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:msprof_headers>>
$<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:mmpa_headers>>
$<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:runtime_headers>>
$<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:cce_headers>>
adump_server
static_mmpa
ge_proto_common
@@ -869,9 +874,9 @@ target_include_directories(ge_compiler SYSTEM PRIVATE
#### blue zone ####
${ASCEND_DIR}/driver/include
${ASCEND_DIR}/fwkacllib/include
${GE_CODE_DIR}/third_party/fwkacllib/inc
${GE_CODE_DIR}/third_party/fwkacllib/inc/toolchain
${GE_CODE_DIR}/third_party/fwkacllib/inc/opt_info
$<$<BOOL:${ENABLE_OPEN_SRC}>:${GE_CODE_DIR}/third_party/fwkacllib/inc>
$<$<BOOL:${ENABLE_OPEN_SRC}>:${GE_CODE_DIR}/third_party/fwkacllib/inc/toolchain>
$<$<BOOL:${ENABLE_OPEN_SRC}>:${GE_CODE_DIR}/third_party/fwkacllib/inc/opt_info>
)

target_link_options(ge_compiler PRIVATE
@@ -880,6 +885,11 @@ target_link_options(ge_compiler PRIVATE

target_link_libraries(ge_compiler PRIVATE
$<BUILD_INTERFACE:intf_pub>
$<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:slog_headers>>
$<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:msprof_headers>>
$<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:mmpa_headers>>
$<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:runtime_headers>>
$<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:cce_headers>>
static_mmpa
ge_proto_common
-Wl,--no-as-needed
@@ -890,7 +900,8 @@ target_link_libraries(ge_compiler PRIVATE
c_sec
error_manager
slog
runtime_compile
$<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:runtime>>
$<$<BOOL:${ENABLE_OPEN_SRC}>:$<BUILD_INTERFACE:runtime_compile>>
opt_feature
-Wl,--as-needed
json


+ 2
- 1
ge/offline/CMakeLists.txt View File

@@ -62,7 +62,8 @@ target_link_libraries(atc_atc.bin PRIVATE
parser_common
gflags
json
runtime_compile
$<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:runtime>>
$<$<BOOL:${ENABLE_OPEN_SRC}>:$<BUILD_INTERFACE:runtime_compile>>
slog
static_mmpa
-lrt


+ 10
- 0
ge/opskernel_manager/ops_kernel_builder_manager.cc View File

@@ -20,6 +20,7 @@

namespace ge {
namespace {
#ifdef ONLY_COMPILE_OPEN_SRC
const std::vector<std::string> kBasicBuilderLibs = {
"libge_local_opskernel_builder.so",
"libhost_cpu_opskernel_builder.so",
@@ -27,6 +28,15 @@ const std::vector<std::string> kBasicBuilderLibs = {
"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",
"librts_engine.so",
"libaicpu_ascend_engine.so",
"libaicpu_tf_engine.so"
};
#endif

const std::vector<std::string> kHcclBuilderLibs = {
"libhcom_opskernel_builder.so",


+ 1
- 1
metadef

@@ -1 +1 @@
Subproject commit f9a47a45cdd7e6dc507a15291fcb769f96b859b3
Subproject commit d5101eed670e0ecf8391db616c12582ed577adab

Loading…
Cancel
Save