mindspore-Ecosystem
/
mindspore
21
0
Fork 27
Code Issues Pull Requests 6 Projects Releases Wiki Activity

add custom environment variable ASCEND_CUSTOM_PATH for customized Ascend software installation

This commit is contained in:
yanghaoran 2020-04-09 19:07:01 +08:00
parent b2b1adff2f
commit 576f65ad48
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/dependency_graphengine.cmake
View File

@ -39,7 +39,11 @@ elseif (DEFINED ENV{D_LINK_PATH})
find_library(resource libresource.so ${GE_LIB_PATH}) find_library(resource libresource.so ${GE_LIB_PATH})
else() else()
# Ascend mode # Ascend mode
set(ASCEND_PATH /usr/local/Ascend) if(DEFINED ENV{ASCEND_CUSTOM_PATH})
set(ASCEND_PATH $ENV{ASCEND_CUSTOM_PATH})
else()
set(ASCEND_PATH /usr/local/Ascend)
endif()
set(ASCEND_DRIVER_PATH ${ASCEND_PATH}/driver/lib64/common) set(ASCEND_DRIVER_PATH ${ASCEND_PATH}/driver/lib64/common)
set(ASCEND_RUNTIME_PATH ${ASCEND_PATH}/fwkacllib/lib64) set(ASCEND_RUNTIME_PATH ${ASCEND_PATH}/fwkacllib/lib64)
find_library(c_sec libc_sec.so ${ASCEND_DRIVER_PATH}) find_library(c_sec libc_sec.so ${ASCEND_DRIVER_PATH})

2
graphengine

@ -1 +1 @@
Subproject commit 5369646b489114b380a7b5208ddd6e632acb447f Subproject commit 5bd0dc1ed59a9ec4ea6a602bf1385c59d845f922

12
mindspore/ccsrc/CMakeLists.txt
View File

@ -296,7 +296,11 @@ if(ENABLE_D)
endif() endif()
else() else()
MESSAGE("use system default lib") MESSAGE("use system default lib")
set(ASCEND_PATH /usr/local/Ascend) if(DEFINED ENV{ASCEND_CUSTOM_PATH})
set(ASCEND_PATH $ENV{ASCEND_CUSTOM_PATH})
else()
set(ASCEND_PATH /usr/local/Ascend)
endif()
set(ASCEND_DRIVER_PATH ${ASCEND_PATH}/driver/lib64/common) set(ASCEND_DRIVER_PATH ${ASCEND_PATH}/driver/lib64/common)
set(ASCEND_RUNTIME_PATH ${ASCEND_PATH}/fwkacllib/lib64) set(ASCEND_RUNTIME_PATH ${ASCEND_PATH}/fwkacllib/lib64)
endif() endif()
@ -500,7 +504,11 @@ add_dependencies(add_ms_lib _c_expression)
if (NOT ENABLE_GE) if (NOT ENABLE_GE)
if (ENABLE_D) if (ENABLE_D)
set(ASCEND_PATH /usr/local/Ascend) if(DEFINED ENV{ASCEND_CUSTOM_PATH})
set(ASCEND_PATH $ENV{ASCEND_CUSTOM_PATH})
else()
set(ASCEND_PATH /usr/local/Ascend)
endif()
set(ASCEND_DRIVER_PATH ${ASCEND_PATH}/driver/lib64/common) set(ASCEND_DRIVER_PATH ${ASCEND_PATH}/driver/lib64/common)
add_custom_target(add_ge_lib ALL add_custom_target(add_ge_lib ALL
COMMAND cp ${MS_CCSRC_BUILD_PATH}/../../graphengine/src/common/graph/libgraph.so ${MS_LIB_PATH} COMMAND cp ${MS_CCSRC_BUILD_PATH}/../../graphengine/src/common/graph/libgraph.so ${MS_LIB_PATH}