Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
s920243400
PaddleDetection
提交
06936a2f
P
PaddleDetection
项目概览
s920243400
/
PaddleDetection
与 Fork 源项目一致
Fork自
PaddlePaddle / PaddleDetection
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleDetection
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
06936a2f
编写于
12月 18, 2018
作者:
Y
Yancey1989
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix 1gpu test=develop
上级
d3a4da5c
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
4 addition
and
3 deletion
+4
-3
paddle/fluid/framework/details/all_reduce_op_handle.cc
paddle/fluid/framework/details/all_reduce_op_handle.cc
+2
-1
paddle/fluid/framework/details/parallel_ssa_graph_executor.cc
...le/fluid/framework/details/parallel_ssa_graph_executor.cc
+1
-1
paddle/fluid/framework/parallel_executor.cc
paddle/fluid/framework/parallel_executor.cc
+1
-1
未找到文件。
paddle/fluid/framework/details/all_reduce_op_handle.cc
浏览文件 @
06936a2f
...
@@ -51,7 +51,8 @@ void AllReduceOpHandle::RunImpl() {
...
@@ -51,7 +51,8 @@ void AllReduceOpHandle::RunImpl() {
// FIXME(typhoonzero): If scope0(global scope) have NCCL_ID_VAR,
// FIXME(typhoonzero): If scope0(global scope) have NCCL_ID_VAR,
// this is a distributed or inter-process call, find a better way.
// this is a distributed or inter-process call, find a better way.
#ifdef PADDLE_WITH_CUDA
#ifdef PADDLE_WITH_CUDA
// Find NCCL ID from the global scope.
// All-reduce op_handle can run on the sub-scope, find the nccl id from
// the global scope.
if
(
NoDummyInputSize
()
==
1
&&
if
(
NoDummyInputSize
()
==
1
&&
local_scopes_
[
0
]
->
FindVar
(
NCCL_ID_VARNAME
)
==
nullptr
)
{
local_scopes_
[
0
]
->
FindVar
(
NCCL_ID_VARNAME
)
==
nullptr
)
{
#else
#else
...
...
paddle/fluid/framework/details/parallel_ssa_graph_executor.cc
浏览文件 @
06936a2f
...
@@ -59,7 +59,7 @@ FeedFetchList ParallelSSAGraphExecutor::Run(
...
@@ -59,7 +59,7 @@ FeedFetchList ParallelSSAGraphExecutor::Run(
if
(
pool_
)
{
if
(
pool_
)
{
run_futures
.
emplace_back
(
pool_
->
enqueue
(
std
::
move
(
call
)));
run_futures
.
emplace_back
(
pool_
->
enqueue
(
std
::
move
(
call
)));
}
else
{
}
else
{
call
(
);
fetch_datas
.
emplace_back
(
std
::
move
(
call
())
);
}
}
}
}
...
...
paddle/fluid/framework/parallel_executor.cc
浏览文件 @
06936a2f
...
@@ -231,7 +231,7 @@ ParallelExecutor::ParallelExecutor(
...
@@ -231,7 +231,7 @@ ParallelExecutor::ParallelExecutor(
#if defined(PADDLE_WITH_CUDA) && !defined(_WIN32)
#if defined(PADDLE_WITH_CUDA) && !defined(_WIN32)
auto
*
nccl_id_var
=
scope
->
FindVar
(
NCCL_ID_VARNAME
);
auto
*
nccl_id_var
=
scope
->
FindVar
(
NCCL_ID_VARNAME
);
ncclUniqueId
*
nccl_id
=
nullptr
;
ncclUniqueId
*
nccl_id
=
nullptr
;
if
(
build_strategy
.
enable_parallel_graph_
)
{
if
(
build_strategy
.
enable_parallel_graph_
&&
places
.
size
()
>
1
)
{
// parallel graph mode should initialize nccl by ncclCommInitRank since
// parallel graph mode should initialize nccl by ncclCommInitRank since
// it call nccl operator per device per thread.
// it call nccl operator per device per thread.
if
(
nccl_id_var
==
nullptr
)
{
if
(
nccl_id_var
==
nullptr
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录