Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
423ea978
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看板
未验证
提交
423ea978
编写于
7月 30, 2021
作者:
Y
Yuang Liu
提交者:
GitHub
7月 30, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
all reduce fusion for shardinug, test=develop (#34480)
上级
79e758c6
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
121 addition
and
12 deletion
+121
-12
python/paddle/distributed/fleet/meta_optimizers/sharding/utils.py
...addle/distributed/fleet/meta_optimizers/sharding/utils.py
+77
-7
python/paddle/distributed/fleet/meta_optimizers/sharding_optimizer.py
...e/distributed/fleet/meta_optimizers/sharding_optimizer.py
+14
-5
python/paddle/fluid/tests/unittests/test_fleet_sharding_meta_optimizer.py
...uid/tests/unittests/test_fleet_sharding_meta_optimizer.py
+30
-0
未找到文件。
python/paddle/distributed/fleet/meta_optimizers/sharding/utils.py
浏览文件 @
423ea978
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# See the License for the specific language governing permissions and
# limitations under the License.
# limitations under the License.
import
paddle
import
paddle
from
paddle.fluid
import
core
from
paddle.fluid
import
core
,
unique_name
from
functools
import
reduce
from
functools
import
reduce
from
paddle.distributed.fleet.meta_optimizers.common
import
is_loss_grad_op
from
paddle.distributed.fleet.meta_optimizers.common
import
is_loss_grad_op
from
paddle.distributed.fleet.meta_optimizers.common
import
OpRole
,
OP_ROLE_KEY
,
OP_ROLE_VAR_KEY
from
paddle.distributed.fleet.meta_optimizers.common
import
OpRole
,
OP_ROLE_KEY
,
OP_ROLE_VAR_KEY
...
@@ -333,13 +333,19 @@ def insert_allreduce_ops(block,
...
@@ -333,13 +333,19 @@ def insert_allreduce_ops(block,
ring_id
,
ring_id
,
allreduce_vars
,
allreduce_vars
,
op_role
=
OpRole
.
Backward
,
op_role
=
OpRole
.
Backward
,
use_calc_stream
=
False
):
use_calc_stream
=
False
,
user_defined_strategy
=
None
):
"""
"""
_add_allreduce_ops
_add_allreduce_ops
"""
"""
if
len
(
allreduce_vars
)
==
0
:
if
len
(
allreduce_vars
)
==
0
:
return
return
if
user_defined_strategy
and
user_defined_strategy
.
fuse_all_reduce_ops
:
insert_fused_allreduce_ops
(
block
,
insert_idx
,
ring_id
,
allreduce_vars
,
op_role
,
use_calc_stream
,
user_defined_strategy
.
fuse_grad_size_in_MB
)
else
:
for
var
in
allreduce_vars
:
for
var
in
allreduce_vars
:
block
.
_insert_op_without_sync
(
block
.
_insert_op_without_sync
(
insert_idx
,
insert_idx
,
...
@@ -355,6 +361,70 @@ def insert_allreduce_ops(block,
...
@@ -355,6 +361,70 @@ def insert_allreduce_ops(block,
return
return
def
insert_fused_allreduce_ops
(
block
,
insert_idx
,
ring_id
,
allreduce_vars
,
op_role
=
OpRole
.
Backward
,
use_calc_stream
=
False
,
fuse_grad_size_in_MB
=
32
):
segments
=
[]
cur_size
=
0.
last_dtype
=
None
for
var
in
allreduce_vars
:
real_var
=
block
.
var
(
var
)
var_size
=
get_var_size
(
real_var
)
if
cur_size
+
var_size
>
fuse_grad_size_in_MB
\
or
len
(
segments
)
==
0
\
or
real_var
.
dtype
!=
last_dtype
:
segments
.
append
([
real_var
])
cur_size
=
var_size
last_dtype
=
real_var
.
dtype
else
:
segments
[
-
1
].
append
(
real_var
)
cur_size
+=
var_size
fused_vars
=
[]
for
segment
in
segments
:
tmp_var
=
block
.
create_var
(
name
=
unique_name
.
generate
(
'FusedOutput_{}'
.
format
(
segment
[
0
].
name
)),
dtype
=
segment
[
0
].
dtype
,
persistable
=
False
,
stop_gradient
=
True
)
fused_vars
.
append
(
tmp_var
)
block
.
_insert_op_without_sync
(
insert_idx
,
type
=
"coalesce_tensor"
,
inputs
=
{
"Input"
:
segment
},
outputs
=
{
"Output"
:
segment
,
"FusedOutput"
:
tmp_var
},
attrs
=
{
"copy_data"
:
True
,
"use_align"
:
True
,
"dtype"
:
segment
[
0
].
dtype
,
OP_ROLE_KEY
:
op_role
})
for
fused_var
in
fused_vars
:
block
.
_insert_op_without_sync
(
insert_idx
+
len
(
fused_vars
),
type
=
'c_allreduce_sum'
,
inputs
=
{
'X'
:
fused_var
},
outputs
=
{
'Out'
:
fused_var
},
attrs
=
{
'ring_id'
:
ring_id
,
'use_calc_stream'
:
use_calc_stream
,
OP_ROLE_KEY
:
op_role
})
if
not
use_calc_stream
:
block
.
_insert_op_without_sync
(
insert_idx
+
len
(
fused_vars
),
type
=
'c_sync_calc_stream'
,
inputs
=
{
'X'
:
fused_var
},
outputs
=
{
'Out'
:
fused_var
},
attrs
=
{
OP_ROLE_KEY
:
op_role
})
def
insert_reduce_ops
(
block
,
def
insert_reduce_ops
(
block
,
insert_idx
,
insert_idx
,
ring_id
,
ring_id
,
...
...
python/paddle/distributed/fleet/meta_optimizers/sharding_optimizer.py
浏览文件 @
423ea978
...
@@ -322,7 +322,8 @@ class ShardingOptimizer(MetaOptimizerBase):
...
@@ -322,7 +322,8 @@ class ShardingOptimizer(MetaOptimizerBase):
self
.
dp_ring_id
,
self
.
dp_ring_id
,
accumulated_grad_names
,
accumulated_grad_names
,
core
.
op_proto_and_checker_maker
.
OpRole
.
Optimize
,
core
.
op_proto_and_checker_maker
.
OpRole
.
Optimize
,
use_calc_stream
=
True
)
use_calc_stream
=
True
,
user_defined_strategy
=
self
.
user_defined_strategy
)
# if not use sharding, adapt amp/clip, for remain parallelism.
# if not use sharding, adapt amp/clip, for remain parallelism.
# cast --> amp --> clip --> opt
# cast --> amp --> clip --> opt
...
@@ -778,8 +779,12 @@ class ShardingOptimizer(MetaOptimizerBase):
...
@@ -778,8 +779,12 @@ class ShardingOptimizer(MetaOptimizerBase):
shard_allredue_vars
)
>=
1
:
shard_allredue_vars
)
>=
1
:
insert_sync_comm_ops
(
block
,
self
.
_segments
[
-
1
].
_end_idx
,
insert_sync_comm_ops
(
block
,
self
.
_segments
[
-
1
].
_end_idx
,
self
.
dp_ring_id
,
shard_allredue_vars
)
self
.
dp_ring_id
,
shard_allredue_vars
)
insert_allreduce_ops
(
block
,
self
.
_segments
[
-
1
].
_end_idx
,
insert_allreduce_ops
(
self
.
dp_ring_id
,
shard_allredue_vars
)
block
,
self
.
_segments
[
-
1
].
_end_idx
,
self
.
dp_ring_id
,
shard_allredue_vars
,
user_defined_strategy
=
self
.
user_defined_strategy
)
# gradient merge
# gradient merge
elif
self
.
gradient_merge_mode
==
"sharding_gm"
and
self
.
_gradient_merge_acc_step
>
1
:
elif
self
.
gradient_merge_mode
==
"sharding_gm"
and
self
.
_gradient_merge_acc_step
>
1
:
self
.
create_persistable_gradients_and_insert_merge_ops
(
self
.
create_persistable_gradients_and_insert_merge_ops
(
...
@@ -896,8 +901,12 @@ class ShardingOptimizer(MetaOptimizerBase):
...
@@ -896,8 +901,12 @@ class ShardingOptimizer(MetaOptimizerBase):
if
self
.
gradient_merge_mode
!=
"sharding_gm"
or
self
.
_gradient_merge_acc_step
<=
1
:
if
self
.
gradient_merge_mode
!=
"sharding_gm"
or
self
.
_gradient_merge_acc_step
<=
1
:
if
self
.
hybrid_dp
and
self
.
hybrid_dp_mode
==
"sharding_hybrid_dp"
and
len
(
if
self
.
hybrid_dp
and
self
.
hybrid_dp_mode
==
"sharding_hybrid_dp"
and
len
(
shard_allredue_vars
)
>=
1
:
shard_allredue_vars
)
>=
1
:
insert_allreduce_ops
(
block
,
segment
.
_start_idx
,
insert_allreduce_ops
(
self
.
dp_ring_id
,
shard_allredue_vars
)
block
,
segment
.
_start_idx
,
self
.
dp_ring_id
,
shard_allredue_vars
,
user_defined_strategy
=
self
.
user_defined_strategy
)
insert_sync_comm_ops
(
block
,
segment
.
_start_idx
,
insert_sync_comm_ops
(
block
,
segment
.
_start_idx
,
self
.
sharding_ring_id
,
allreduce_vars
)
self
.
sharding_ring_id
,
allreduce_vars
)
# gradient merge
# gradient merge
...
...
python/paddle/fluid/tests/unittests/test_fleet_sharding_meta_optimizer.py
浏览文件 @
423ea978
...
@@ -586,6 +586,36 @@ class TestFleetMetaOptimizer(TestFleetMetaOptimizer):
...
@@ -586,6 +586,36 @@ class TestFleetMetaOptimizer(TestFleetMetaOptimizer):
self
.
assertEqual
(
dp_group_waiting_ports
,
[
'127.0.0.1:36002'
])
self
.
assertEqual
(
dp_group_waiting_ports
,
[
'127.0.0.1:36002'
])
def
test_sharding_dp_with_allreduce_fuse
(
self
):
train_prog
,
startup_prog
=
paddle
.
fluid
.
Program
(),
paddle
.
fluid
.
Program
(
)
avg_cost
,
_
=
self
.
net
(
train_prog
,
startup_prog
)
strategy
=
paddle
.
distributed
.
fleet
.
DistributedStrategy
()
strategy
.
sharding
=
True
strategy
.
sharding_configs
=
{
"sharding_segment_strategy"
:
"segment_broadcast_MB"
,
"segment_broadcast_MB"
:
0.1
,
"segment_anchors"
:
None
,
"sharding_degree"
:
2
,
"dp_degree"
:
2
,
"hybrid_dp"
:
True
,
"gradient_merge_acc_step"
:
1
,
"mp_degree"
:
1
}
strategy
.
fuse_all_reduce_ops
=
True
strategy
.
fuse_grad_size_in_MB
=
2
self
.
optimizer
(
avg_cost
,
strategy
,
train_prog
,
startup_prog
)
main_prog_ops
=
train_prog
.
global_block
().
ops
main_prog_op_types
=
[
op
.
type
for
op
in
main_prog_ops
]
assert
'c_allreduce_sum'
in
main_prog_op_types
assert
'coalesce_tensor'
in
main_prog_op_types
for
op
in
main_prog_ops
:
if
op
.
type
==
'c_allreduce_sum'
:
assert
'FusedOutput'
in
op
.
input_arg_names
[
0
]
if
__name__
==
"__main__"
:
if
__name__
==
"__main__"
:
unittest
.
main
()
unittest
.
main
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录