Skip to content

Commit 6b7a293

Browse files
committed
Introduce ManagedDeviceMesh to integrate DeviceMesh with TorchFT
Summary: ManagedDeviceMesh allow users to manipulate DeviceMesh with TorchFT ManagedProcessGroup. ghstack-source-id: 2bde839287b6dff46d8ac54c8851fb86abe6b788 Pull Request resolved: #56
1 parent f31d3b1 commit 6b7a293

File tree

3 files changed

+358
-13
lines changed

3 files changed

+358
-13
lines changed

torchft/fsdp_test.py

+71
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
# Copyright (c) Meta Platforms, Inc. and affiliates.
2+
# All rights reserved.
3+
#
4+
# This source code is licensed under the BSD-style license found in the
5+
# LICENSE file in the root directory of this source tree.
6+
7+
import os
8+
from concurrent.futures import ThreadPoolExecutor
9+
from typing import Any, Dict, Tuple
10+
from unittest import TestCase, skipUnless
11+
from unittest.mock import Mock
12+
13+
import torch
14+
import torch.distributed as dist
15+
from torch import nn
16+
from torch._C._distributed_c10d import (
17+
AllgatherOptions,
18+
AllreduceOptions,
19+
BroadcastOptions,
20+
ReduceOp,
21+
_resolve_process_group,
22+
)
23+
from torch.distributed import (
24+
ReduceOp,
25+
TCPStore,
26+
Work,
27+
_functional_collectives,
28+
get_world_size,
29+
)
30+
from torch.distributed._composable.fsdp import fully_shard
31+
from torch.distributed.device_mesh import init_device_mesh
32+
from torch.testing._internal.common_distributed import MultiProcessTestCase
33+
34+
from torchft.manager import Manager
35+
from torchft.process_group import ManagedProcessGroup, ft_init_device_mesh
36+
37+
38+
class FSDPTest(MultiProcessTestCase):
39+
@property
40+
def world_size(self) -> int:
41+
return 4
42+
43+
def setUp(self) -> None:
44+
super().setUp()
45+
os.environ["TORCH_NCCL_DESYNC_DEBUG"] = "0"
46+
self._spawn_processes()
47+
48+
def test_fsdp(self) -> None:
49+
group_size = self.world_size // 2
50+
# pyre-ignore[16]
51+
group = self.rank // group_size
52+
group_rank = self.rank % group_size
53+
54+
os.environ["MASTER_ADDR"] = "127.0.0.1"
55+
os.environ["MASTER_PORT"] = str(12346 + group)
56+
os.environ["RANK"] = str(group_rank)
57+
os.environ["WORLD_SIZE"] = str(group_size)
58+
59+
manager = Mock(spec=Manager)
60+
device_mesh = ft_init_device_mesh(
61+
device_type="cuda",
62+
mesh_shape=(2, 2),
63+
mesh_dim_names=("dp_replicate", "dp_shard"),
64+
replicate_dim=0,
65+
manager=manager,
66+
)
67+
manager.num_participants.return_value = 1
68+
model = nn.Linear(128, 128).cuda()
69+
batch = torch.randn(4, 128).cuda()
70+
shard_model = fully_shard(model, mesh=device_mesh)
71+
shard_model(batch).mean().backward()

torchft/process_group.py

+238-13
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import threading
2121
from abc import ABC
2222
from datetime import timedelta
23-
from typing import TYPE_CHECKING, Dict, List, Optional, Type
23+
from typing import TYPE_CHECKING, Dict, List, Optional, Tuple, Type, Union
2424

2525
import torch
2626
import torch.distributed as dist
@@ -38,6 +38,7 @@
3838
Store,
3939
TCPStore,
4040
get_rank,
41+
init_device_mesh,
4142
)
4243
from torch.distributed.distributed_c10d import Work, _world
4344
from torch.futures import Future
@@ -130,17 +131,7 @@ def size(self) -> int:
130131
def getBackendName(self) -> str:
131132
raise NotImplementedError("not implemented")
132133

133-
def register(self, name: str) -> "ProcessGroup":
134-
"""
135-
Registers the process group with the global registry. This enables usage
136-
with things like functional_collectives which are compilable.
137-
138-
This should only be called once.
139-
140-
Args:
141-
name: name must be a unique name for this process group
142-
"""
143-
134+
def _register(self, name: str) -> str:
144135
group_name = f"{self.getBackendName()}:{name}"
145136

