Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleDetection
提交
093d227a
P
PaddleDetection
项目概览
PaddlePaddle
/
PaddleDetection
大约 1 年 前同步成功
通知
694
Star
11112
Fork
2696
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
184
列表
看板
标记
里程碑
合并请求
40
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleDetection
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
184
Issue
184
列表
看板
标记
里程碑
合并请求
40
合并请求
40
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
093d227a
编写于
4月 16, 2018
作者:
Y
Yu Yang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use mutex to stablize ncclCtxMap
上级
494c262a
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
16 addition
and
34 deletion
+16
-34
paddle/fluid/platform/nccl_helper.h
paddle/fluid/platform/nccl_helper.h
+16
-34
未找到文件。
paddle/fluid/platform/nccl_helper.h
浏览文件 @
093d227a
...
@@ -39,20 +39,19 @@ inline ncclDataType_t ToNCCLDataType(std::type_index type) {
...
@@ -39,20 +39,19 @@ inline ncclDataType_t ToNCCLDataType(std::type_index type) {
class
NCCLGroupGuard
{
class
NCCLGroupGuard
{
public:
public:
static
std
::
mutex
&
NCCLMutex
()
{
static
std
::
mutex
mtx
;
return
mtx
;
}
inline
NCCLGroupGuard
()
{
inline
NCCLGroupGuard
()
{
m
utex
().
lock
();
NCCLM
utex
().
lock
();
PADDLE_ENFORCE
(
dynload
::
ncclGroupStart
());
PADDLE_ENFORCE
(
dynload
::
ncclGroupStart
());
}
}
inline
~
NCCLGroupGuard
()
{
inline
~
NCCLGroupGuard
()
{
PADDLE_ENFORCE
(
dynload
::
ncclGroupEnd
());
PADDLE_ENFORCE
(
dynload
::
ncclGroupEnd
());
mutex
().
unlock
();
NCCLMutex
().
unlock
();
}
private:
static
std
::
mutex
&
mutex
()
{
static
std
::
mutex
mtx
;
return
mtx
;
}
}
};
};
...
@@ -68,26 +67,6 @@ struct NCCLContext {
...
@@ -68,26 +67,6 @@ struct NCCLContext {
int
device_id
()
const
{
int
device_id
()
const
{
return
boost
::
get
<
platform
::
CUDAPlace
>
(
ctx_
->
GetPlace
()).
device
;
return
boost
::
get
<
platform
::
CUDAPlace
>
(
ctx_
->
GetPlace
()).
device
;
}
}
static
void
InitNCCLContext
(
std
::
unordered_map
<
int
,
NCCLContext
>
*
contexts
,
const
std
::
vector
<
platform
::
Place
>
&
places
)
{
std
::
vector
<
ncclComm_t
>
comms
;
std
::
vector
<
int
>
devs
;
comms
.
resize
(
contexts
->
size
());
devs
.
reserve
(
contexts
->
size
());
for
(
auto
&
p
:
places
)
{
devs
.
push_back
(
boost
::
get
<
platform
::
CUDAPlace
>
(
p
).
device
);
}
PADDLE_ENFORCE
(
platform
::
dynload
::
ncclCommInitAll
(
&
comms
[
0
],
static_cast
<
int
>
(
contexts
->
size
()),
&
devs
[
0
]));
int
i
=
0
;
for
(
auto
&
dev_id
:
devs
)
{
contexts
->
at
(
dev_id
).
comm_
=
comms
[
i
++
];
}
}
};
};
struct
NCCLContextMap
{
struct
NCCLContextMap
{
...
@@ -107,12 +86,12 @@ struct NCCLContextMap {
...
@@ -107,12 +86,12 @@ struct NCCLContextMap {
"NCCL Context Map does not support contain two or more same device"
);
"NCCL Context Map does not support contain two or more same device"
);
if
(
places
.
size
()
>
1
)
{
if
(
places
.
size
()
>
1
)
{
std
::
vector
<
ncclComm_t
>
comms
;
std
::
unique_ptr
<
ncclComm_t
[]
>
comms
(
new
ncclComm_t
[
order_
.
size
()])
;
comms
.
resize
(
order_
.
size
());
{
std
::
lock_guard
<
std
::
mutex
>
guard
(
NCCLGroupGuard
::
NCCLMutex
());
PADDLE_ENFORCE
(
platform
::
dynload
::
ncclCommInitAll
(
PADDLE_ENFORCE
(
platform
::
dynload
::
ncclCommInitAll
(
&
comms
[
0
],
static_cast
<
int
>
(
order_
.
size
()),
&
order_
[
0
]
));
comms
.
get
(),
static_cast
<
int
>
(
order_
.
size
()),
order_
.
data
()
));
}
int
i
=
0
;
int
i
=
0
;
for
(
auto
&
dev_id
:
order_
)
{
for
(
auto
&
dev_id
:
order_
)
{
contexts_
.
at
(
dev_id
).
comm_
=
comms
[
i
++
];
contexts_
.
at
(
dev_id
).
comm_
=
comms
[
i
++
];
...
@@ -120,6 +99,9 @@ struct NCCLContextMap {
...
@@ -120,6 +99,9 @@ struct NCCLContextMap {
}
}
}
}
NCCLContextMap
(
const
NCCLContextMap
&
other
)
=
delete
;
NCCLContextMap
&
operator
=
(
const
NCCLContextMap
&
other
)
=
delete
;
CUDADeviceContext
*
DevCtx
(
int
dev_id
)
const
{
return
at
(
dev_id
).
ctx_
.
get
();
}
CUDADeviceContext
*
DevCtx
(
int
dev_id
)
const
{
return
at
(
dev_id
).
ctx_
.
get
();
}
CUDADeviceContext
*
DevCtx
(
platform
::
Place
p
)
const
{
CUDADeviceContext
*
DevCtx
(
platform
::
Place
p
)
const
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录