Nigel
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!14660 fix the ge compilation problem. 

From: @wangshuide2020
Reviewed-by: @liangchenghui,@wuxuejian
Signed-off-by: @liangchenghui
This commit is contained in:
mindspore-ci-bot 2021-04-07 14:47:35 +08:00 committed by Gitee
parent da93717c5d b3b8e49e53
commit 13305bd950
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/options.cmake
View File

@ -23,7 +23,7 @@ option(ENABLE_PYTHON "Enable python" ON)
option(ENABLE_ACL "enable acl" OFF) option(ENABLE_ACL "enable acl" OFF)
option(ENABLE_GLIBCXX "enable_glibcxx" OFF) option(ENABLE_GLIBCXX "enable_glibcxx" OFF)
if(NOT ENABLE_D AND NOT ENABLE_TESTCASES AND NOT ENABLE_ACL) if(NOT ENABLE_D AND NOT ENABLE_TESTCASES AND NOT ENABLE_ACL AND NOT ENABLE_GE)
set(ENABLE_GLIBCXX ON) set(ENABLE_GLIBCXX ON)
endif() endif()

2
mindspore/ccsrc/CMakeLists.txt
View File

@ -256,7 +256,7 @@ if(ENABLE_GE)
else() else()
target_link_libraries(mindspore ge_client) target_link_libraries(mindspore ge_client)
endif() endif()
target_link_libraries(mindspore graph tsdclient datatransfer) target_link_libraries(mindspore graph tsdclient datatransfer ascendcl runtime)
endif() endif()
if(ENABLE_D) if(ENABLE_D)

4
mindspore/ccsrc/pipeline/jit/pipeline.cc
View File

@ -80,7 +80,7 @@ using mindspore::abstract::AbstractTensorPtr;
using mindspore::abstract::AbstractTuple; using mindspore::abstract::AbstractTuple;
using mindspore::abstract::AbstractTuplePtr; using mindspore::abstract::AbstractTuplePtr;
#if (ENABLE_GE || ENABLE_D) #if (ENABLE_D)
using mindspore::device::ascend::ProfilingManager; using mindspore::device::ascend::ProfilingManager;
#endif #endif
@ -1109,7 +1109,7 @@ void InitHccl() {
(void)context::OpenTsd(ms_context); (void)context::OpenTsd(ms_context);
} }
#endif #endif
#if (ENABLE_GE || ENABLE_D) #if (ENABLE_D)
if (!ProfilingManager::GetInstance().IsProfiling()) { if (!ProfilingManager::GetInstance().IsProfiling()) {
ProfilingManager::GetInstance().SetHcclEnabledBefProfilingEnabled(); ProfilingManager::GetInstance().SetHcclEnabledBefProfilingEnabled();
} }

9
mindspore/ccsrc/runtime/device/CMakeLists.txt
View File

@ -16,8 +16,11 @@ else()
endif() endif()
if(ENABLE_D) if(ENABLE_D)
file(GLOB_RECURSE D_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "ascend/*.cc" "kernel_adjust.cc" file(GLOB_RECURSE D_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "ascend/*.cc" "kernel_adjust.cc")
"../../minddata/dataset/engine/tdt/tdt_handle.cc") endif()
if(ENABLE_TDTQUE)
file(GLOB_RECURSE TDT_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
"../../minddata/dataset/engine/tdt/tdt_handle.cc")
endif() endif()
if(ENABLE_CPU) if(ENABLE_CPU)
@ -75,4 +78,4 @@ endif()
list(REMOVE_ITEM D_SRC_LIST "ascend/profiling/profiling_callback_register.cc") list(REMOVE_ITEM D_SRC_LIST "ascend/profiling/profiling_callback_register.cc")
set_property(SOURCE ${DEVICE_SRC_LIST} ${D_SRC_LIST} ${CPU_SRC_LIST} set_property(SOURCE ${DEVICE_SRC_LIST} ${D_SRC_LIST} ${CPU_SRC_LIST}
PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE) PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE)
add_library(_mindspore_runtime_device_obj OBJECT ${DEVICE_SRC_LIST} ${D_SRC_LIST} ${CPU_SRC_LIST}) add_library(_mindspore_runtime_device_obj OBJECT ${DEVICE_SRC_LIST} ${D_SRC_LIST} ${CPU_SRC_LIST} ${TDT_SRC_LIST})