146137
# This is needed for DeviceMesh and functional collectives to work.
@@ -158,6 +149,21 @@ def create_pg(
158149
devices = ["cpu"]
159150
dist.Backend.register_backend(group_name, create_pg, devices=devices)
160151

152+
return group_name
153+
154+
def register(self, name: str) -> "ProcessGroup":
155+
"""
156+
Registers the process group with the global registry. This enables usage
157+
with things like functional_collectives which are compilable.
158+
159+
This should only be called once.
160+
161+
Args:
162+
name: name must be a unique name for this process group
163+
"""
164+
165+
group_name = self._register(name)
166+
161167
return dist.new_group(
162168
ranks=[dist.get_rank()],
163169
backend=group_name,
@@ -496,6 +502,9 @@ def allreduce(self, tensors: List[torch.Tensor], opts: object) -> Work:
496502
def size(self) -> int:
497503
return self._manager.num_participants()
498504

505+
def getBackendName(self) -> str:
506+
return self._manager._pg.getBackendName()
507+
499508

500509
class _BabyWork(Work):
501510
def __init__(
@@ -689,7 +698,6 @@ def _future_handler(self, future_queue: mp.Queue) -> None:
689698
logger.exception(f"got unexpected error in future handler: {e}")
690699

691700
def _get_future(self, op_id: int) -> Future[object]:
692-
693701
with self._futures_lock:
694702
fut = Future() # pyre-fixme[29]: is not a function
695703
self._futures[op_id] = fut
@@ -797,3 +805,220 @@ def extend_device_mesh(
797805
mesh=mesh.mesh.unsqueeze(dim),
798806
mesh_dim_names=tuple(mesh_dim_names),
799807
)
808+
809+
810+
class ManagedDeviceMesh(DeviceMesh):
811+
def __init__(
812+
self,
813+
mesh: Optional[DeviceMesh],
814+
mesh_dim_names: Tuple[str, ...],
815+
replicate_pg: ManagedProcessGroup,
816+
replicate_dim: int,
817+
parent: Optional["ManagedDeviceMesh"],
818+
) -> None:
819+
if mesh is None and parent is not None:
820+
raise ValueError(
821+
"ManagedDeviceMesh doesn't support both mesh and parent are None."
822+
)
823+
self.mesh = mesh
824+
self.mesh_dim_names = mesh_dim_names
825+
self.replicate_pg = replicate_pg
826+
self.replicate_dim = replicate_dim
827+
self.replicate_dim_name: str = mesh_dim_names[replicate_dim]
828+
self.parent = parent
829+
self.flatten_meshes: Dict[str, DeviceMesh] = {}
830+
self.device_type: str = (
831+
mesh.device_type if mesh is not None else parent.device_type
832+
)
833+
self._flatten_mesh_list: Tuple[DeviceMesh, ...] = tuple()
834+
self._thread_id: Optional[int] = None
835+
836+
def __getitem__(self, mesh_dim_names: Union[str, Tuple[str, ...]]) -> DeviceMesh:
837+
if isinstance(mesh_dim_names, str):
838+
if mesh_dim_names == self.replicate_dim_name:
839+
return ManagedDeviceMesh(
840+
mesh=None,
841+
mesh_dim_names=(mesh_dim_names,),
842+
replicate_pg=self.replicate_pg,
843+
replicate_dim=0,
844+
parent=self,
845+
)
846+
elif mesh_dim_names in self.flatten_meshes:
847+
return self.flatten_meshes[mesh_dim_names]
848+
else:
849+
assert self.mesh is not None
850+
return self.mesh[mesh_dim_names]
851+
else:
852+
assert isinstance(mesh_dim_names, tuple)
853+
if self.replicate_dim_name in mesh_dim_names:
854+
return self.mesh[mesh_dim_names]
855+
else:
856+
return ManagedDeviceMesh(
857+
self.mesh[mesh_dim_names],
858+
mesh_dim_names,
859+
self.replicate_pg,
860+
mesh_dim_names.index(self.replicate_dim_name),
861+
parent=self,
862+
)
863+
864+
def _real_mesh_dim(self, mesh_dim: int) -> int:
865+
return mesh_dim - 1 if mesh_dim > self.replicate_dim else mesh_dim
866+
867+
def get_group(self, mesh_dim: Optional[Union[int, str]] = None) -> BaseProcessGroup:
868+
if isinstance(mesh_dim, str):
869+
dim = self.mesh_dim_names.index(mesh_dim)
870+
else:
871+
dim = 0 if mesh_dim is None else int(mesh_dim)
872+
873+
if mesh_dim is None:
874+
assert self.mesh is None
875+
return self.replicate_pg
876+
elif dim == self.replicate_dim:
877+
return self.replicate_pg
878+
else:
879+
return self.mesh.get_group(self._real_mesh_dim(dim))
880+
881+
def _flatten(self, mesh_dim_name: str) -> "DeviceMesh":
882+
flatten_mesh = _FlattenDeviceMesh(self)
883+
if self.parent is None:
884+
self.flatten_meshes[mesh_dim_name] = flatten_mesh
885+
else:
886+
self.parent.flatten_meshes[mesh_dim_name] = flatten_mesh
887+
return flatten_mesh
888+
889+
def size(self, mesh_dim: Optional[int] = None) -> int:
890+
if mesh_dim is None:
891+
if self.mesh is None:
892+
return self.replicate_pg.size()
893+
else:
894+
return self.mesh.size() * self.replicate_pg.size()
895+
elif mesh_dim == self.replicate_dim:
896+
return self.replicate_pg.size()
897+
else:
898+
return self.mesh.size(self._real_mesh_dim(mesh_dim))
899+
900+
@property
901+
def ndim(self) -> int:
902+
assert self.mesh is not None
903+
return self.mesh.ndim + 1
904+
905+
@property
906+
def shape(self) -> Tuple[int, ...]:
907+
ret = list(self.mesh.shape)
908+
ret.insert(self.replicate_dim, self.replicate_pg.size())
909+
return ret
910+
911+
def get_rank(self) -> int:
912+
assert self.mesh is not None
913+
return self.mesh.get_rank()
914+
915+
def get_local_rank(self, mesh_dim: Optional[Union[int, str]] = None) -> int:
916+
if isinstance(mesh_dim, str):
917+
dim = self.mesh_dim_names.index(mesh_dim)
918+
else:
919+
dim = 0 if mesh_dim is None else int(mesh_dim)
920+
921+
if mesh_dim is None:
922+
if self.mesh is None:
923+
return get_rank(self.replicate_pg)
924+
925+
assert self.replicate_dim == 0, "replicate_dim must be the first one"
926+
other_dim_size = self.mesh.size()
927+
assert self.mesh is not None
928+
other_dim_rank = self.mesh.get_local_rank()
929+
replicate_pg_rank = get_rank(self.replicate_pg)
930+
return other_dim_size * replicate_pg_rank + other_dim_rank
931+
elif dim == self.replicate_dim:
932+
return get_rank(self.replicate_pg)
933+
else:
934+
assert self.mesh is not None
935+
return self.mesh.get_local_rank(self._real_mesh_dim(dim))
936+
937+
def get_coordinate(self) -> Optional[List[int]]:
938+
"""
939+
Return the relative indices of this rank relative to all
940+
dimensions of the mesh. If this rank is not part of the mesh, return None.
941+
"""
942+
assert self.mesh is not None
943+
return self.mesh._coordinate_on_dim if self.mesh._coordinate_on_dim else None
944+
945+
def get_all_groups(self) -> List[BaseProcessGroup]:
946+
raise NotImplementedError
947+
948+
949+
class _FlattenDeviceMesh(DeviceMesh):
950+
def __init__(self, managed_mesh: ManagedDeviceMesh) -> None:
951+
self.managed_mesh = managed_mesh
952+
953+
def __getitem__(self, mesh_dim_names: Union[str, Tuple[str, ...]]) -> DeviceMesh:
954+
raise NotImplementedError
955+
956+
def get_group(self, mesh_dim: Optional[Union[int, str]] = None) -> BaseProcessGroup:
957+
raise NotImplementedError
958+
959+
def _flatten(self, mesh_dim_name: Optional[str]) -> "DeviceMesh":
960+
raise NotImplementedError
961+
962+
def size(self, mesh_dim: Optional[int] = None) -> int:
963+
assert mesh_dim is None
964+
return self.managed_mesh.size()
965+
966+
@property
967+
def ndim(self) -> int:
968+
raise NotImplementedError
969+
970+
@property
971+
def shape(self) -> Tuple[int, ...]:
972+
raise NotImplementedError
973+
974+
def get_rank(self) -> int:
975+
raise NotImplementedError
976+
977+
def get_local_rank(self, mesh_dim: Optional[Union[int, str]] = None) -> int:
978+
assert mesh_dim is None
979+
return self.managed_mesh.get_local_rank()
980+
981+
def get_all_groups(self) -> List[BaseProcessGroup]:
982+
raise NotImplementedError
983+
984+
985+
def ft_init_device_mesh(
986+
*,
987+
device_type: str,
988+
mesh_shape: Tuple[int, ...],
989+
mesh_dim_names: Tuple[str, ...],
990+
replicate_dim: int,
991+
manager: "Manager",
992+
) -> "ManagedDeviceMesh":
993+
# We need to mislead DeviceMesh into thinking that replicate_dim has only
994+
# 1 rank.
995+
_mesh_shape = list(mesh_shape)
996+
_mesh_shape.pop(replicate_dim)
997+
_mesh_dim_names = list(mesh_dim_names)
998+
_mesh_dim_names.pop(replicate_dim)
999+
mesh = init_device_mesh(
1000+
device_type,
1001+
mesh_shape=tuple(_mesh_shape),
1002+
mesh_dim_names=tuple(_mesh_dim_names),
1003+
)
1004+
1005+
if device_type == "cpu":
1006+
pg = ProcessGroupGloo()
1007+
elif device_type == "cuda":
1008+
pg = ProcessGroupNCCL()
1009+
else:
1010+
raise ValueError()
1011+
1012+
manager._pg = pg
1013+
replicate_pg = ManagedProcessGroup(manager)
1014+
# We have to use MultiProcessTestCase, otherwise c10d will complain
1015+
# the same backend has been registered.
1016+
replicate_pg.register(mesh_dim_names[replicate_dim])
1017+
1018+
return ManagedDeviceMesh(
1019+
mesh=mesh,
1020+
mesh_dim_names=mesh_dim_names,
1021+
replicate_pg=replicate_pg,
1022+
replicate_dim=replicate_dim,
1023+
parent=None,
1024+
)

0 commit comments

Comments
 (0)