2021-01-31 12:48:14 +00:00
|
|
|
# Copyright The PyTorch Lightning team.
|
|
|
|
#
|
|
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
# you may not use this file except in compliance with the License.
|
|
|
|
# You may obtain a copy of the License at
|
|
|
|
#
|
|
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
#
|
|
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
# See the License for the specific language governing permissions and
|
|
|
|
# limitations under the License.
|
|
|
|
from contextlib import ExitStack
|
2022-02-17 23:38:39 +00:00
|
|
|
from typing import Any, Dict, List, Optional, Tuple, Union
|
2021-01-31 12:48:14 +00:00
|
|
|
|
|
|
|
import torch
|
2021-07-21 08:11:26 +00:00
|
|
|
import torch.nn as nn
|
|
|
|
from torch.optim import Optimizer
|
2021-01-31 12:48:14 +00:00
|
|
|
|
2021-11-30 08:31:23 +00:00
|
|
|
import pytorch_lightning as pl
|
2021-01-31 12:48:14 +00:00
|
|
|
from pytorch_lightning.core.optimizer import LightningOptimizer
|
2021-08-13 16:35:31 +00:00
|
|
|
from pytorch_lightning.plugins.io.checkpoint_plugin import CheckpointIO
|
2021-11-19 00:39:01 +00:00
|
|
|
from pytorch_lightning.plugins.precision import PrecisionPlugin
|
2021-12-22 20:23:30 +00:00
|
|
|
from pytorch_lightning.strategies.parallel import ParallelStrategy
|
2021-07-21 08:11:26 +00:00
|
|
|
from pytorch_lightning.utilities.distributed import distributed_available
|
|
|
|
from pytorch_lightning.utilities.distributed import group as dist_group
|
2022-02-07 08:09:55 +00:00
|
|
|
from pytorch_lightning.utilities.distributed import ReduceOp
|
2022-02-19 01:54:04 +00:00
|
|
|
from pytorch_lightning.utilities.exceptions import MisconfigurationException
|
2022-02-07 08:09:55 +00:00
|
|
|
from pytorch_lightning.utilities.imports import _HOROVOD_AVAILABLE
|
|
|
|
from pytorch_lightning.utilities.rank_zero import rank_zero_only
|
2021-01-31 12:48:14 +00:00
|
|
|
|
|
|
|
if _HOROVOD_AVAILABLE:
|
|
|
|
import horovod.torch as hvd
|
|
|
|
|
|
|
|
|
2021-12-22 01:09:17 +00:00
|
|
|
class HorovodStrategy(ParallelStrategy):
|
2021-07-26 11:37:35 +00:00
|
|
|
"""Plugin for Horovod distributed training integration."""
|
2021-01-31 12:48:14 +00:00
|
|
|
|
2022-02-17 23:38:39 +00:00
|
|
|
strategy_name = "horovod"
|
2021-11-01 11:41:57 +00:00
|
|
|
|
2021-08-13 16:35:31 +00:00
|
|
|
def __init__(
|
|
|
|
self,
|
2021-12-16 04:41:34 +00:00
|
|
|
accelerator: Optional["pl.accelerators.accelerator.Accelerator"] = None,
|
2021-08-13 16:35:31 +00:00
|
|
|
parallel_devices: Optional[List[torch.device]] = None,
|
|
|
|
checkpoint_io: Optional[CheckpointIO] = None,
|
2021-11-19 00:39:01 +00:00
|
|
|
precision_plugin: Optional[PrecisionPlugin] = None,
|
2021-08-13 16:35:31 +00:00
|
|
|
):
|
2021-11-19 00:39:01 +00:00
|
|
|
super().__init__(
|
2021-12-16 04:41:34 +00:00
|
|
|
accelerator=accelerator,
|
2021-11-19 00:39:01 +00:00
|
|
|
parallel_devices=parallel_devices,
|
|
|
|
cluster_environment=None,
|
|
|
|
checkpoint_io=checkpoint_io,
|
|
|
|
precision_plugin=precision_plugin,
|
|
|
|
)
|
2021-04-13 18:07:40 +00:00
|
|
|
rank_zero_only.rank = self.global_rank
|
2021-12-08 14:02:26 +00:00
|
|
|
self._exit_stack: Optional[ExitStack] = None
|
2021-04-13 18:07:40 +00:00
|
|
|
|
|
|
|
@property
|
|
|
|
def global_rank(self) -> int:
|
|
|
|
return hvd.rank()
|
|
|
|
|
|
|
|
@property
|
|
|
|
def local_rank(self) -> int:
|
|
|
|
return hvd.local_rank()
|
|
|
|
|
|
|
|
@property
|
|
|
|
def world_size(self) -> int:
|
|
|
|
return hvd.size()
|
2021-01-31 12:48:14 +00:00
|
|
|
|
|
|
|
@property
|
|
|
|
def root_device(self):
|
|
|
|
return self.parallel_devices[self.local_rank]
|
|
|
|
|
|
|
|
@property
|
|
|
|
def distributed_sampler_kwargs(self):
|
2021-04-13 18:07:40 +00:00
|
|
|
distributed_sampler_kwargs = dict(num_replicas=self.world_size, rank=self.global_rank)
|
2021-01-31 12:48:14 +00:00
|
|
|
return distributed_sampler_kwargs
|
|
|
|
|
2022-02-19 01:54:04 +00:00
|
|
|
@property
|
|
|
|
def handles_gradient_accumulation(self) -> bool:
|
|
|
|
"""Whether the plugin handles gradient accumulation internally."""
|
|
|
|
return True
|
|
|
|
|
2021-11-30 08:31:23 +00:00
|
|
|
def setup(self, trainer: "pl.Trainer") -> None:
|
2021-01-31 12:48:14 +00:00
|
|
|
self.model_to_device()
|
2021-12-20 16:41:22 +00:00
|
|
|
|
2021-11-30 08:31:23 +00:00
|
|
|
super().setup(trainer)
|
2021-01-31 12:48:14 +00:00
|
|
|
|
2021-12-08 14:02:26 +00:00
|
|
|
self._exit_stack = ExitStack()
|
|
|
|
self._exit_stack.__enter__()
|
|
|
|
|
2022-02-17 05:58:54 +00:00
|
|
|
if not trainer.training:
|
2021-07-21 08:11:26 +00:00
|
|
|
# no need to setup optimizers
|
|
|
|
return
|
|
|
|
|
2021-01-31 12:48:14 +00:00
|
|
|
def _unpack_lightning_optimizer(opt):
|
|
|
|
return opt._optimizer if isinstance(opt, LightningOptimizer) else opt
|
|
|
|
|
2021-11-30 08:31:23 +00:00
|
|
|
optimizers = self.optimizers
|
2021-01-31 12:48:14 +00:00
|
|
|
optimizers = [_unpack_lightning_optimizer(opt) for opt in optimizers]
|
|
|
|
|
|
|
|
# Horovod: scale the learning rate by the number of workers to account for
|
|
|
|
# increased total batch size
|
|
|
|
for optimizer in optimizers:
|
|
|
|
for param_group in optimizer.param_groups:
|
2021-04-13 18:07:40 +00:00
|
|
|
param_group["lr"] *= self.world_size
|
2021-01-31 12:48:14 +00:00
|
|
|
|
|
|
|
# Horovod: adjust base LR used by schedulers to match scaled optimizer initial LR
|
2022-02-02 22:10:01 +00:00
|
|
|
lr_scheduler_configs = self.lr_scheduler_configs
|
2022-01-18 19:23:32 +00:00
|
|
|
for config in lr_scheduler_configs:
|
|
|
|
scheduler = config.scheduler
|
2022-01-12 03:53:49 +00:00
|
|
|
scheduler.base_lrs = [lr * self.world_size for lr in scheduler.base_lrs]
|
2021-01-31 12:48:14 +00:00
|
|
|
|
|
|
|
# Horovod: broadcast parameters & optimizer state to ensure consistent initialization
|
|
|
|
hvd.broadcast_parameters(self.lightning_module.state_dict(), root_rank=0)
|
|
|
|
for optimizer in optimizers:
|
|
|
|
hvd.broadcast_optimizer_state(optimizer, root_rank=0)
|
|
|
|
|
2022-02-19 01:54:04 +00:00
|
|
|
accumulation_scheduler = trainer.accumulation_scheduler
|
|
|
|
if accumulation_scheduler.epochs != [0]:
|
|
|
|
raise MisconfigurationException(
|
|
|
|
"Horovod currently does not support different `accumulate_grad_batches` at different epochs."
|
|
|
|
)
|
|
|
|
|
|
|
|
self.optimizers = self._wrap_optimizers(optimizers, trainer.accumulate_grad_batches)
|
2021-12-08 14:02:26 +00:00
|
|
|
for optimizer in self.optimizers:
|
|
|
|
# Synchronization will be performed explicitly following backward()
|
|
|
|
self._exit_stack.enter_context(optimizer.skip_synchronize())
|
2021-02-16 22:11:56 +00:00
|
|
|
|
2021-01-31 12:48:14 +00:00
|
|
|
def barrier(self, *args, **kwargs):
|
2021-06-30 11:04:24 +00:00
|
|
|
if distributed_available():
|
2021-04-13 16:44:41 +00:00
|
|
|
self.join()
|
2021-01-31 12:48:14 +00:00
|
|
|
|
|
|
|
def broadcast(self, obj: object, src: int = 0) -> object:
|
|
|
|
obj = hvd.broadcast_object(obj, src)
|
|
|
|
return obj
|
|
|
|
|
|
|
|
def model_to_device(self):
|
2022-01-19 21:27:12 +00:00
|
|
|
if self.root_device.type == "cuda":
|
2021-07-07 17:56:13 +00:00
|
|
|
# this can potentially be removed after #8312. Not done due to lack of horovod testing
|
2021-01-31 12:48:14 +00:00
|
|
|
torch.cuda.set_device(self.root_device)
|
|
|
|
self.model.to(self.root_device)
|
|
|
|
|
2021-04-13 16:44:41 +00:00
|
|
|
def join(self):
|
2022-01-19 21:27:12 +00:00
|
|
|
if self.root_device.type == "cuda":
|
2021-04-13 16:44:41 +00:00
|
|
|
hvd.join(self.local_rank)
|
|
|
|
else:
|
|
|
|
hvd.join()
|
|
|
|
|
2021-02-20 12:30:21 +00:00
|
|
|
def reduce(self, tensor, group: Optional[Any] = None, reduce_op: Optional[Union[ReduceOp, str]] = "mean"):
|
2021-09-06 12:49:09 +00:00
|
|
|
"""Reduces a tensor from several distributed processes to one aggregated tensor.
|
2021-02-20 12:30:21 +00:00
|
|
|
|
|
|
|
Args:
|
|
|
|
tensor: the tensor to sync and reduce
|
|
|
|
group: the process group to gather results from. Defaults to all processes (world)
|
|
|
|
reduce_op: the reduction operation. Defaults to 'mean'/'avg'.
|
|
|
|
Can also be a string 'sum' to calculate the sum during reduction.
|
|
|
|
|
|
|
|
Return:
|
|
|
|
reduced value, except when the input was not a tensor the output remains is unchanged
|
|
|
|
"""
|
2021-01-31 12:48:14 +00:00
|
|
|
if group is not None:
|
2021-07-26 11:37:35 +00:00
|
|
|
raise ValueError("Horovod does not support allreduce using a subcommunicator at this time. Unset `group`.")
|
2021-01-31 12:48:14 +00:00
|
|
|
|
2021-02-20 12:30:21 +00:00
|
|
|
if reduce_op in (None, "avg", "mean"):
|
2021-01-31 12:48:14 +00:00
|
|
|
reduce_op = hvd.Average
|
2021-04-13 09:18:52 +00:00
|
|
|
elif reduce_op in ("sum", ReduceOp.SUM):
|
2021-02-20 12:30:21 +00:00
|
|
|
reduce_op = hvd.Sum
|
2021-01-31 12:48:14 +00:00
|
|
|
else:
|
|
|
|
raise ValueError(f"unrecognized `reduce_op`: {reduce_op}")
|
|
|
|
|
|
|
|
# sync all processes before reduction
|
2021-04-13 16:44:41 +00:00
|
|
|
self.join()
|
2021-02-20 12:30:21 +00:00
|
|
|
return hvd.allreduce(tensor, op=reduce_op)
|
2021-01-31 12:48:14 +00:00
|
|
|
|
2021-03-14 17:14:27 +00:00
|
|
|
def all_gather(
|
2021-09-27 15:55:20 +00:00
|
|
|
self, result: torch.Tensor, group: Optional[Any] = dist_group.WORLD, sync_grads: bool = False
|
2021-03-14 17:14:27 +00:00
|
|
|
) -> torch.Tensor:
|
2021-07-21 08:11:26 +00:00
|
|
|
if group is not None and group != dist_group.WORLD:
|
2021-07-26 11:37:35 +00:00
|
|
|
raise ValueError("Horovod does not support allgather using a subcommunicator at this time. Unset `group`.")
|
2021-01-31 12:48:14 +00:00
|
|
|
|
|
|
|
if len(result.shape) == 0:
|
|
|
|
# Convert scalars to single dimension tensors
|
|
|
|
result = result.reshape(1)
|
|
|
|
|
|
|
|
# sync and gather all
|
2021-04-13 16:44:41 +00:00
|
|
|
self.join()
|
2021-09-27 15:55:20 +00:00
|
|
|
return hvd.allgather(result)
|
[accelerator][FeatBugFix] Improve manual optimization API (#5771)
* fix trainer.model access
* move properties
* fix test_transfer_batch_hook
* fix auto_select_gpus
* fix omegaconf test
* fix test that needs to simulate slurm ddp
* add horovod plugin
* fix test with named arguments
* clean up whitespace
* fix datamodules test
* remove old accelerators
* fix naming
* move old plugins
* move to plugins
* create precision subpackage
* create training_type subpackage
* fix all new import errors
* fix wrong arguments order passed to test
* fix LR finder
* Added sharded training type and amp plugin
* Move clip grad to precision plugin
* Added sharded spawn, select accelerators based on distributed_backend + enable custom fp16 plugin automatically
* Fix import issue, attempting to fix tests
* Fix initial test
* Reflect hook logic from master, should wrap model after move to device
* Optional state consolidation, since master has optimizers not wrapped
* change attribute for instance test
* reset optimizers
optimizers are not used in main process, so state would be wrong.
* legacy
* imports in accel
* legacy2
* trainer imports
* fix import errors after rebase
* move hook to new setup location
* provide unwrapping logic
* fix trainer callback system
* added ddp2 implementation
* fix imports .legacy
* move plugins
* restore legacy
* drop test.py from root
* add tpu accelerator and plugins
* fixes
* fix lightning optimizer merge
* reset bugreportmodel
* unwrapping
* step routing forward
* model access
* unwrap
* opt
* integrate distrib_type
* sync changes
* sync
* fixes
* add forgotten generators
* add missing logic
* update
* import
* missed imports
* import fixes
* isort
* mv f
* changelog
* format
* move helper to parallel plugin
* d
* add world size
* clean up
* duplicate
* activate ddp_sharded and tpu
* set nvidia flags
* remove unused colab var
* use_tpu <-> on_tpu attrs
* make some ddp_cpu and clusterplugin tests pass
* Ref/accelerator connector (#5742)
* final cleanup
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* connector cleanup
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* trainer cleanup
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* accelerator cleanup + missing logic in accelerator connector
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* add missing changes to callbacks
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* reflect accelerator changes to lightning module
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* clean cluster envs
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* cleanup plugins
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* add broadcasting
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* yapf
* remove plugin connector
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* plugins
* manual optimization
* update optimizer routing
* add rank to torchelastic
* fix memory mixed precision
* setstate on trainer for pickling in ddp spawn
* add predict method
* add back commented accelerator code
* adapt test for sync_batch_norm to new plugin
* fix deprecated tests
* fix ddp cpu choice when no num_processes are given
* yapf format
* skip a memory test that cannot pass anymore
* update on comments
* fix pickle error in spawn plugin
* x
* avoid
* x
* fix cyclic import in docs build
* add support for sharded
* update typing
* add sharded and sharded_spawn to distributed types
* make unwrap model default
* refactor LightningShardedDataParallel similar to LightningDistributedDataParallel
* update sharded spawn to reflect changes
* update sharded to reflect changes
* Merge 1.1.5 changes
* fix merge
* fix merge
* yapf isort
* fix merge
* yapf isort
* fix indentation in test
* copy over reinit scheduler implementation from dev1.2
* fix apex tracking calls with dev_debugger
* reduce diff to dev1.2, clean up
* fix trainer config test when gpus>0 and num_processes >0 and ddp_cpu
* sort plugin tests legacy/new
* fix error handling for amp on cpu
* fix merge
fix merge
fix merge
* [Feat] Resolve manual_backward (#5837)
* resolve manual_backward
* resolve flake8
* update
* resolve for ddp_spawn
* resolve flake8
* resolve flake8
* resolve flake8
Co-authored-by: Ubuntu <ubuntu@ip-172-31-88-60.ec2.internal>
* fix tests/accelerator tests on cpu
* [BugFix] Resolve manual optimization (#5852)
* resolve manual_optimization
* update
* update
Co-authored-by: Ubuntu <ubuntu@ip-172-31-88-60.ec2.internal>
* Remove copy trainer parameters to happen earlier within the loop and add safe guard to get ref model (#5856)
* resovle a bug
* Accelerator refactor sharded rpc (#5854)
* rpc branch
* merge
* update handling of rpc
* make devices etc. Optional in RPC
* set devices etc. later if necessary
* remove devices from sequential
* make devices optional in rpc
* fix import
* uncomment everything
* fix cluster selection
Co-authored-by: Ubuntu <ubuntu@ip-172-31-88-60.ec2.internal>
* resolve bug
* fix assert in rpc test
* resolve a test
* fix docs compilation
* accelerator refactor - fix for sharded parity test (#5866)
* fix memory issue with ddp_spawn
* x
x
x
x
x
x
x
x
x
* x
* Remove DDP2 as this does not apply
* Add missing pre optimizer hook to ensure lambda closure is called
* fix apex docstring
* [accelerator][BugFix] Resolve some test for 1 gpu (#5863)
* update
* revert init
* resolve a bug
* update
* resolve flake8
* update
* update
* update
* revert init
* resolve a bug
* update
* resolve flake8
* update
* update
* update
* update
* update
* revert init
* resolve a bug
* update
* resolve flake8
* update
* update
* update
* revert init
* update
* resolve flake8
* update
* update
* update
* update
* update
* all_gather
* update
* make plugins work, add misconfig for RPC
* update
* update
* remove breaking test
* resolve some tests
* resolve flake8
* revert to ddp_spawn
Co-authored-by: root <root@ip-172-31-88-60.ec2.internal>
Co-authored-by: Ubuntu <ubuntu@ip-172-31-88-60.ec2.internal>
Co-authored-by: Justus Schock <justus.schock@rwth-aachen.de>
* yapf isort
* resolve flake8
* fix apex doctests
* fix apex doctests 2
* resolve docs
* update drone
* clean env
* update
* update
* update
* update
* merge
* Fix RPC related tests, clean out old API, update for new accelerator API [skip ci] (#5881)
* Fix RPC related tests, clean out old API, update for new accelerator API
* Move tests out of legacy folder, update paths and names
* Update test_remove_1-4.py
* Expose properties for tpu cores/gpus/num_gpus
* Add root GPU property
* Move properties to properties.py
* move tests that were previously in drone
* Fix root GPU property (#5908)
* Move root GPU to property, remove horovod set as this is handled in horovod plugin, ensure we mock correctly to set GPU accelerator
* Add missing tests back
* fix best model path transfer when no checkpoint callback available
* Fix setup hook order [wip] (#5858)
* Call trainer setup hook before accelerator setup
* Add test case
* add new test
* typo
* fix callback order in test
Co-authored-by: tchaton <thomas@grid.ai>
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* rename ddp sequential -> rpc sequential for special test
* revert
* fix stupid merge problem
* Use property in connector for sampler (#5913)
* merge the import conflicts
* fix spawning of processes in slurm
* [wip] Fix some bugs for TPU [skip ci] (#5878)
* fixed for single tpu
* fixed spawn
* fixed spawn
* update
* update
* wip
* resolve bugs
* resolve bug
* update on comment
* removed decorator
* resolve comments
* set to 4
* update
* update
* need cleaning
* update
* update
* update
* resolve flake8
* resolve bugs
* exclude broadcast
* resolve bugs
* change test
* update
* update
* skip if meet fails
* properly raise trace
* update
* add catch
* wrap test
* resolve typo
* update
* typo
Co-authored-by: Lezwon Castelino <lezwon@gmail.com>
Co-authored-by: Your Name <you@example.com>
* resolve some tests
* update
* fix imports
* update
* resolve flake8
* update azure pipeline
* skip a sharded test on cpu that requires a gpu
* resolve tpus
* resolve bug
* resolve flake8
* update
* updat utils
* revert permission change on files
* suggestions from carlos
Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com>
* remove unrelated formatting changes
* remove incomplete comment
* Update pytorch_lightning/accelerators/__init__.py
Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com>
* remove unrelated formatting change
* add types
* warn 1.7 ddp manual backward only if ddp kwarg unset
* yapf + isort
* pep8 unused imports
* fix cyclic import in docs
* Apply suggestions from code review
* typer in accelerator.py
* typo
* Apply suggestions from code review
* formatting
* update on comments
* update typo
* Update pytorch_lightning/trainer/properties.py
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* update
* update on comments
* resolve some comments
* update on comments
* resolve test
* add toggle_model
* update
* update on comments
* update doc
* typo
* update
* typo
* remove space
* update
* update on comments
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
Co-authored-by: justusschock <justus.schock@posteo.de>
Co-authored-by: SeanNaren <sean@grid.ai>
Co-authored-by: Justus Schock <12886177+justusschock@users.noreply.github.com>
Co-authored-by: Jirka Borovec <jirka.borovec@seznam.cz>
Co-authored-by: Justus Schock <justus.schock@rwth-aachen.de>
Co-authored-by: Ubuntu <ubuntu@ip-172-31-88-60.ec2.internal>
Co-authored-by: Sean Naren <sean.narenthiran@gmail.com>
Co-authored-by: root <root@ip-172-31-88-60.ec2.internal>
Co-authored-by: Lezwon Castelino <lezwon@gmail.com>
Co-authored-by: Your Name <you@example.com>
Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com>
Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2021-02-16 21:00:35 +00:00
|
|
|
|
2021-07-08 14:02:09 +00:00
|
|
|
def post_backward(self, closure_loss: torch.Tensor) -> None:
|
[accelerator][FeatBugFix] Improve manual optimization API (#5771)
* fix trainer.model access
* move properties
* fix test_transfer_batch_hook
* fix auto_select_gpus
* fix omegaconf test
* fix test that needs to simulate slurm ddp
* add horovod plugin
* fix test with named arguments
* clean up whitespace
* fix datamodules test
* remove old accelerators
* fix naming
* move old plugins
* move to plugins
* create precision subpackage
* create training_type subpackage
* fix all new import errors
* fix wrong arguments order passed to test
* fix LR finder
* Added sharded training type and amp plugin
* Move clip grad to precision plugin
* Added sharded spawn, select accelerators based on distributed_backend + enable custom fp16 plugin automatically
* Fix import issue, attempting to fix tests
* Fix initial test
* Reflect hook logic from master, should wrap model after move to device
* Optional state consolidation, since master has optimizers not wrapped
* change attribute for instance test
* reset optimizers
optimizers are not used in main process, so state would be wrong.
* legacy
* imports in accel
* legacy2
* trainer imports
* fix import errors after rebase
* move hook to new setup location
* provide unwrapping logic
* fix trainer callback system
* added ddp2 implementation
* fix imports .legacy
* move plugins
* restore legacy
* drop test.py from root
* add tpu accelerator and plugins
* fixes
* fix lightning optimizer merge
* reset bugreportmodel
* unwrapping
* step routing forward
* model access
* unwrap
* opt
* integrate distrib_type
* sync changes
* sync
* fixes
* add forgotten generators
* add missing logic
* update
* import
* missed imports
* import fixes
* isort
* mv f
* changelog
* format
* move helper to parallel plugin
* d
* add world size
* clean up
* duplicate
* activate ddp_sharded and tpu
* set nvidia flags
* remove unused colab var
* use_tpu <-> on_tpu attrs
* make some ddp_cpu and clusterplugin tests pass
* Ref/accelerator connector (#5742)
* final cleanup
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* connector cleanup
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* trainer cleanup
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* accelerator cleanup + missing logic in accelerator connector
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* add missing changes to callbacks
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* reflect accelerator changes to lightning module
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* clean cluster envs
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* cleanup plugins
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* add broadcasting
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* yapf
* remove plugin connector
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* plugins
* manual optimization
* update optimizer routing
* add rank to torchelastic
* fix memory mixed precision
* setstate on trainer for pickling in ddp spawn
* add predict method
* add back commented accelerator code
* adapt test for sync_batch_norm to new plugin
* fix deprecated tests
* fix ddp cpu choice when no num_processes are given
* yapf format
* skip a memory test that cannot pass anymore
* update on comments
* fix pickle error in spawn plugin
* x
* avoid
* x
* fix cyclic import in docs build
* add support for sharded
* update typing
* add sharded and sharded_spawn to distributed types
* make unwrap model default
* refactor LightningShardedDataParallel similar to LightningDistributedDataParallel
* update sharded spawn to reflect changes
* update sharded to reflect changes
* Merge 1.1.5 changes
* fix merge
* fix merge
* yapf isort
* fix merge
* yapf isort
* fix indentation in test
* copy over reinit scheduler implementation from dev1.2
* fix apex tracking calls with dev_debugger
* reduce diff to dev1.2, clean up
* fix trainer config test when gpus>0 and num_processes >0 and ddp_cpu
* sort plugin tests legacy/new
* fix error handling for amp on cpu
* fix merge
fix merge
fix merge
* [Feat] Resolve manual_backward (#5837)
* resolve manual_backward
* resolve flake8
* update
* resolve for ddp_spawn
* resolve flake8
* resolve flake8
* resolve flake8
Co-authored-by: Ubuntu <ubuntu@ip-172-31-88-60.ec2.internal>
* fix tests/accelerator tests on cpu
* [BugFix] Resolve manual optimization (#5852)
* resolve manual_optimization
* update
* update
Co-authored-by: Ubuntu <ubuntu@ip-172-31-88-60.ec2.internal>
* Remove copy trainer parameters to happen earlier within the loop and add safe guard to get ref model (#5856)
* resovle a bug
* Accelerator refactor sharded rpc (#5854)
* rpc branch
* merge
* update handling of rpc
* make devices etc. Optional in RPC
* set devices etc. later if necessary
* remove devices from sequential
* make devices optional in rpc
* fix import
* uncomment everything
* fix cluster selection
Co-authored-by: Ubuntu <ubuntu@ip-172-31-88-60.ec2.internal>
* resolve bug
* fix assert in rpc test
* resolve a test
* fix docs compilation
* accelerator refactor - fix for sharded parity test (#5866)
* fix memory issue with ddp_spawn
* x
x
x
x
x
x
x
x
x
* x
* Remove DDP2 as this does not apply
* Add missing pre optimizer hook to ensure lambda closure is called
* fix apex docstring
* [accelerator][BugFix] Resolve some test for 1 gpu (#5863)
* update
* revert init
* resolve a bug
* update
* resolve flake8
* update
* update
* update
* revert init
* resolve a bug
* update
* resolve flake8
* update
* update
* update
* update
* update
* revert init
* resolve a bug
* update
* resolve flake8
* update
* update
* update
* revert init
* update
* resolve flake8
* update
* update
* update
* update
* update
* all_gather
* update
* make plugins work, add misconfig for RPC
* update
* update
* remove breaking test
* resolve some tests
* resolve flake8
* revert to ddp_spawn
Co-authored-by: root <root@ip-172-31-88-60.ec2.internal>
Co-authored-by: Ubuntu <ubuntu@ip-172-31-88-60.ec2.internal>
Co-authored-by: Justus Schock <justus.schock@rwth-aachen.de>
* yapf isort
* resolve flake8
* fix apex doctests
* fix apex doctests 2
* resolve docs
* update drone
* clean env
* update
* update
* update
* update
* merge
* Fix RPC related tests, clean out old API, update for new accelerator API [skip ci] (#5881)
* Fix RPC related tests, clean out old API, update for new accelerator API
* Move tests out of legacy folder, update paths and names
* Update test_remove_1-4.py
* Expose properties for tpu cores/gpus/num_gpus
* Add root GPU property
* Move properties to properties.py
* move tests that were previously in drone
* Fix root GPU property (#5908)
* Move root GPU to property, remove horovod set as this is handled in horovod plugin, ensure we mock correctly to set GPU accelerator
* Add missing tests back
* fix best model path transfer when no checkpoint callback available
* Fix setup hook order [wip] (#5858)
* Call trainer setup hook before accelerator setup
* Add test case
* add new test
* typo
* fix callback order in test
Co-authored-by: tchaton <thomas@grid.ai>
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* rename ddp sequential -> rpc sequential for special test
* revert
* fix stupid merge problem
* Use property in connector for sampler (#5913)
* merge the import conflicts
* fix spawning of processes in slurm
* [wip] Fix some bugs for TPU [skip ci] (#5878)
* fixed for single tpu
* fixed spawn
* fixed spawn
* update
* update
* wip
* resolve bugs
* resolve bug
* update on comment
* removed decorator
* resolve comments
* set to 4
* update
* update
* need cleaning
* update
* update
* update
* resolve flake8
* resolve bugs
* exclude broadcast
* resolve bugs
* change test
* update
* update
* skip if meet fails
* properly raise trace
* update
* add catch
* wrap test
* resolve typo
* update
* typo
Co-authored-by: Lezwon Castelino <lezwon@gmail.com>
Co-authored-by: Your Name <you@example.com>
* resolve some tests
* update
* fix imports
* update
* resolve flake8
* update azure pipeline
* skip a sharded test on cpu that requires a gpu
* resolve tpus
* resolve bug
* resolve flake8
* update
* updat utils
* revert permission change on files
* suggestions from carlos
Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com>
* remove unrelated formatting changes
* remove incomplete comment
* Update pytorch_lightning/accelerators/__init__.py
Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com>
* remove unrelated formatting change
* add types
* warn 1.7 ddp manual backward only if ddp kwarg unset
* yapf + isort
* pep8 unused imports
* fix cyclic import in docs
* Apply suggestions from code review
* typer in accelerator.py
* typo
* Apply suggestions from code review
* formatting
* update on comments
* update typo
* Update pytorch_lightning/trainer/properties.py
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* update
* update on comments
* resolve some comments
* update on comments
* resolve test
* add toggle_model
* update
* update on comments
* update doc
* typo
* update
* typo
* remove space
* update
* update on comments
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
Co-authored-by: justusschock <justus.schock@posteo.de>
Co-authored-by: SeanNaren <sean@grid.ai>
Co-authored-by: Justus Schock <12886177+justusschock@users.noreply.github.com>
Co-authored-by: Jirka Borovec <jirka.borovec@seznam.cz>
Co-authored-by: Justus Schock <justus.schock@rwth-aachen.de>
Co-authored-by: Ubuntu <ubuntu@ip-172-31-88-60.ec2.internal>
Co-authored-by: Sean Naren <sean.narenthiran@gmail.com>
Co-authored-by: root <root@ip-172-31-88-60.ec2.internal>
Co-authored-by: Lezwon Castelino <lezwon@gmail.com>
Co-authored-by: Your Name <you@example.com>
Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com>
Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2021-02-16 21:00:35 +00:00
|
|
|
# synchronize all horovod optimizers.
|
2022-02-05 09:04:55 +00:00
|
|
|
for optimizer in self.optimizers:
|
[accelerator][FeatBugFix] Improve manual optimization API (#5771)
* fix trainer.model access
* move properties
* fix test_transfer_batch_hook
* fix auto_select_gpus
* fix omegaconf test
* fix test that needs to simulate slurm ddp
* add horovod plugin
* fix test with named arguments
* clean up whitespace
* fix datamodules test
* remove old accelerators
* fix naming
* move old plugins
* move to plugins
* create precision subpackage
* create training_type subpackage
* fix all new import errors
* fix wrong arguments order passed to test
* fix LR finder
* Added sharded training type and amp plugin
* Move clip grad to precision plugin
* Added sharded spawn, select accelerators based on distributed_backend + enable custom fp16 plugin automatically
* Fix import issue, attempting to fix tests
* Fix initial test
* Reflect hook logic from master, should wrap model after move to device
* Optional state consolidation, since master has optimizers not wrapped
* change attribute for instance test
* reset optimizers
optimizers are not used in main process, so state would be wrong.
* legacy
* imports in accel
* legacy2
* trainer imports
* fix import errors after rebase
* move hook to new setup location
* provide unwrapping logic
* fix trainer callback system
* added ddp2 implementation
* fix imports .legacy
* move plugins
* restore legacy
* drop test.py from root
* add tpu accelerator and plugins
* fixes
* fix lightning optimizer merge
* reset bugreportmodel
* unwrapping
* step routing forward
* model access
* unwrap
* opt
* integrate distrib_type
* sync changes
* sync
* fixes
* add forgotten generators
* add missing logic
* update
* import
* missed imports
* import fixes
* isort
* mv f
* changelog
* format
* move helper to parallel plugin
* d
* add world size
* clean up
* duplicate
* activate ddp_sharded and tpu
* set nvidia flags
* remove unused colab var
* use_tpu <-> on_tpu attrs
* make some ddp_cpu and clusterplugin tests pass
* Ref/accelerator connector (#5742)
* final cleanup
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* connector cleanup
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* trainer cleanup
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* accelerator cleanup + missing logic in accelerator connector
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* add missing changes to callbacks
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* reflect accelerator changes to lightning module
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* clean cluster envs
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* cleanup plugins
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* add broadcasting
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* yapf
* remove plugin connector
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* plugins
* manual optimization
* update optimizer routing
* add rank to torchelastic
* fix memory mixed precision
* setstate on trainer for pickling in ddp spawn
* add predict method
* add back commented accelerator code
* adapt test for sync_batch_norm to new plugin
* fix deprecated tests
* fix ddp cpu choice when no num_processes are given
* yapf format
* skip a memory test that cannot pass anymore
* update on comments
* fix pickle error in spawn plugin
* x
* avoid
* x
* fix cyclic import in docs build
* add support for sharded
* update typing
* add sharded and sharded_spawn to distributed types
* make unwrap model default
* refactor LightningShardedDataParallel similar to LightningDistributedDataParallel
* update sharded spawn to reflect changes
* update sharded to reflect changes
* Merge 1.1.5 changes
* fix merge
* fix merge
* yapf isort
* fix merge
* yapf isort
* fix indentation in test
* copy over reinit scheduler implementation from dev1.2
* fix apex tracking calls with dev_debugger
* reduce diff to dev1.2, clean up
* fix trainer config test when gpus>0 and num_processes >0 and ddp_cpu
* sort plugin tests legacy/new
* fix error handling for amp on cpu
* fix merge
fix merge
fix merge
* [Feat] Resolve manual_backward (#5837)
* resolve manual_backward
* resolve flake8
* update
* resolve for ddp_spawn
* resolve flake8
* resolve flake8
* resolve flake8
Co-authored-by: Ubuntu <ubuntu@ip-172-31-88-60.ec2.internal>
* fix tests/accelerator tests on cpu
* [BugFix] Resolve manual optimization (#5852)
* resolve manual_optimization
* update
* update
Co-authored-by: Ubuntu <ubuntu@ip-172-31-88-60.ec2.internal>
* Remove copy trainer parameters to happen earlier within the loop and add safe guard to get ref model (#5856)
* resovle a bug
* Accelerator refactor sharded rpc (#5854)
* rpc branch
* merge
* update handling of rpc
* make devices etc. Optional in RPC
* set devices etc. later if necessary
* remove devices from sequential
* make devices optional in rpc
* fix import
* uncomment everything
* fix cluster selection
Co-authored-by: Ubuntu <ubuntu@ip-172-31-88-60.ec2.internal>
* resolve bug
* fix assert in rpc test
* resolve a test
* fix docs compilation
* accelerator refactor - fix for sharded parity test (#5866)
* fix memory issue with ddp_spawn
* x
x
x
x
x
x
x
x
x
* x
* Remove DDP2 as this does not apply
* Add missing pre optimizer hook to ensure lambda closure is called
* fix apex docstring
* [accelerator][BugFix] Resolve some test for 1 gpu (#5863)
* update
* revert init
* resolve a bug
* update
* resolve flake8
* update
* update
* update
* revert init
* resolve a bug
* update
* resolve flake8
* update
* update
* update
* update
* update
* revert init
* resolve a bug
* update
* resolve flake8
* update
* update
* update
* revert init
* update
* resolve flake8
* update
* update
* update
* update
* update
* all_gather
* update
* make plugins work, add misconfig for RPC
* update
* update
* remove breaking test
* resolve some tests
* resolve flake8
* revert to ddp_spawn
Co-authored-by: root <root@ip-172-31-88-60.ec2.internal>
Co-authored-by: Ubuntu <ubuntu@ip-172-31-88-60.ec2.internal>
Co-authored-by: Justus Schock <justus.schock@rwth-aachen.de>
* yapf isort
* resolve flake8
* fix apex doctests
* fix apex doctests 2
* resolve docs
* update drone
* clean env
* update
* update
* update
* update
* merge
* Fix RPC related tests, clean out old API, update for new accelerator API [skip ci] (#5881)
* Fix RPC related tests, clean out old API, update for new accelerator API
* Move tests out of legacy folder, update paths and names
* Update test_remove_1-4.py
* Expose properties for tpu cores/gpus/num_gpus
* Add root GPU property
* Move properties to properties.py
* move tests that were previously in drone
* Fix root GPU property (#5908)
* Move root GPU to property, remove horovod set as this is handled in horovod plugin, ensure we mock correctly to set GPU accelerator
* Add missing tests back
* fix best model path transfer when no checkpoint callback available
* Fix setup hook order [wip] (#5858)
* Call trainer setup hook before accelerator setup
* Add test case
* add new test
* typo
* fix callback order in test
Co-authored-by: tchaton <thomas@grid.ai>
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* rename ddp sequential -> rpc sequential for special test
* revert
* fix stupid merge problem
* Use property in connector for sampler (#5913)
* merge the import conflicts
* fix spawning of processes in slurm
* [wip] Fix some bugs for TPU [skip ci] (#5878)
* fixed for single tpu
* fixed spawn
* fixed spawn
* update
* update
* wip
* resolve bugs
* resolve bug
* update on comment
* removed decorator
* resolve comments
* set to 4
* update
* update
* need cleaning
* update
* update
* update
* resolve flake8
* resolve bugs
* exclude broadcast
* resolve bugs
* change test
* update
* update
* skip if meet fails
* properly raise trace
* update
* add catch
* wrap test
* resolve typo
* update
* typo
Co-authored-by: Lezwon Castelino <lezwon@gmail.com>
Co-authored-by: Your Name <you@example.com>
* resolve some tests
* update
* fix imports
* update
* resolve flake8
* update azure pipeline
* skip a sharded test on cpu that requires a gpu
* resolve tpus
* resolve bug
* resolve flake8
* update
* updat utils
* revert permission change on files
* suggestions from carlos
Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com>
* remove unrelated formatting changes
* remove incomplete comment
* Update pytorch_lightning/accelerators/__init__.py
Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com>
* remove unrelated formatting change
* add types
* warn 1.7 ddp manual backward only if ddp kwarg unset
* yapf + isort
* pep8 unused imports
* fix cyclic import in docs
* Apply suggestions from code review
* typer in accelerator.py
* typo
* Apply suggestions from code review
* formatting
* update on comments
* update typo
* Update pytorch_lightning/trainer/properties.py
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
* update
* update on comments
* resolve some comments
* update on comments
* resolve test
* add toggle_model
* update
* update on comments
* update doc
* typo
* update
* typo
* remove space
* update
* update on comments
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
Co-authored-by: justusschock <justus.schock@posteo.de>
Co-authored-by: SeanNaren <sean@grid.ai>
Co-authored-by: Justus Schock <12886177+justusschock@users.noreply.github.com>
Co-authored-by: Jirka Borovec <jirka.borovec@seznam.cz>
Co-authored-by: Justus Schock <justus.schock@rwth-aachen.de>
Co-authored-by: Ubuntu <ubuntu@ip-172-31-88-60.ec2.internal>
Co-authored-by: Sean Naren <sean.narenthiran@gmail.com>
Co-authored-by: root <root@ip-172-31-88-60.ec2.internal>
Co-authored-by: Lezwon Castelino <lezwon@gmail.com>
Co-authored-by: Your Name <you@example.com>
Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com>
Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2021-02-16 21:00:35 +00:00
|
|
|
optimizer.synchronize()
|
2021-07-21 08:11:26 +00:00
|
|
|
|
2022-02-19 01:54:04 +00:00
|
|
|
def _wrap_optimizers(
|
|
|
|
self, optimizers: List[Optimizer], accumulate_grad_batches: int
|
|
|
|
) -> List["hvd.DistributedOptimizer"]:
|
2021-07-26 11:37:35 +00:00
|
|
|
"""Wraps optimizers to perform gradient aggregation via allreduce."""
|
2021-07-21 08:11:26 +00:00
|
|
|
return [
|
2022-02-19 01:54:04 +00:00
|
|
|
hvd.DistributedOptimizer(
|
|
|
|
opt,
|
|
|
|
backward_passes_per_step=accumulate_grad_batches,
|
|
|
|
named_parameters=self._filter_named_parameters(self.lightning_module, opt),
|
|
|
|
)
|
2021-07-26 11:37:35 +00:00
|
|
|
if "horovod" not in str(opt.__class__)
|
|
|
|
else opt
|
|
|
|
for opt in optimizers
|
2021-07-21 08:11:26 +00:00
|
|
|
]
|
|
|
|
|
|
|
|
@staticmethod
|
|
|
|
def _filter_named_parameters(model: nn.Module, optimizer: Optimizer) -> List[Tuple[str, nn.Parameter]]:
|
2021-07-26 12:38:12 +00:00
|
|
|
opt_params = {p for group in optimizer.param_groups for p in group.get("params", [])}
|
2021-07-21 08:11:26 +00:00
|
|
|
return [(name, p) for name, p in model.named_parameters() if p in opt_params]
|
2021-08-27 00:51:05 +00:00
|
|
|
|
2022-02-17 23:38:39 +00:00
|
|
|
@classmethod
|
|
|
|
def register_strategies(cls, strategy_registry: Dict) -> None:
|
|
|
|
strategy_registry.register(
|
|
|
|
cls.strategy_name,
|
|
|
|
cls,
|
|
|
|
description=f"{cls.__class__.__name__}",
|
|
|
|
)
|
|
|
|
|
2021-08-27 00:51:05 +00:00
|
|
|
def teardown(self) -> None:
|
2021-12-06 22:27:30 +00:00
|
|
|
super().teardown()
|
2022-02-05 19:13:21 +00:00
|
|
|
# teardown may be called before `_exit_stack` is set
|
|
|
|
if self._exit_stack:
|
|
|
|
self._exit_stack.__exit__(None, None, None)
|
|
|
|
self._exit_stack = None
|
2021-12-08 14:02:26 +00:00
|
|
|
# Make sure all workers have finished training before returning to the user
|
|
|
|
self.join()
|
2022-01-19 21:27:12 +00:00
|
|
|
if self.root_device.type == "cuda":
|
2021-08-27 00:51:05 +00:00
|
|
|
# GPU teardown
|
|
|
|
self.lightning_module.cpu()
|
|
|
|
# clean up memory
|
|
|
|
torch.cuda.empty_cache()
|