Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
magicwindyyd
mindspore
提交
7bb4452b
M
mindspore
项目概览
magicwindyyd
/
mindspore
与 Fork 源项目一致
Fork自
MindSpore / mindspore
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
mindspore
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
7bb4452b
编写于
8月 06, 2020
作者:
M
mindspore-ci-bot
提交者:
Gitee
8月 06, 2020
浏览文件
操作
浏览文件
下载
差异文件
!4028 fix mpi link error
Merge pull request !4028 from kisnwang/disable-host-mpi
上级
352d2462
51e9fbf9
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
38 addition
and
19 deletion
+38
-19
cmake/mind_expression.cmake
cmake/mind_expression.cmake
+4
-3
cmake/package.cmake
cmake/package.cmake
+20
-5
mindspore/ccsrc/CMakeLists.txt
mindspore/ccsrc/CMakeLists.txt
+1
-1
mindspore/ccsrc/runtime/device/CMakeLists.txt
mindspore/ccsrc/runtime/device/CMakeLists.txt
+13
-10
未找到文件。
cmake/mind_expression.cmake
浏览文件 @
7bb4452b
...
...
@@ -38,11 +38,12 @@ endif()
find_package
(
Python3
)
include_directories
(
${
Python3_INCLUDE_DIRS
}
)
include_directories
(
${
CMAKE_SOURCE_DIR
}
/third_party
)
if
(
ENABLE_MPI
)
include
(
${
CMAKE_SOURCE_DIR
}
/cmake/external_libs/ompi.cmake
)
endif
()
if
(
ENABLE_CPU
)
include
(
${
CMAKE_SOURCE_DIR
}
/cmake/external_libs/mkl_dnn.cmake
)
if
(
ENABLE_MPI
)
include
(
${
CMAKE_SOURCE_DIR
}
/cmake/external_libs/ompi.cmake
)
endif
()
endif
()
if
(
ENABLE_GPU
)
...
...
cmake/package.cmake
浏览文件 @
7bb4452b
...
...
@@ -132,24 +132,39 @@ if (ENABLE_CPU)
endif
()
if
(
ENABLE_MPI
)
install
(
TARGETS _ms_mpi
DESTINATION
${
INSTALL_BASE_DIR
}
COMPONENT mindspore
if
(
ENABLE_GPU
)
install
(
TARGETS _ms_mpi
DESTINATION
${
INSTALL_BASE_DIR
}
COMPONENT mindspore
)
endif
()
if
(
ENABLE_CPU
)
install
(
TARGETS mpi_adapter
DESTINATION
${
INSTALL_LIB_DIR
}
COMPONENT mindspore
)
endif
()
file
(
GLOB_RECURSE MPI_LIB_LIST
${
ompi_LIBPATH
}
/libmpi
${
CMAKE_SHARED_LIBRARY_SUFFIX
}
*
${
ompi_LIBPATH
}
/libopen*
${
CMAKE_SHARED_LIBRARY_SUFFIX
}
*
)
install
(
TARGETS mpi_adapter
FILES
${
MPI_LIB_LIST
}
DESTINATION
${
INSTALL_LIB_DIR
}
COMPONENT mindspore
)
endif
()
if
(
ENABLE_GPU
)
if
(
ENABLE_MPI
)
install
(
TARGETS gpu_collective
DESTINATION
${
INSTALL_LIB_DIR
}
COMPONENT mindspore
)
endif
()
install
(
TARGETS gpu_queue
DESTINATION
${
INSTALL_LIB_DIR
}
...
...
mindspore/ccsrc/CMakeLists.txt
浏览文件 @
7bb4452b
...
...
@@ -162,7 +162,7 @@ if (ENABLE_DEBUGGER)
endif
()
target_link_libraries
(
mindspore proto_input
)
if
(
ENABLE_MPI
)
if
(
ENABLE_MPI
AND ENABLE_CPU
)
target_link_libraries
(
mindspore securec mindspore::flatbuffers mpi_adapter
)
else
()
target_link_libraries
(
mindspore securec mindspore::flatbuffers
)
...
...
mindspore/ccsrc/runtime/device/CMakeLists.txt
浏览文件 @
7bb4452b
...
...
@@ -18,17 +18,20 @@ if (ENABLE_CPU)
endif
()
if
(
ENABLE_MPI
)
# _ms_mpi
file
(
GLOB_RECURSE MPI_SRC_LIST
"cpu/mpi/mpi_adapter.cc"
)
set_property
(
SOURCE
${
MPI_SRC_LIST
}
PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE
)
add_library
(
mpi_adapter SHARED
${
MPI_SRC_LIST
}
)
target_link_libraries
(
mpi_adapter PRIVATE mindspore::ompi
)
if
(
ENABLE_CPU
)
file
(
GLOB_RECURSE MPI_SRC_LIST
"cpu/mpi/mpi_adapter.cc"
)
set_property
(
SOURCE
${
MPI_SRC_LIST
}
PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE
)
add_library
(
mpi_adapter SHARED
${
MPI_SRC_LIST
}
)
target_link_libraries
(
mpi_adapter PRIVATE mindspore::ompi
)
endif
()
set_property
(
SOURCE
"gpu/mpi/mpi_initializer.cc"
PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE
)
pybind11_add_module
(
_ms_mpi
"gpu/mpi/mpi_initializer.cc"
)
target_link_libraries
(
_ms_mpi PRIVATE mindspore::pybind11_module mindspore::ompi
)
if
(
ENABLE_GPU
)
set_property
(
SOURCE
"gpu/mpi/mpi_initializer.cc"
PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE
)
pybind11_add_module
(
_ms_mpi
"gpu/mpi/mpi_initializer.cc"
)
target_link_libraries
(
_ms_mpi PRIVATE mindspore::pybind11_module mindspore::ompi
)
endif
()
endif
()
# gpu
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录