Skip to content
Merged
Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
- Changed `MisconfigurationException` to `ModuleNotFoundError` when `rich` isn't available ([#11360](https://github.com/PyTorchLightning/pytorch-lightning/pull/11360))


- Changed `parallel_devices` property in `ParallelStrategy` to be lazy initialized ([#11572](https://github.com/PyTorchLightning/pytorch-lightning/pull/11572))


- Sorted `SimpleProfiler(extended=False)` summary based on mean duration for each hook ([#11671](https://github.com/PyTorchLightning/pytorch-lightning/pull/11671))


Expand Down
5 changes: 4 additions & 1 deletion pytorch_lightning/strategies/ddp.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ def __init__(
self.interactive_ddp_procs = []
self._num_nodes = 1
self.sync_batchnorm = False
self.num_processes = len(self.parallel_devices) if self.parallel_devices is not None else 0
self._ddp_kwargs = kwargs
self._ddp_comm_state = ddp_comm_state
self._ddp_comm_hook = ddp_comm_hook
Expand Down Expand Up @@ -135,6 +134,10 @@ def num_nodes(self, num_nodes: int) -> None:
self._num_nodes = num_nodes
self.set_world_ranks()

@property
def num_processes(self):
return len(self.parallel_devices) if self.parallel_devices is not None else 0

@property
def distributed_sampler_kwargs(self):
distributed_sampler_kwargs = dict(num_replicas=(self.num_nodes * self.num_processes), rank=self.global_rank)
Expand Down
5 changes: 4 additions & 1 deletion pytorch_lightning/strategies/ddp_spawn.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ def __init__(
self._num_nodes = 1
self.sync_batchnorm = False
self._ddp_kwargs = kwargs
self.num_processes = len(parallel_devices) if parallel_devices is not None else 0
self._ddp_comm_state = ddp_comm_state
self._ddp_comm_hook = ddp_comm_hook
self._ddp_comm_wrapper = ddp_comm_wrapper
Expand All @@ -107,6 +106,10 @@ def local_rank(self) -> int:
def root_device(self):
return self.parallel_devices[self.local_rank]

@property
def num_processes(self):
return len(self.parallel_devices) if self.parallel_devices is not None else 0

@property
def distributed_sampler_kwargs(self):
distributed_sampler_kwargs = dict(num_replicas=(self.num_nodes * self.num_processes), rank=self.global_rank)
Expand Down
8 changes: 8 additions & 0 deletions pytorch_lightning/strategies/parallel.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,14 @@ def world_size(self) -> int:
def is_global_zero(self) -> bool:
return self.global_rank == 0

@property
def parallel_devices(self):
return self._parallel_devices

@parallel_devices.setter
def parallel_devices(self, parallel_devices):
self._parallel_devices = parallel_devices

@property
def distributed_sampler_kwargs(self):
distributed_sampler_kwargs = dict(num_replicas=len(self.parallel_devices), rank=self.global_rank)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -759,8 +759,6 @@ def resolve_strategy(self, training_type: Strategy) -> Strategy:
# necessary for when the user has passed in a plugin
if hasattr(training_type, "parallel_devices") and getattr(training_type, "parallel_devices") is None:
training_type.parallel_devices = self.parallel_devices
if hasattr(training_type, "num_processes"):
training_type.num_processes = len(self.parallel_devices)

if hasattr(training_type, "cluster_environment") and getattr(training_type, "cluster_environment") is None:
# transfer ownership of the cluster environment to the training type
Expand Down