Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix virtualpp with mp/recompute bugs #47242

Merged
merged 2 commits into from
Oct 21, 2022
Merged

Fix virtualpp with mp/recompute bugs #47242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc13874
fix rank logic
FeixLiu Oct 21, 2022
7826370
bug fixer
FeixLiu Oct 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion python/paddle/distributed/fleet/meta_parallel/parallel_layers/pp_layers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,11 +598,12 @@ def _build_layer_impl(self, start, end):
return run_function

def forward_function(self, start, end):
run_function = self.run_function

def execute_func(*x):
if len(x) == 1:
x = x[0]
for idx, layer in enumerate(self.run_function[start:end]):
for idx, layer in enumerate(run_function[start:end]):
x = layer(x)
return x

Expand Down
35 changes: 20 additions & 15 deletions python/paddle/distributed/fleet/meta_parallel/pp_utils/p2p_communication.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,17 +168,18 @@ def _is_valid_send_recv_partial(tensor, mp_degree):

def _partial_send_op(tensor, group, use_calc_stream, ring_id, dst, nranks,
rank_id):
dst_rank_in_group = dst if group is None else group.get_group_rank(dst)
if _in_legacy_dygraph():
return _legacy_C_ops.partial_send(tensor.detach(), 'use_calc_stream',
use_calc_stream, 'ring_id', ring_id,
'peer', dst, 'num', nranks, 'id',
rank_id)
'peer', dst_rank_in_group, 'num',
nranks, 'id', rank_id)
elif in_dygraph_mode():
group = paddle.distributed.collective._get_default_group(
) if group is None else group
comm_op = group.process_group.send_partial_on_calc_stream \
if use_calc_stream else group.process_group.send_partial
return comm_op(tensor, dst, nranks, rank_id)
return comm_op(tensor, dst_rank_in_group, nranks, rank_id)


def send_partial(tensor,
Expand All @@ -192,12 +193,13 @@ def send_partial(tensor,
return
ring_id = 0 if group is None else group.id

dst_rank = _hcg._get_p2p_next_rank(
) if dst == 1 else _hcg._get_p2p_prev_rank()

if _is_valid_send_recv_partial(tensor, nranks):
return _partial_send_op(tensor, group, use_calc_stream, ring_id, dst,
nranks, rank_id)
return _partial_send_op(tensor, group, use_calc_stream, ring_id,
dst_rank, nranks, rank_id)
else:
dst_rank = _hcg._get_p2p_next_rank(
) if dst == 1 else _hcg._get_p2p_prev_rank()
if _in_legacy_dygraph():
send_op = lambda x, dst, group: \
paddle.distributed.send(x, dst, group, use_calc_stream)
Expand All @@ -208,19 +210,21 @@ def send_partial(tensor,

def _partial_recv_op(tensor, group, use_calc_stream, ring_id, src, nranks,
rank_id):
src_rank_in_group = src if group is None else group.get_group_rank(src)
if _in_legacy_dygraph():
assert use_calc_stream
return _legacy_C_ops.partial_recv(tensor.detach(), 'use_calc_stream',
use_calc_stream, 'ring_id', ring_id,
'peer', src, 'num', nranks, 'id',
rank_id, 'dtype', tensor.dtype,
'out_shape', tensor.shape)
'peer', src_rank_in_group, 'num',
nranks, 'id', rank_id, 'dtype',
tensor.dtype, 'out_shape',
tensor.shape)
elif in_dygraph_mode():
group = paddle.distributed.collective._get_default_group(
) if group is None else group
comm_op = group.process_group.recv_partial_on_calc_stream \
if use_calc_stream else group.process_group.recv_partial
return comm_op(tensor, src, nranks, rank_id)
return comm_op(tensor, src_rank_in_group, nranks, rank_id)


def recv_partial(tensor,
Expand All @@ -234,12 +238,13 @@ def recv_partial(tensor,
return
ring_id = 0 if group is None else group.id

src_rank = _hcg._get_p2p_prev_rank(
) if src == 0 else _hcg._get_p2p_next_rank()

if _is_valid_send_recv_partial(tensor, nranks):
return _partial_recv_op(tensor, group, use_calc_stream, ring_id, src,
nranks, rank_id)
return _partial_recv_op(tensor, group, use_calc_stream, ring_id,
src_rank, nranks, rank_id)
else:
src_rank = _hcg._get_p2p_prev_rank(
) if src == 0 else _hcg._get_p2p_next_rank()
if _in_legacy_dygraph() or use_calc_stream:
recv_op = paddle.distributed.recv
elif in_dygraph_mode():
Expand Down