Skip to content
Open
Changes from all commits
Commits
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
18 changes: 6 additions & 12 deletions test/prototype/moe_training/reference_parallel_styles.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,12 +165,12 @@ def _token_dispatch(self, mod, inputs, device_mesh):
routed_input, num_tokens_per_expert = inputs

routed_input = DTensor.from_local(
routed_input, device_mesh["tp"], (Replicate(),)
routed_input, self.tp_mesh, (Replicate(),)
).to_local(grad_placements=(Partial(),))

inputs = (routed_input, num_tokens_per_expert)

return super()._token_dispatch(mod, inputs, device_mesh["ep"])
return super()._token_dispatch(mod, inputs, self.ep_mesh)

def _partition_fn(self, name: str, mod: nn.Module, device_mesh: DeviceMesh) -> None:
from torch.distributed.tensor import distribute_tensor
Expand All @@ -189,15 +189,9 @@ def _partition_fn(self, name: str, mod: nn.Module, device_mesh: DeviceMesh) -> N
)

def _token_combine(self, mod, routed_output, device_mesh):
return super()._token_combine(mod, routed_output, device_mesh["ep"])
return super()._token_combine(mod, routed_output, self.ep_mesh)

def _apply(self, module: nn.Module, device_mesh: DeviceMesh) -> nn.Module:
from torch.distributed.tensor import distribute_module

return distribute_module(
module,
device_mesh,
partition_fn=self._partition_fn,
input_fn=self._token_dispatch,
output_fn=self._token_combine,
)
self.tp_mesh = device_mesh["tp"]
self.ep_mesh = device_mesh["ep"]
return super()._apply(module, device_mesh)