Skip to content

supports mp and dp hybrid #34377

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

Merged
merged 3 commits into from
Jul 27, 2021
Merged

supports mp and dp hybrid #34377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d1fe04b
supports mp and pp hybrid, test=allcase
FeixLiu Jul 26, 2021
7c6b80a
update ut
FeixLiu Jul 26, 2021
085510f
update the logic
FeixLiu Jul 26, 2021
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
22 changes: 19 additions & 3 deletions python/paddle/distributed/fleet/base/fleet_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,11 +269,27 @@ def init(self, role_maker=None, is_collective=False, strategy=None):
cg.set_comm_group('global', global_rank, global_world_size,
global_ring_id, global_ranks)

use_tensor_parallel = self._user_defined_strategy.tensor_parallel
use_mp = use_sharding or use_tensor_parallel

# hybrid group
if use_sharding is False: return
if use_mp is False: return

mp_degree_sharding = 1
mp_degree_tensor_parallel = 1
if use_sharding:
sharding_configs = self._user_defined_strategy.sharding_configs
mp_degree_sharding = int(sharding_configs['mp_degree'])

if use_tensor_parallel:
tensor_parallel_configs = self._user_defined_strategy.tensor_parallel_configs
mp_degree_tensor_parallel = int(tensor_parallel_configs[
'tensor_parallel_degree'])

if use_sharding and use_tensor_parallel:
assert mp_degree_sharding == mp_degree_tensor_parallel

sharding_configs = self._user_defined_strategy.sharding_configs
mp_degree = int(sharding_configs['mp_degree'])
mp_degree = mp_degree_sharding if use_sharding else mp_degree_tensor_parallel

if mp_degree > 1:
assert global_world_size % mp_degree == 0
Expand Down
2 changes: 2 additions & 0 deletions python/paddle/fluid/tests/unittests/test_fleet_static_mp_layers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ def setUp(self):
"mp_degree": self.model_parallel_size,
"sharding_degree": 2,
}
strategy.tensor_parallel = True
strategy.tensor_parallel_configs = {"tensor_parallel_degree": 2}
fleet.init(is_collective=True, strategy=strategy)

def get_program(self):
Expand Down