Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
288ffdd7
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2299
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
288ffdd7
编写于
10月 25, 2017
作者:
Y
Yiqun Liu
提交者:
GitHub
10月 25, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Correct the install command, static library name and typo in nccl.cmake. (#5048)
上级
0678073c
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
25 addition
and
26 deletion
+25
-26
cmake/external/nccl.cmake
cmake/external/nccl.cmake
+25
-26
未找到文件。
cmake/external/nccl.cmake
浏览文件 @
288ffdd7
INCLUDE
(
ExternalProject
)
include
(
ExternalProject
)
SET
(
NCCL_SOURCE_DIR
${
THIRD_PARTY_PATH
}
/nccl
)
set
(
NCCL_SOURCE_DIR
${
THIRD_PARTY_PATH
}
/nccl
)
INCLUDE_DIRECTORIES
(
${
NCCL_SOURCE_DIR
}
/src/extern_nccl/src
)
include_directories
(
${
NCCL_SOURCE_DIR
}
/src/extern_nccl/src
)
if
(
WITH_DSO
)
if
(
WITH_DSO
)
# If we use DSO, we do not build nccl, just download the dependencies
# If we use DSO, we do not build nccl, just download the dependencies
...
@@ -12,9 +11,11 @@ if(WITH_DSO)
...
@@ -12,9 +11,11 @@ if(WITH_DSO)
set
(
NCCL_INSTALL_DIR
""
)
set
(
NCCL_INSTALL_DIR
""
)
else
()
else
()
# otherwise, we build nccl and link it.
# otherwise, we build nccl and link it.
set
(
NCCL_INSTALL_DIR
${
THIRD_PARTY_PATH
}
/install/nccl
)
# Note: cuda 8.0 is needed to make nccl
# When cuda is not installed on the system directory, need to set CUDA_HOME to your cuda root
set
(
NCCL_BUILD_COMMAND
"make -j 8"
)
set
(
NCCL_BUILD_COMMAND
"make -j 8"
)
set
(
NCCL_INSTALL_COMMAND
"make install"
)
set
(
NCCL_INSTALL_COMMAND
"make install PREFIX=
${
NCCL_INSTALL_DIR
}
"
)
SET
(
NCCL_INSTALL_DIR
${
THIRD_PARTY_PATH
}
/install/nccl
)
endif
()
endif
()
ExternalProject_Add
(
ExternalProject_Add
(
...
@@ -31,20 +32,18 @@ ExternalProject_Add(
...
@@ -31,20 +32,18 @@ ExternalProject_Add(
TEST_COMMAND
""
TEST_COMMAND
""
)
)
if
(
WITH_DSO
)
if
(
WITH_DSO
)
if
(
${
CMAKE_VERSION
}
VERSION_LESS
"3.3.0"
)
if
(
${
CMAKE_VERSION
}
VERSION_LESS
"3.3.0"
)
set
(
dummyfile
${
CMAKE_CURRENT_BINARY_DIR
}
/lib_
any
_dummy.c
)
set
(
dummyfile
${
CMAKE_CURRENT_BINARY_DIR
}
/lib_
nccl
_dummy.c
)
file
(
WRITE
${
dummyfile
}
"const char * dummy_
any
=
\"
${
dummyfile
}
\"
;"
)
file
(
WRITE
${
dummyfile
}
"const char * dummy_
nccl
=
\"
${
dummyfile
}
\"
;"
)
add_library
(
nccl STATIC
${
dummyfile
}
)
add_library
(
nccl STATIC
${
dummyfile
}
)
else
()
else
()
add_library
(
nccl INTERFACE
)
add_library
(
nccl INTERFACE
)
endif
()
endif
()
else
()
else
()
ADD_LIBRARY
(
nccl STATIC IMPORTED GLOBAL
)
add_library
(
nccl STATIC IMPORTED GLOBAL
)
SET_PROPERTY
(
TARGET nccl PROPERTY IMPORTED_LOCATION
set_property
(
TARGET nccl PROPERTY IMPORTED_LOCATION
${
NCCL_INSTALL_DIR
}
/lib/libnccl
.a
)
${
NCCL_INSTALL_DIR
}
/lib/libnccl_static
.a
)
endif
()
endif
()
add_dependencies
(
nccl extern_nccl
)
add_dependencies
(
nccl extern_nccl
)
LIST
(
APPEND external_project_dependencies nccl
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录