@@ -88,11 +88,9 @@ else () | |||||
find_module(hccl libhccl.so ${GE_LIB_PATH}) | find_module(hccl libhccl.so ${GE_LIB_PATH}) | ||||
find_module(adump_server libadump_server.a ${GE_LIB_PATH}) | find_module(adump_server libadump_server.a ${GE_LIB_PATH}) | ||||
find_module(runtime libruntime.so ${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(resource libresource.so ${GE_LIB_PATH}) | ||||
find_module(ascend_hal_stub libascend_hal.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}) | find_module(msprofiler_fwk_ext libmsprofiler_fwk.a ${GE_LIB_PATH}) | ||||
#find_module(ascendcl_static libascendcl.a ${GE_LIB_PATH}) | |||||
else() | else() | ||||
find_module(slog libalog.so ${ASCEND_ATC_DIR}) | find_module(slog libalog.so ${ASCEND_ATC_DIR}) | ||||
find_module(opt_feature libopt_feature.so ${ASCEND_ATC_DIR}) | find_module(opt_feature libopt_feature.so ${ASCEND_ATC_DIR}) | ||||
@@ -108,7 +106,6 @@ else () | |||||
elseif(PLATFORM STREQUAL "inference") | elseif(PLATFORM STREQUAL "inference") | ||||
find_module(adump_server libadump_server.a ${ASCEND_ACL_DIR}) | find_module(adump_server libadump_server.a ${ASCEND_ACL_DIR}) | ||||
find_module(runtime libruntime.so ${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}) | find_module(msprofiler_ext libmsprofiler.a ${ASCEND_ACL_DIR}) | ||||
if(PRODUCT STREQUAL "flr3") | if(PRODUCT STREQUAL "flr3") | ||||
elseif(PRODUCT STREQUAL "flr1") | elseif(PRODUCT STREQUAL "flr1") | ||||
@@ -120,10 +117,9 @@ else () | |||||
endif() | endif() | ||||
elseif(PLATFORM STREQUAL "all") | elseif(PLATFORM STREQUAL "all") | ||||
find_module(adump_server libadump_server.a ${ASCEND_RUNTIME_DIR}) | find_module(adump_server libadump_server.a ${ASCEND_RUNTIME_DIR}) | ||||
find_module(runtime libruntime.so ${ASCEND_RUNTIME_DIR}) | |||||
find_module(runtime libruntime.so ${ASCEND_ATC_DIR}) | |||||
find_module(msprofiler_fwk_ext libmsprofiler_fwk.a ${ASCEND_RUNTIME_DIR}) | 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(ascend_hal_stub libascend_hal.so ${ASCEND_ATC_DIR}/stub) | |||||
find_module(msprofiler_ext libmsprofiler.a ${ASCEND_ACL_DIR}) | find_module(msprofiler_ext libmsprofiler.a ${ASCEND_ACL_DIR}) | ||||
else() | else() | ||||
message(STATUS "PLATFORM param is invalid, should be train or inference, you choose nothing!") | message(STATUS "PLATFORM param is invalid, should be train or inference, you choose nothing!") | ||||
@@ -10,12 +10,17 @@ if ((${CMAKE_INSTALL_PREFIX} STREQUAL /usr/local) OR | |||||
message(STATUS "No install prefix selected, default to ${CMAKE_INSTALL_PREFIX}.") | message(STATUS "No install prefix selected, default to ${CMAKE_INSTALL_PREFIX}.") | ||||
endif() | endif() | ||||
if (ENABLE_GITEE) | |||||
set(REQ_URL "https://gitee.com/mirrors/gflags/repository/archive/v2.2.2.tar.gz") | |||||
set(MD5 "") | |||||
if (GE_PB_PKG) | |||||
set(REQ_URL "${GE_PB_PKG}/libs/gflags/v2.2.2.tar.gz") | |||||
set(MD5 "1a865b93bacfa963201af3f75b7bd64c") | |||||
else() | else() | ||||
set(REQ_URL "https://github.com/gflags/gflags/archive/v2.2.2.tar.gz") | |||||
set(MD5 "") | |||||
if (ENABLE_GITEE) | |||||
set(REQ_URL "https://gitee.com/mirrors/gflags/repository/archive/v2.2.2.tar.gz") | |||||
set(MD5 "") | |||||
else() | |||||
set(REQ_URL "https://github.com/gflags/gflags/archive/v2.2.2.tar.gz") | |||||
set(MD5 "1a865b93bacfa963201af3f75b7bd64c") | |||||
endif () | |||||
endif () | endif () | ||||
set (gflags_CXXFLAGS "-D_GLIBCXX_USE_CXX11_ABI=0 -Dgoogle=ascend_private") | set (gflags_CXXFLAGS "-D_GLIBCXX_USE_CXX11_ABI=0 -Dgoogle=ascend_private") | ||||
@@ -593,7 +593,6 @@ target_compile_definitions(ge_compiler PRIVATE | |||||
REUSE_MEMORY=1 | REUSE_MEMORY=1 | ||||
FMK_SUPPORT_DUMP | FMK_SUPPORT_DUMP | ||||
FMK_HOST_INFER | FMK_HOST_INFER | ||||
COMPILE_OMG_PACKAGE | |||||
google=ascend_private | google=ascend_private | ||||
FUNC_VISIBILITY | FUNC_VISIBILITY | ||||
$<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC> | $<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC> | ||||
@@ -655,8 +654,7 @@ target_link_libraries(ge_compiler PRIVATE | |||||
c_sec | c_sec | ||||
error_manager | error_manager | ||||
slog | slog | ||||
$<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:runtime>> | |||||
$<$<BOOL:${ENABLE_OPEN_SRC}>:$<BUILD_INTERFACE:runtime_compile>> | |||||
runtime | |||||
opt_feature | opt_feature | ||||
-Wl,--as-needed | -Wl,--as-needed | ||||
json | json | ||||
@@ -22,7 +22,6 @@ target_compile_options(atc_atc.bin PRIVATE | |||||
target_compile_definitions(atc_atc.bin PRIVATE | target_compile_definitions(atc_atc.bin PRIVATE | ||||
PROTOBUF_INLINE_NOT_IN_HEADERS=0 | PROTOBUF_INLINE_NOT_IN_HEADERS=0 | ||||
COMPILE_OMG_PACKAGE | |||||
google=ascend_private | google=ascend_private | ||||
LOG_CPP | LOG_CPP | ||||
FUNC_VISIBILITY | FUNC_VISIBILITY | ||||
@@ -48,6 +47,7 @@ target_include_directories(atc_atc.bin PRIVATE | |||||
target_link_options(atc_atc.bin PRIVATE | target_link_options(atc_atc.bin PRIVATE | ||||
-Wl,-Bsymbolic | -Wl,-Bsymbolic | ||||
-Wl,-rpath-link,${ASCEND_ATC_DIR}/stub | |||||
) | ) | ||||
target_link_libraries(atc_atc.bin PRIVATE | target_link_libraries(atc_atc.bin PRIVATE | ||||
@@ -62,8 +62,7 @@ target_link_libraries(atc_atc.bin PRIVATE | |||||
parser_common | parser_common | ||||
gflags | gflags | ||||
json | json | ||||
$<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:runtime>> | |||||
$<$<BOOL:${ENABLE_OPEN_SRC}>:$<BUILD_INTERFACE:runtime_compile>> | |||||
runtime | |||||
slog | slog | ||||
static_mmpa | static_mmpa | ||||
-lrt | -lrt | ||||
@@ -92,7 +91,6 @@ target_compile_options(fwk_atc.bin PRIVATE | |||||
target_compile_definitions(fwk_atc.bin PRIVATE | target_compile_definitions(fwk_atc.bin PRIVATE | ||||
PROTOBUF_INLINE_NOT_IN_HEADERS=0 | PROTOBUF_INLINE_NOT_IN_HEADERS=0 | ||||
COMPILE_OMG_PACKAGE | |||||
google=ascend_private | google=ascend_private | ||||
LOG_CPP | LOG_CPP | ||||
FUNC_VISIBILITY | FUNC_VISIBILITY | ||||
@@ -1 +1 @@ | |||||
Subproject commit 5a9605f6cb1204a729a51fe36bc614cf1d94a496 | |||||
Subproject commit a725349b65aef2940555af2ddb7b9461fbe0d5fd |