Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
403d58bb
P
Paddle
项目概览
PaddlePaddle
/
Paddle
1 年多 前同步成功
通知
2305
Star
20932
Fork
5423
代码
文件
提交
分支
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看板
未验证
提交
403d58bb
编写于
11月 21, 2022
作者:
L
LiYuRio
提交者:
GitHub
11月 21, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
return pointer rather than reference (#48152)
上级
02c51f3b
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
36 addition
and
37 deletion
+36
-37
paddle/fluid/distributed/collective/ProcessGroup.h
paddle/fluid/distributed/collective/ProcessGroup.h
+1
-1
paddle/fluid/distributed/collective/ProcessGroupBKCL.cc
paddle/fluid/distributed/collective/ProcessGroupBKCL.cc
+2
-2
paddle/fluid/distributed/collective/ProcessGroupBKCL.h
paddle/fluid/distributed/collective/ProcessGroupBKCL.h
+3
-3
paddle/fluid/distributed/collective/ProcessGroupCustom.cc
paddle/fluid/distributed/collective/ProcessGroupCustom.cc
+2
-2
paddle/fluid/distributed/collective/ProcessGroupCustom.h
paddle/fluid/distributed/collective/ProcessGroupCustom.h
+1
-1
paddle/fluid/distributed/collective/ProcessGroupGloo.h
paddle/fluid/distributed/collective/ProcessGroupGloo.h
+2
-3
paddle/fluid/distributed/collective/ProcessGroupNCCL.cc
paddle/fluid/distributed/collective/ProcessGroupNCCL.cc
+4
-4
paddle/fluid/distributed/collective/ProcessGroupNCCL.h
paddle/fluid/distributed/collective/ProcessGroupNCCL.h
+4
-4
paddle/fluid/distributed/collective/ProcessGroupStream.cc
paddle/fluid/distributed/collective/ProcessGroupStream.cc
+1
-1
paddle/fluid/distributed/collective/ProcessGroupStream.h
paddle/fluid/distributed/collective/ProcessGroupStream.h
+3
-2
paddle/fluid/distributed/collective/reducer.cc
paddle/fluid/distributed/collective/reducer.cc
+3
-3
paddle/fluid/pybind/distributed_py.cc
paddle/fluid/pybind/distributed_py.cc
+10
-11
未找到文件。
paddle/fluid/distributed/collective/ProcessGroup.h
浏览文件 @
403d58bb
...
...
@@ -96,7 +96,7 @@ class ProcessGroup {
virtual
std
::
string
GetBackendName
()
const
=
0
;
virtual
const
phi
::
DeviceContext
&
GetDeviceContext
(
const
Place
&
place
)
const
{
virtual
phi
::
DeviceContext
*
GetDeviceContext
(
const
Place
&
place
)
const
{
PADDLE_THROW
(
platform
::
errors
::
Unimplemented
(
"ProcessGroup%s does not support get device_context."
,
GetBackendName
()));
...
...
paddle/fluid/distributed/collective/ProcessGroupBKCL.cc
浏览文件 @
403d58bb
...
...
@@ -282,12 +282,12 @@ std::shared_ptr<ProcessGroup::Task> ProcessGroupBKCL::Barrier(
return
task
;
}
const
phi
::
DeviceContext
&
ProcessGroupBKCL
::
GetDeviceContext
(
phi
::
DeviceContext
*
ProcessGroupBKCL
::
GetDeviceContext
(
const
Place
&
place
)
const
{
return
GetDeviceContext
(
place
,
/*use_calc_stream*/
false
);
}
const
phi
::
DeviceContext
&
ProcessGroupBKCL
::
GetDeviceContext
(
phi
::
DeviceContext
*
ProcessGroupBKCL
::
GetDeviceContext
(
const
Place
&
place
,
bool
use_calc_stream
)
const
{
const
std
::
string
&
key
=
GetKeyFromPlace
(
place
);
if
(
use_calc_stream
)
{
...
...
paddle/fluid/distributed/collective/ProcessGroupBKCL.h
浏览文件 @
403d58bb
...
...
@@ -77,10 +77,10 @@ class ProcessGroupBKCL : public ProcessGroupStream {
return
std
::
string
(
BKCL_BACKEND_NAME
);
}
const
phi
::
DeviceContext
&
GetDeviceContext
(
const
Place
&
place
)
const
override
;
phi
::
DeviceContext
*
GetDeviceContext
(
const
Place
&
place
)
const
override
;
const
phi
::
DeviceContext
&
GetDeviceContext
(
const
Place
&
place
,
bool
use_calc_stream
)
const
override
;
phi
::
DeviceContext
*
GetDeviceContext
(
const
Place
&
place
,
bool
use_calc_stream
)
const
override
;
std
::
shared_ptr
<
ProcessGroup
::
Task
>
AllReduce
(
phi
::
DenseTensor
*
out_tensor
,
...
...
paddle/fluid/distributed/collective/ProcessGroupCustom.cc
浏览文件 @
403d58bb
...
...
@@ -299,7 +299,7 @@ std::shared_ptr<ProcessGroup::Task> ProcessGroupCustom::Barrier(
return
task
;
}
const
phi
::
DeviceContext
&
ProcessGroupCustom
::
GetDeviceContext
(
phi
::
DeviceContext
*
ProcessGroupCustom
::
GetDeviceContext
(
const
Place
&
place
)
const
{
const
std
::
string
key
=
GetKeyFromPlace
(
place
);
const
auto
&
iter
=
places_to_ctx_
.
find
(
key
);
...
...
@@ -308,7 +308,7 @@ const phi::DeviceContext& ProcessGroupCustom::GetDeviceContext(
places_to_ctx_
.
end
(),
platform
::
errors
::
NotFound
(
"Cannot find the device context in this process group."
));
return
*
iter
->
second
[
0
]
;
return
iter
->
second
[
0
].
get
()
;
}
phi
::
ccl
::
CCLComm
ProcessGroupCustom
::
CustomCCLComm
(
const
Place
&
place
)
const
{
...
...
paddle/fluid/distributed/collective/ProcessGroupCustom.h
浏览文件 @
403d58bb
...
...
@@ -93,7 +93,7 @@ class ProcessGroupCustom : public ProcessGroup {
std
::
shared_ptr
<
ProcessGroup
::
Task
>
Barrier
(
const
BarrierOptions
&
=
BarrierOptions
())
override
;
const
phi
::
DeviceContext
&
GetDeviceContext
(
const
Place
&
place
)
const
override
;
phi
::
DeviceContext
*
GetDeviceContext
(
const
Place
&
place
)
const
override
;
phi
::
ccl
::
CCLComm
CustomCCLComm
(
const
Place
&
place
)
const
;
...
...
paddle/fluid/distributed/collective/ProcessGroupGloo.h
浏览文件 @
403d58bb
...
...
@@ -180,9 +180,8 @@ class ProcessGroupGloo : public ProcessGroup {
std
::
string
GetBackendName
()
const
override
{
return
"GLOO"
;
}
const
phi
::
DeviceContext
&
GetDeviceContext
(
const
Place
&
place
)
const
override
{
return
*
platform
::
DeviceContextPool
::
Instance
().
Get
(
place
);
phi
::
DeviceContext
*
GetDeviceContext
(
const
Place
&
place
)
const
override
{
return
platform
::
DeviceContextPool
::
Instance
().
Get
(
place
);
}
// Helper functions for Gloo.
...
...
paddle/fluid/distributed/collective/ProcessGroupNCCL.cc
浏览文件 @
403d58bb
...
...
@@ -94,17 +94,17 @@ void ProcessGroupNCCL::GroupEnd() {
NCCL_CHECK
(
platform
::
dynload
::
ncclGroupEnd
());
}
const
phi
::
DeviceContext
&
ProcessGroupNCCL
::
GetDeviceContext
(
phi
::
DeviceContext
*
ProcessGroupNCCL
::
GetDeviceContext
(
const
Place
&
place
)
const
{
return
GetDeviceContext
(
place
,
/*use_calc_stream*/
false
);
}
const
phi
::
DeviceContext
&
ProcessGroupNCCL
::
GetDeviceContext
(
phi
::
DeviceContext
*
ProcessGroupNCCL
::
GetDeviceContext
(
const
Place
&
place
,
bool
use_calc_stream
)
const
{
const
std
::
string
&
key
=
GetKeyFromPlace
(
place
);
if
(
use_calc_stream
)
{
const
auto
&
iter
=
place_to_calc_ctx_
.
find
(
key
);
return
*
iter
->
second
;
return
iter
->
second
;
}
else
{
const
auto
&
iter
=
place_to_comm_ctx_
.
find
(
key
);
PADDLE_ENFORCE_NE
(
...
...
@@ -112,7 +112,7 @@ const phi::DeviceContext& ProcessGroupNCCL::GetDeviceContext(
place_to_comm_ctx_
.
end
(),
platform
::
errors
::
NotFound
(
"Cannot find the device context in this process group."
));
return
*
iter
->
second
;
return
iter
->
second
.
get
()
;
}
}
...
...
paddle/fluid/distributed/collective/ProcessGroupNCCL.h
浏览文件 @
403d58bb
...
...
@@ -34,7 +34,7 @@
#ifdef PADDLE_WITH_RCCL
#include "paddle/fluid/platform/dynload/rccl.h"
#el
se
#el
if PADDLE_WITH_NCCL
#include "paddle/fluid/platform/dynload/nccl.h"
#endif
...
...
@@ -83,10 +83,10 @@ class ProcessGroupNCCL final : public ProcessGroupStream {
std
::
string
GetBackendName
()
const
override
{
return
"NCCL"
;
}
const
phi
::
DeviceContext
&
GetDeviceContext
(
const
Place
&
place
)
const
override
;
phi
::
DeviceContext
*
GetDeviceContext
(
const
Place
&
place
,
bool
use_calc_stream
)
const
override
;
const
phi
::
DeviceContext
&
GetDeviceContext
(
const
Place
&
place
,
bool
use_calc_stream
)
const
override
;
phi
::
DeviceContext
*
GetDeviceContext
(
const
Place
&
place
)
const
override
;
std
::
shared_ptr
<
ProcessGroup
::
Task
>
AllGather
(
phi
::
DenseTensor
*
out_tensor
,
...
...
paddle/fluid/distributed/collective/ProcessGroupStream.cc
浏览文件 @
403d58bb
...
...
@@ -20,7 +20,7 @@ namespace distributed {
ProcessGroupStream
::
ProcessGroupStream
(
int
rank
,
int
size
,
int
gid
)
:
ProcessGroup
(
rank
,
size
,
gid
)
{}
const
phi
::
DeviceContext
&
ProcessGroupStream
::
GetDeviceContext
(
phi
::
DeviceContext
*
ProcessGroupStream
::
GetDeviceContext
(
const
Place
&
place
,
bool
use_calc_stream
)
const
{
PADDLE_THROW
(
platform
::
errors
::
Unimplemented
(
"ProcessGroup%s does not support get device_context."
,
GetBackendName
()));
...
...
paddle/fluid/distributed/collective/ProcessGroupStream.h
浏览文件 @
403d58bb
...
...
@@ -57,9 +57,10 @@ class ProcessGroupStream : public ProcessGroup {
public:
ProcessGroupStream
(
int
rank
,
int
size
,
int
gid
);
virtual
~
ProcessGroupStream
()
=
default
;
using
ProcessGroup
::
GetDeviceContext
;
virtual
const
phi
::
DeviceContext
&
GetDeviceContext
(
const
Place
&
place
,
bool
use_calc_stream
)
const
;
virtual
phi
::
DeviceContext
*
GetDeviceContext
(
const
Place
&
place
,
bool
use_calc_stream
)
const
;
std
::
shared_ptr
<
ProcessGroup
::
Task
>
AllGather
(
phi
::
DenseTensor
*
out_tensor
,
...
...
paddle/fluid/distributed/collective/reducer.cc
浏览文件 @
403d58bb
...
...
@@ -1053,9 +1053,9 @@ void EagerReducer::FusedAllReduceSchedule(EagerGroup *group,
}
group
->
task
=
process_group_
->
AllReduce
(
in_out
,
in_out
,
opts
);
const
auto
&
context
=
process_group_
->
GetDeviceContext
(
inner_place_
);
group
->
SplitTensorsDev
(
context
);
group
->
task
->
UpdateWaitChain
(
context
);
auto
*
context
=
process_group_
->
GetDeviceContext
(
inner_place_
);
group
->
SplitTensorsDev
(
*
context
);
group
->
task
->
UpdateWaitChain
(
*
context
);
// split in FinalizeBackward()
}
...
...
paddle/fluid/pybind/distributed_py.cc
浏览文件 @
403d58bb
...
...
@@ -271,14 +271,14 @@ void BindDistributed(py::module *m) {
in_tensor
.
impl
());
auto
in_dense
=
*
p_in_tensor
;
const
auto
&
dev_ctx
=
self
.
GetDeviceContext
(
in_tensor
.
place
());
auto
*
dev_ctx
=
self
.
GetDeviceContext
(
in_tensor
.
place
());
auto
task
=
self
.
AllGather
(
out_dense
,
in_dense
,
/*offset*/
0
,
/*numel*/
-
1
,
sync_op
);
SplitTensor
(
dev_ctx
,
*
out_dense
,
&
out_tensor_list
);
task
->
UpdateWaitChain
(
dev_ctx
);
SplitTensor
(
*
dev_ctx
,
*
out_dense
,
&
out_tensor_list
);
task
->
UpdateWaitChain
(
*
dev_ctx
);
return
task
;
},
py
::
arg
(
"out"
),
...
...
@@ -334,7 +334,7 @@ void BindDistributed(py::module *m) {
auto
in_dense
=
*
p_in_tensor
;
// in_tensor_list should not be empty
const
auto
&
dev_ctx
=
auto
*
dev_ctx
=
self
.
GetDeviceContext
(
in_tensor_list
.
back
().
place
());
int
world_size
=
self
.
GetSize
();
auto
task
=
...
...
@@ -343,8 +343,8 @@ void BindDistributed(py::module *m) {
GetDefaultSplitSizes
(
*
out_dense
,
world_size
),
GetDefaultSplitSizes
(
in_dense
,
world_size
),
sync_op
);
SplitTensor
(
dev_ctx
,
*
out_dense
,
&
out_tensor_list
);
task
->
UpdateWaitChain
(
dev_ctx
);
SplitTensor
(
*
dev_ctx
,
*
out_dense
,
&
out_tensor_list
);
task
->
UpdateWaitChain
(
*
dev_ctx
);
return
task
;
},
py
::
arg
(
"out"
),
...
...
@@ -770,15 +770,14 @@ void BindDistributed(py::module *m) {
in_tensor
.
impl
());
auto
in_dense
=
*
p_in_tensor
;
const
auto
&
dev_ctx
=
self
.
GetDeviceContext
(
in_tensor
.
place
(),
true
);
auto
*
dev_ctx
=
self
.
GetDeviceContext
(
in_tensor
.
place
(),
true
);
auto
task
=
self
.
AllGather
(
out_dense
,
in_dense
,
/*offset*/
0
,
/*numel*/
-
1
,
/*sync_op*/
true
,
/*use_calc_stream*/
true
);
SplitTensor
(
dev_ctx
,
*
out_dense
,
&
out_tensor_list
);
SplitTensor
(
*
dev_ctx
,
*
out_dense
,
&
out_tensor_list
);
return
task
;
},
py
::
arg
(
"out"
),
...
...
@@ -886,7 +885,7 @@ void BindDistributed(py::module *m) {
auto
in_dense
=
*
p_in_tensor
;
// in_tensor_list should not be empty
const
auto
&
dev_ctx
=
self
.
GetDeviceContext
(
auto
*
dev_ctx
=
self
.
GetDeviceContext
(
in_tensor_list
.
back
().
place
(),
/*use_calc_stream*/
true
);
int
world_size
=
self
.
GetSize
();
auto
task
=
...
...
@@ -896,7 +895,7 @@ void BindDistributed(py::module *m) {
GetDefaultSplitSizes
(
in_dense
,
world_size
),
/*sync_op*/
true
,
/*use_calc_stream*/
true
);
SplitTensor
(
dev_ctx
,
*
out_dense
,
&
out_tensor_list
);
SplitTensor
(
*
dev_ctx
,
*
out_dense
,
&
out_tensor_list
);
return
task
;
},
py
::
arg
(
"out"
),
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录