Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
a74208c1
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2298
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看板
未验证
提交
a74208c1
编写于
7月 20, 2021
作者:
W
WangXi
提交者:
GitHub
7月 20, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[hybrid parallel] Optimize pipeline memory (#34230)
上级
056b8741
变更
7
显示空白变更内容
内联
并排
Showing
7 changed file
with
138 addition
and
67 deletion
+138
-67
paddle/fluid/framework/device_worker.h
paddle/fluid/framework/device_worker.h
+7
-2
paddle/fluid/framework/executor_gc_helper.cc
paddle/fluid/framework/executor_gc_helper.cc
+17
-12
paddle/fluid/framework/executor_gc_helper.h
paddle/fluid/framework/executor_gc_helper.h
+5
-0
paddle/fluid/framework/pipeline_trainer.cc
paddle/fluid/framework/pipeline_trainer.cc
+1
-1
paddle/fluid/framework/section_worker.cc
paddle/fluid/framework/section_worker.cc
+106
-51
python/paddle/fluid/optimizer.py
python/paddle/fluid/optimizer.py
+1
-0
python/paddle/fluid/tests/unittests/test_dist_base.py
python/paddle/fluid/tests/unittests/test_dist_base.py
+1
-1
未找到文件。
paddle/fluid/framework/device_worker.h
浏览文件 @
a74208c1
...
@@ -548,6 +548,7 @@ class SectionWorker : public DeviceWorker {
...
@@ -548,6 +548,7 @@ class SectionWorker : public DeviceWorker {
~
SectionWorker
()
override
{}
~
SectionWorker
()
override
{}
void
Initialize
(
const
TrainerDesc
&
desc
)
override
;
void
Initialize
(
const
TrainerDesc
&
desc
)
override
;
void
PrepareUnusedVar
();
void
BindingDataFeedMemory
()
override
{}
void
BindingDataFeedMemory
()
override
{}
void
CreateDeviceResource
(
const
ProgramDesc
&
main_prog
)
override
{};
void
CreateDeviceResource
(
const
ProgramDesc
&
main_prog
)
override
{};
...
@@ -581,7 +582,8 @@ class SectionWorker : public DeviceWorker {
...
@@ -581,7 +582,8 @@ class SectionWorker : public DeviceWorker {
void
RunUpdate
(
void
RunUpdate
(
std
::
unique_ptr
<
GarbageCollector
>&
,
std
::
unique_ptr
<
GarbageCollector
>&
,
std
::
unordered_map
<
const
OperatorBase
*
,
std
::
vector
<
std
::
string
>>&
);
std
::
unordered_map
<
const
OperatorBase
*
,
std
::
vector
<
std
::
string
>>&
);
void
PrepareUnusedVar
();
void
RunFThenB
(
std
::
unique_ptr
<
GarbageCollector
>&
);
void
Run1F1B
(
std
::
unique_ptr
<
GarbageCollector
>&
);
protected:
protected:
int
section_id_
;
int
section_id_
;
...
@@ -591,9 +593,12 @@ class SectionWorker : public DeviceWorker {
...
@@ -591,9 +593,12 @@ class SectionWorker : public DeviceWorker {
int
pipeline_stage_
;
int
pipeline_stage_
;
int
schedule_mode_
;
// 0 for F-then-B and 1 for 1F1B
int
schedule_mode_
;
// 0 for F-then-B and 1 for 1F1B
std
::
vector
<
Scope
*>
microbatch_scopes_
;
std
::
vector
<
Scope
*>
microbatch_scopes_
;
std
::
vector
<
std
::
string
>
skip_vars_
;
const
Scope
*
minibatch_scope_
;
const
Scope
*
minibatch_scope_
;
// skip&backward vars are only used in 1F1B
std
::
vector
<
std
::
string
>
skip_vars_
;
std
::
vector
<
std
::
string
>
backward_send_vars_
;
std
::
vector
<
std
::
unique_ptr
<
OperatorBase
>>
ops_
;
std
::
vector
<
std
::
unique_ptr
<
OperatorBase
>>
ops_
;
std
::
shared_ptr
<
framework
::
ProgramDesc
>
program_
;
std
::
shared_ptr
<
framework
::
ProgramDesc
>
program_
;
std
::
unordered_map
<
const
OperatorBase
*
,
std
::
vector
<
std
::
string
>>
std
::
unordered_map
<
const
OperatorBase
*
,
std
::
vector
<
std
::
string
>>
...
...
paddle/fluid/framework/executor_gc_helper.cc
浏览文件 @
a74208c1
...
@@ -146,18 +146,9 @@ GetUnusedVars(const BlockDesc &block,
...
@@ -146,18 +146,9 @@ GetUnusedVars(const BlockDesc &block,
return
result
;
return
result
;
}
}
void
DeleteUnusedTensors
(
void
DeleteUnusedTensors
(
const
Scope
&
scope
,
const
Scope
&
scope
,
const
OperatorBase
*
op
,
const
std
::
vector
<
std
::
string
>
&
delete_vars
,
const
std
::
unordered_map
<
const
OperatorBase
*
,
std
::
vector
<
std
::
string
>>
&
delete_vars_map
,
GarbageCollector
*
gc
)
{
GarbageCollector
*
gc
)
{
auto
iter
=
delete_vars_map
.
find
(
op
);
if
(
iter
==
delete_vars_map
.
end
())
{
return
;
}
auto
&
delete_vars
=
iter
->
second
;
std
::
deque
<
std
::
shared_ptr
<
memory
::
Allocation
>>
garbages
;
std
::
deque
<
std
::
shared_ptr
<
memory
::
Allocation
>>
garbages
;
for
(
auto
&
var_name
:
delete_vars
)
{
for
(
auto
&
var_name
:
delete_vars
)
{
...
@@ -189,6 +180,20 @@ void DeleteUnusedTensors(
...
@@ -189,6 +180,20 @@ void DeleteUnusedTensors(
}
}
}
}
void
DeleteUnusedTensors
(
const
Scope
&
scope
,
const
OperatorBase
*
op
,
const
std
::
unordered_map
<
const
OperatorBase
*
,
std
::
vector
<
std
::
string
>>
&
delete_vars_map
,
GarbageCollector
*
gc
)
{
auto
iter
=
delete_vars_map
.
find
(
op
);
if
(
iter
==
delete_vars_map
.
end
())
{
return
;
}
auto
&
delete_vars
=
iter
->
second
;
DeleteUnusedTensors
(
scope
,
delete_vars
,
gc
);
}
static
std
::
vector
<
std
::
unique_ptr
<
OperatorBase
>>
CreateOpsFromBlock
(
static
std
::
vector
<
std
::
unique_ptr
<
OperatorBase
>>
CreateOpsFromBlock
(
const
BlockDesc
&
block
)
{
const
BlockDesc
&
block
)
{
std
::
vector
<
std
::
unique_ptr
<
OperatorBase
>>
ops
;
std
::
vector
<
std
::
unique_ptr
<
OperatorBase
>>
ops
;
...
...
paddle/fluid/framework/executor_gc_helper.h
浏览文件 @
a74208c1
...
@@ -36,6 +36,11 @@ GetUnusedVars(const BlockDesc &block,
...
@@ -36,6 +36,11 @@ GetUnusedVars(const BlockDesc &block,
const
std
::
vector
<
std
::
unique_ptr
<
OperatorBase
>>
&
ops
,
const
std
::
vector
<
std
::
unique_ptr
<
OperatorBase
>>
&
ops
,
const
std
::
vector
<
std
::
string
>
&
skip_vars
);
const
std
::
vector
<
std
::
string
>
&
skip_vars
);
// Collect unused tensors
void
DeleteUnusedTensors
(
const
Scope
&
scope
,
const
std
::
vector
<
std
::
string
>
&
delete_vars
,
GarbageCollector
*
gc
);
// Collect unused tensors after op runs
// Collect unused tensors after op runs
void
DeleteUnusedTensors
(
void
DeleteUnusedTensors
(
const
Scope
&
scope
,
const
OperatorBase
*
op
,
const
Scope
&
scope
,
const
OperatorBase
*
op
,
...
...
paddle/fluid/framework/pipeline_trainer.cc
浏览文件 @
a74208c1
...
@@ -45,11 +45,11 @@ void PipelineTrainer::Initialize(const TrainerDesc& trainer_desc,
...
@@ -45,11 +45,11 @@ void PipelineTrainer::Initialize(const TrainerDesc& trainer_desc,
auto
this_worker
=
auto
this_worker
=
std
::
dynamic_pointer_cast
<
paddle
::
framework
::
SectionWorker
>
(
worker_
);
std
::
dynamic_pointer_cast
<
paddle
::
framework
::
SectionWorker
>
(
worker_
);
this_worker
->
SetPlace
(
place_
);
this_worker
->
SetPlace
(
place_
);
this_worker
->
Initialize
(
trainer_desc
);
this_worker
->
SetMicrobatchNum
(
num_microbatches_
);
this_worker
->
SetMicrobatchNum
(
num_microbatches_
);
this_worker
->
SetPipelineStageNum
(
num_pipeline_stages_
);
this_worker
->
SetPipelineStageNum
(
num_pipeline_stages_
);
this_worker
->
SetPipelineStage
(
pipeline_stage_
);
this_worker
->
SetPipelineStage
(
pipeline_stage_
);
this_worker
->
SetScheduleMode
(
schedule_mode_
);
this_worker
->
SetScheduleMode
(
schedule_mode_
);
this_worker
->
Initialize
(
trainer_desc
);
}
}
void
PipelineTrainer
::
InitOtherEnv
(
const
ProgramDesc
&
main_program
)
{
void
PipelineTrainer
::
InitOtherEnv
(
const
ProgramDesc
&
main_program
)
{
...
...
paddle/fluid/framework/section_worker.cc
浏览文件 @
a74208c1
...
@@ -30,6 +30,36 @@ void SectionWorker::Initialize(const TrainerDesc &desc) {
...
@@ -30,6 +30,36 @@ void SectionWorker::Initialize(const TrainerDesc &desc) {
for
(
auto
&
op_desc
:
program_
->
Block
(
0
).
AllOps
())
{
for
(
auto
&
op_desc
:
program_
->
Block
(
0
).
AllOps
())
{
ops_
.
push_back
(
OpRegistry
::
CreateOp
(
*
op_desc
));
ops_
.
push_back
(
OpRegistry
::
CreateOp
(
*
op_desc
));
}
}
// if not 1F1B scheduler
if
(
schedule_mode_
!=
1
)
return
;
bool
is_first_stage
=
(
pipeline_stage_
==
0
);
int
BACKWARD
=
static_cast
<
int
>
(
OpRole
::
kBackward
);
for
(
auto
&
op
:
ops_
)
{
int
op_role
=
op
->
Attr
<
int
>
(
"op_role"
);
auto
op_type
=
op
->
Type
();
// pipeline backward send op
if
(
op_role
!=
BACKWARD
)
continue
;
if
(
op_type
!=
"send_v2"
&&
op_type
!=
"partial_send"
)
continue
;
auto
var_name
=
op
->
InputVars
()[
0
];
VLOG
(
3
)
<<
"Pipeline backward send var "
<<
var_name
;
PADDLE_ENFORCE_NE
(
is_first_stage
,
true
,
platform
::
errors
::
PreconditionNotMet
(
"The first pipeline stage must do not have a "
"backward send var, please check var %s"
,
var_name
));
backward_send_vars_
.
push_back
(
var_name
);
skip_vars_
.
push_back
(
var_name
);
}
}
void
SectionWorker
::
PrepareUnusedVar
()
{
VLOG
(
5
)
<<
"begin prepare the unsed vars"
;
unused_vars_
=
GetUnusedVars
(
program_
->
Block
(
0
),
ops_
,
skip_vars_
);
}
}
void
SectionWorker
::
RunForward
(
void
SectionWorker
::
RunForward
(
...
@@ -96,42 +126,7 @@ void SectionWorker::RunUpdate(
...
@@ -96,42 +126,7 @@ void SectionWorker::RunUpdate(
}
}
}
}
void
SectionWorker
::
PrepareUnusedVar
()
{
void
SectionWorker
::
RunFThenB
(
std
::
unique_ptr
<
GarbageCollector
>
&
gc
)
{
VLOG
(
5
)
<<
"begin prepare the unsed vars"
;
unused_vars_
=
GetUnusedVars
(
program_
->
Block
(
0
),
ops_
,
skip_vars_
);
}
void
SectionWorker
::
TrainFiles
()
{
VLOG
(
5
)
<<
"begin section_worker TrainFiles"
;
int64_t
max_memory_size
=
GetEagerDeletionThreshold
();
std
::
unique_ptr
<
GarbageCollector
>
gc
;
if
(
max_memory_size
>=
0
)
{
#if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
if
(
platform
::
is_gpu_place
(
place_
))
{
if
(
IsFastEagerDeletionModeEnabled
())
{
gc
.
reset
(
new
UnsafeFastGPUGarbageCollector
(
BOOST_GET_CONST
(
platform
::
CUDAPlace
,
place_
),
max_memory_size
));
}
}
#elif defined(PADDLE_WITH_ASCEND_CL)
if
(
IsFastEagerDeletionModeEnabled
())
{
VLOG
(
4
)
<<
"Use unsafe fast gc for NPU."
;
gc
.
reset
(
new
NPUUnsafeFastGarbageCollector
(
BOOST_GET_CONST
(
platform
::
NPUPlace
,
place_
),
max_memory_size
));
}
else
{
PADDLE_THROW
(
platform
::
errors
::
Unimplemented
(
"Please set FLAGS_fast_eager_deletion_mode=true to use "
"GarbageCollector on NPU."
));
// TODO(zhiqiu): fix bugs and enable NPUDefaultStreamGarbageCollector.
VLOG
(
4
)
<<
"Use default stream gc for NPU."
;
gc
.
reset
(
new
NPUDefaultStreamGarbageCollector
(
BOOST_GET_CONST
(
platform
::
NPUPlace
,
place_
),
max_memory_size
));
}
#endif
}
// max_memory_size >= 0
if
(
schedule_mode_
==
0
)
{
// F-then-B scheduler which runs Forward phase for all microbatches,
// F-then-B scheduler which runs Forward phase for all microbatches,
// then runs Backward phase for all microbatches.
// then runs Backward phase for all microbatches.
// step1: run forward
// step1: run forward
...
@@ -144,7 +139,9 @@ void SectionWorker::TrainFiles() {
...
@@ -144,7 +139,9 @@ void SectionWorker::TrainFiles() {
}
}
// step3: run update
// step3: run update
RunUpdate
(
gc
,
unused_vars_
);
RunUpdate
(
gc
,
unused_vars_
);
}
else
{
}
void
SectionWorker
::
Run1F1B
(
std
::
unique_ptr
<
GarbageCollector
>
&
gc
)
{
// 1F1B scheduler, which runs forward phase and backward phase altertively
// 1F1B scheduler, which runs forward phase and backward phase altertively
// after startup phase. For a stage, the number of microbatches for
// after startup phase. For a stage, the number of microbatches for
// startup is num_pipeline_stages_ - pipeline_stage_ - 1, where
// startup is num_pipeline_stages_ - pipeline_stage_ - 1, where
...
@@ -162,6 +159,7 @@ void SectionWorker::TrainFiles() {
...
@@ -162,6 +159,7 @@ void SectionWorker::TrainFiles() {
num_microbatches_
,
startup_steps
));
num_microbatches_
,
startup_steps
));
int
fw_step
=
0
;
int
fw_step
=
0
;
int
bw_step
=
0
;
int
bw_step
=
0
;
// startup phase
// startup phase
while
(
fw_step
<
startup_steps
)
{
while
(
fw_step
<
startup_steps
)
{
RunForward
(
fw_step
,
gc
,
unused_vars_
);
RunForward
(
fw_step
,
gc
,
unused_vars_
);
...
@@ -171,17 +169,74 @@ void SectionWorker::TrainFiles() {
...
@@ -171,17 +169,74 @@ void SectionWorker::TrainFiles() {
// 1f1b phase
// 1f1b phase
while
(
fw_step
<
num_microbatches_
)
{
while
(
fw_step
<
num_microbatches_
)
{
RunForward
(
fw_step
,
gc
,
unused_vars_
);
RunForward
(
fw_step
,
gc
,
unused_vars_
);
fw_step
+=
1
;
// delete backward send var at step=(bw_step - 2)
if
(
gc
&&
bw_step
>=
2
)
{
DeleteUnusedTensors
(
*
microbatch_scopes_
[
bw_step
-
2
],
backward_send_vars_
,
gc
.
get
());
}
RunBackward
(
bw_step
,
gc
,
unused_vars_
);
RunBackward
(
bw_step
,
gc
,
unused_vars_
);
fw_step
+=
1
;
bw_step
+=
1
;
bw_step
+=
1
;
}
}
int
reserve_bw_send_step
=
bw_step
-
2
;
// backward phase
// backward phase
while
(
bw_step
<
num_microbatches_
)
{
while
(
bw_step
<
num_microbatches_
)
{
RunBackward
(
bw_step
,
gc
,
unused_vars_
);
RunBackward
(
bw_step
,
gc
,
unused_vars_
);
bw_step
+=
1
;
bw_step
+=
1
;
}
}
RunUpdate
(
gc
,
unused_vars_
);
RunUpdate
(
gc
,
unused_vars_
);
if
(
gc
)
{
// NOTE(wangxi): program must add sync backward send comm at update
// delete backward send var
for
(
int
i
=
reserve_bw_send_step
;
i
<
num_microbatches_
;
++
i
)
{
DeleteUnusedTensors
(
*
microbatch_scopes_
[
i
],
backward_send_vars_
,
gc
.
get
());
}
}
}
}
void
SectionWorker
::
TrainFiles
()
{
VLOG
(
5
)
<<
"begin section_worker TrainFiles"
;
int64_t
max_memory_size
=
GetEagerDeletionThreshold
();
std
::
unique_ptr
<
GarbageCollector
>
gc
;
if
(
max_memory_size
>=
0
)
{
#if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
if
(
platform
::
is_gpu_place
(
place_
))
{
if
(
IsFastEagerDeletionModeEnabled
())
{
gc
.
reset
(
new
UnsafeFastGPUGarbageCollector
(
BOOST_GET_CONST
(
platform
::
CUDAPlace
,
place_
),
max_memory_size
));
}
}
#elif defined(PADDLE_WITH_ASCEND_CL)
if
(
IsFastEagerDeletionModeEnabled
())
{
VLOG
(
4
)
<<
"Use unsafe fast gc for NPU."
;
gc
.
reset
(
new
NPUUnsafeFastGarbageCollector
(
BOOST_GET_CONST
(
platform
::
NPUPlace
,
place_
),
max_memory_size
));
}
else
{
PADDLE_THROW
(
platform
::
errors
::
Unimplemented
(
"Please set FLAGS_fast_eager_deletion_mode=true to use "
"GarbageCollector on NPU."
));
// TODO(zhiqiu): fix bugs and enable NPUDefaultStreamGarbageCollector.
VLOG
(
4
)
<<
"Use default stream gc for NPU."
;
gc
.
reset
(
new
NPUDefaultStreamGarbageCollector
(
BOOST_GET_CONST
(
platform
::
NPUPlace
,
place_
),
max_memory_size
));
}
#endif
}
// max_memory_size >= 0
if
(
schedule_mode_
==
0
)
{
RunFThenB
(
gc
);
}
else
{
Run1F1B
(
gc
);
}
dev_ctx_
->
Wait
();
dev_ctx_
->
Wait
();
++
batch_id_
;
++
batch_id_
;
}
}
...
...
python/paddle/fluid/optimizer.py
浏览文件 @
a74208c1
...
@@ -5277,6 +5277,7 @@ class PipelineOptimizer(object):
...
@@ -5277,6 +5277,7 @@ class PipelineOptimizer(object):
backward_recv_index
=
index
backward_recv_index
=
index
break
break
# last pipeline stage
if
backward_recv_index
is
None
:
return
if
backward_recv_index
is
None
:
return
offset
=
0
offset
=
0
...
...
python/paddle/fluid/tests/unittests/test_dist_base.py
浏览文件 @
a74208c1
...
@@ -1258,7 +1258,7 @@ class TestDistBase(unittest.TestCase):
...
@@ -1258,7 +1258,7 @@ class TestDistBase(unittest.TestCase):
"fused_all_reduce_op_handle=10,all_reduce_op_handle=10,alloc_continuous_space_op=10,fuse_all_reduce_op_pass=10,"
\
"fused_all_reduce_op_handle=10,all_reduce_op_handle=10,alloc_continuous_space_op=10,fuse_all_reduce_op_pass=10,"
\
"alloc_continuous_space_for_grad_pass=10,fast_threaded_ssa_graph_executor=10,executor=10,operator=10,"
\
"alloc_continuous_space_for_grad_pass=10,fast_threaded_ssa_graph_executor=10,executor=10,operator=10,"
\
"sparse_all_reduce_op_handle=10,gen_nccl_id_op=10,gen_nccl_id_op_help=10,nccl_helper=10,grpc_client=10,"
\
"sparse_all_reduce_op_handle=10,gen_nccl_id_op=10,gen_nccl_id_op_help=10,nccl_helper=10,grpc_client=10,"
\
"grpc_server=10,request_handler_impl=10"
"grpc_server=10,request_handler_impl=10
,section_worker=10
"
required_envs
[
"GLOG_logtostderr"
]
=
"1"
required_envs
[
"GLOG_logtostderr"
]
=
"1"
required_envs
.
update
(
need_envs
)
required_envs
.
update
(
need_envs
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录