2020-12-01 00:09:46 +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.
|
2021-03-04 20:11:59 +00:00
|
|
|
import gc
|
|
|
|
from typing import Any
|
2021-03-02 08:03:32 +00:00
|
|
|
from unittest.mock import DEFAULT, patch
|
2020-12-01 00:09:46 +00:00
|
|
|
|
|
|
|
import torch
|
2021-03-01 13:36:46 +00:00
|
|
|
from torch.optim import Adam, Optimizer, SGD
|
2020-12-01 00:09:46 +00:00
|
|
|
|
2020-12-21 09:15:04 +00:00
|
|
|
from pytorch_lightning import Trainer
|
2020-12-01 00:09:46 +00:00
|
|
|
from pytorch_lightning.core.optimizer import LightningOptimizer
|
2021-02-08 10:52:02 +00:00
|
|
|
from tests.helpers.boring_model import BoringModel
|
2020-12-01 00:09:46 +00:00
|
|
|
|
|
|
|
|
|
|
|
def test_lightning_optimizer(tmpdir):
|
|
|
|
"""
|
|
|
|
Test that optimizer are correctly wrapped by our LightningOptimizer
|
|
|
|
"""
|
2021-02-06 11:07:26 +00:00
|
|
|
|
2020-12-01 00:09:46 +00:00
|
|
|
class TestModel(BoringModel):
|
|
|
|
def configure_optimizers(self):
|
|
|
|
optimizer = torch.optim.SGD(self.layer.parameters(), lr=0.1)
|
|
|
|
lr_scheduler = torch.optim.lr_scheduler.StepLR(optimizer, step_size=1)
|
|
|
|
return [optimizer], [lr_scheduler]
|
|
|
|
|
|
|
|
model = TestModel()
|
|
|
|
trainer = Trainer(
|
2021-07-26 11:37:35 +00:00
|
|
|
default_root_dir=tmpdir, limit_train_batches=1, limit_val_batches=1, max_epochs=1, weights_summary=None
|
2020-12-01 00:09:46 +00:00
|
|
|
)
|
|
|
|
trainer.fit(model)
|
|
|
|
|
|
|
|
groups = "{'dampening': 0, 'initial_lr': 0.1, 'lr': 0.01, 'momentum': 0, 'nesterov': False, 'weight_decay': 0}"
|
|
|
|
expected = f"LightningSGD(groups=[{groups}])"
|
2021-01-08 21:13:12 +00:00
|
|
|
assert trainer._lightning_optimizers[0].__repr__() == expected
|
2020-12-01 00:09:46 +00:00
|
|
|
|
|
|
|
|
|
|
|
def test_lightning_optimizer_from_user(tmpdir):
|
|
|
|
"""
|
|
|
|
Test that the user can use our LightningOptimizer. Not recommended.
|
|
|
|
"""
|
|
|
|
|
|
|
|
class TestModel(BoringModel):
|
|
|
|
def configure_optimizers(self):
|
|
|
|
optimizer = torch.optim.Adam(self.layer.parameters(), lr=0.1)
|
|
|
|
optimizer = LightningOptimizer(optimizer)
|
|
|
|
lr_scheduler = torch.optim.lr_scheduler.StepLR(optimizer, step_size=1)
|
|
|
|
return [optimizer], [lr_scheduler]
|
|
|
|
|
|
|
|
model = TestModel()
|
|
|
|
trainer = Trainer(
|
2021-07-26 11:37:35 +00:00
|
|
|
default_root_dir=tmpdir, limit_train_batches=1, limit_val_batches=1, max_epochs=1, weights_summary=None
|
2020-12-01 00:09:46 +00:00
|
|
|
)
|
|
|
|
trainer.fit(model)
|
|
|
|
|
|
|
|
groups = "{'amsgrad': False, 'betas': (0.9, 0.999), 'eps': 1e-08, 'initial_lr': 0.1, 'lr': 0.01, 'weight_decay': 0}"
|
|
|
|
expected = f"LightningAdam(groups=[{groups}])"
|
2021-01-08 21:13:12 +00:00
|
|
|
assert trainer._lightning_optimizers[0].__repr__() == expected
|
2020-12-01 00:09:46 +00:00
|
|
|
|
|
|
|
|
2021-03-01 13:36:46 +00:00
|
|
|
def test_lightning_optimizer_manual_optimization_and_accumulated_gradients(tmpdir):
|
2020-12-01 00:09:46 +00:00
|
|
|
"""
|
2021-03-01 13:36:46 +00:00
|
|
|
Test that the user can use our LightningOptimizer. Not recommended.
|
2020-12-01 00:09:46 +00:00
|
|
|
"""
|
2021-02-06 11:07:26 +00:00
|
|
|
|
2020-12-01 00:09:46 +00:00
|
|
|
class TestModel(BoringModel):
|
2021-01-12 22:53:43 +00:00
|
|
|
def __init__(self):
|
|
|
|
super().__init__()
|
|
|
|
self.automatic_optimization = False
|
2020-12-01 00:09:46 +00:00
|
|
|
|
2021-03-07 07:48:50 +00:00
|
|
|
def training_step(self, batch, batch_idx):
|
2021-03-01 13:36:46 +00:00
|
|
|
opt_1, opt_2 = self.optimizers()
|
2021-03-07 07:48:50 +00:00
|
|
|
|
2020-12-01 00:09:46 +00:00
|
|
|
assert isinstance(opt_1, LightningOptimizer)
|
|
|
|
assert isinstance(opt_2, LightningOptimizer)
|
|
|
|
|
2021-03-01 13:36:46 +00:00
|
|
|
def closure(opt):
|
|
|
|
output = self.layer(batch)
|
|
|
|
loss = self.loss(batch, output)
|
|
|
|
opt.zero_grad()
|
|
|
|
self.manual_backward(loss)
|
2021-02-06 11:07:26 +00:00
|
|
|
|
[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
|
|
|
if batch_idx % 2 == 0:
|
2021-03-01 13:36:46 +00:00
|
|
|
closure(opt_1)
|
|
|
|
opt_1.step()
|
|
|
|
|
|
|
|
closure(opt_2)
|
|
|
|
opt_2.step()
|
2020-12-01 00:09:46 +00:00
|
|
|
|
|
|
|
def configure_optimizers(self):
|
|
|
|
optimizer_1 = torch.optim.SGD(self.layer.parameters(), lr=0.1)
|
|
|
|
optimizer_2 = torch.optim.Adam(self.layer.parameters(), lr=0.1)
|
|
|
|
lr_scheduler = torch.optim.lr_scheduler.StepLR(optimizer_1, step_size=1)
|
|
|
|
return [optimizer_1, optimizer_2], [lr_scheduler]
|
|
|
|
|
|
|
|
model = TestModel()
|
|
|
|
model.training_step_end = None
|
|
|
|
model.training_epoch_end = None
|
|
|
|
trainer = Trainer(
|
2021-07-26 11:37:35 +00:00
|
|
|
default_root_dir=tmpdir, limit_train_batches=8, limit_val_batches=1, max_epochs=1, weights_summary=None
|
2020-12-10 10:01:33 +00:00
|
|
|
)
|
2021-02-06 11:07:26 +00:00
|
|
|
|
2021-07-26 11:37:35 +00:00
|
|
|
with patch.multiple(torch.optim.SGD, zero_grad=DEFAULT, step=DEFAULT) as sgd, patch.multiple(
|
|
|
|
torch.optim.Adam, zero_grad=DEFAULT, step=DEFAULT
|
|
|
|
) as adam:
|
2021-03-01 13:36:46 +00:00
|
|
|
trainer.fit(model)
|
2020-12-01 00:09:46 +00:00
|
|
|
|
2021-03-01 13:36:46 +00:00
|
|
|
assert sgd["step"].call_count == 4
|
|
|
|
assert adam["step"].call_count == 8
|
2020-12-01 00:09:46 +00:00
|
|
|
|
2021-03-01 13:36:46 +00:00
|
|
|
assert sgd["zero_grad"].call_count == 4
|
|
|
|
assert adam["zero_grad"].call_count == 8
|
2020-12-01 00:09:46 +00:00
|
|
|
|
|
|
|
|
|
|
|
def test_state(tmpdir):
|
|
|
|
model = torch.nn.Linear(3, 4)
|
|
|
|
optimizer = torch.optim.Adam(model.parameters())
|
|
|
|
lightning_optimizer = LightningOptimizer(optimizer)
|
2020-12-11 19:24:59 +00:00
|
|
|
|
|
|
|
# test state
|
|
|
|
assert optimizer.state == lightning_optimizer.state
|
|
|
|
lightning_optimizer.state = optimizer.state
|
|
|
|
assert optimizer.state == lightning_optimizer.state
|
|
|
|
|
|
|
|
# test param_groups
|
|
|
|
assert optimizer.param_groups == lightning_optimizer.param_groups
|
|
|
|
lightning_optimizer.param_groups = optimizer.param_groups
|
|
|
|
assert optimizer.param_groups == lightning_optimizer.param_groups
|
|
|
|
|
|
|
|
# test defaults
|
|
|
|
assert optimizer.defaults == lightning_optimizer.defaults
|
|
|
|
lightning_optimizer.defaults = optimizer.defaults
|
|
|
|
assert optimizer.defaults == lightning_optimizer.defaults
|
|
|
|
|
2020-12-01 00:09:46 +00:00
|
|
|
assert isinstance(lightning_optimizer, LightningOptimizer)
|
|
|
|
assert isinstance(lightning_optimizer, Adam)
|
|
|
|
assert isinstance(lightning_optimizer, Optimizer)
|
2021-01-13 06:48:37 +00:00
|
|
|
|
2020-12-01 00:09:46 +00:00
|
|
|
lightning_dict = {}
|
2021-02-06 11:07:26 +00:00
|
|
|
special_attrs = [
|
2021-02-14 16:03:45 +00:00
|
|
|
"_accumulate_grad_batches",
|
|
|
|
"_optimizer",
|
|
|
|
"_optimizer_idx",
|
|
|
|
"_support_closure",
|
|
|
|
"_trainer",
|
|
|
|
"__getstate__",
|
|
|
|
"__setstate__",
|
|
|
|
"state_dict",
|
|
|
|
"load_state_dict",
|
|
|
|
"zero_grad",
|
|
|
|
"__setstate__",
|
|
|
|
"add_param_group",
|
PoC: Accelerator refactor (#5743)
* restoring the result from subprocess
* fix queue.get() order for results
* add missing "block_backward_sync" context manager
* add missing "block_backward_sync" context manager
* fix sync_batchnorm
* fix supported gpu-ids for tuple
* fix clip gradients and inf recursion
* accelerator selection: added cluster_environment plugin
* fix torchelastic test
* fix reduce early stopping decision for DDP
* fix tests: callbacks, conversion to lightning optimizer
* fix lightning optimizer does not pickle
* fix setting benchmark and deterministic option
* fix slurm amp test
* fix prepare_data test and determine node_rank
* fix retrieving last path when testing
* remove obsolete plugin argument
* fix test: test_trainer_config
* fix torchscript tests
* 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
* 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
* suggestion from code review
* suggestion from code review
Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
Co-authored-by: SeanNaren <sean@grid.ai>
Co-authored-by: Jirka Borovec <jirka.borovec@seznam.cz>
Co-authored-by: chaton <thomas@grid.ai>
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-12 20:48:56 +00:00
|
|
|
"_total_optimizer_step_calls",
|
2021-02-06 11:07:26 +00:00
|
|
|
]
|
2021-01-13 06:48:37 +00:00
|
|
|
|
2020-12-01 00:09:46 +00:00
|
|
|
for k, v in lightning_optimizer.__dict__.items():
|
|
|
|
if k not in special_attrs:
|
|
|
|
lightning_dict[k] = v
|
2021-01-13 06:48:37 +00:00
|
|
|
|
2020-12-01 00:09:46 +00:00
|
|
|
assert lightning_dict == optimizer.__dict__
|
|
|
|
assert optimizer.state_dict() == lightning_optimizer.state_dict()
|
|
|
|
assert optimizer.state == lightning_optimizer.state
|
2020-12-07 12:55:49 +00:00
|
|
|
|
|
|
|
|
2021-03-01 13:36:46 +00:00
|
|
|
def test_lightning_optimizer_automatic_optimization_optimizer_zero_grad(tmpdir):
|
2020-12-07 12:55:49 +00:00
|
|
|
"""
|
2021-03-01 13:36:46 +00:00
|
|
|
Test overriding zero_grad works in automatic_optimization
|
|
|
|
"""
|
2021-03-02 08:03:32 +00:00
|
|
|
|
2021-03-01 13:36:46 +00:00
|
|
|
class TestModel(BoringModel):
|
|
|
|
def training_step(self, batch, batch_idx, optimizer_idx=None):
|
|
|
|
return super().training_step(batch, batch_idx)
|
|
|
|
|
|
|
|
def training_epoch_end(self, outputs):
|
|
|
|
...
|
|
|
|
|
|
|
|
def optimizer_zero_grad(self, epoch, batch_idx, optimizer, optimizer_idx):
|
|
|
|
if isinstance(optimizer, SGD) and batch_idx % 2 == 0:
|
|
|
|
optimizer.zero_grad()
|
|
|
|
if isinstance(optimizer, Adam) and batch_idx % 5 == 0:
|
|
|
|
optimizer.zero_grad()
|
|
|
|
|
|
|
|
def configure_optimizers(self):
|
|
|
|
optimizer_1 = torch.optim.SGD(self.layer.parameters(), lr=0.1)
|
|
|
|
optimizer_2 = torch.optim.Adam(self.layer.parameters(), lr=0.1)
|
|
|
|
lr_scheduler = torch.optim.lr_scheduler.StepLR(optimizer_1, step_size=1)
|
|
|
|
return [optimizer_1, optimizer_2], [lr_scheduler]
|
|
|
|
|
|
|
|
model = TestModel()
|
|
|
|
trainer = Trainer(
|
2021-07-26 11:37:35 +00:00
|
|
|
default_root_dir=tmpdir, limit_train_batches=20, limit_val_batches=1, max_epochs=1, weights_summary=None
|
2021-03-01 13:36:46 +00:00
|
|
|
)
|
|
|
|
|
2021-07-26 11:37:35 +00:00
|
|
|
with patch("torch.optim.Adam.zero_grad") as adam_zero_grad, patch("torch.optim.SGD.zero_grad") as sgd_zero_grad:
|
2021-03-01 13:36:46 +00:00
|
|
|
trainer.fit(model)
|
|
|
|
|
|
|
|
assert adam_zero_grad.call_count == 4
|
|
|
|
assert sgd_zero_grad.call_count == 10
|
|
|
|
|
|
|
|
|
|
|
|
def test_lightning_optimizer_automatic_optimization_optimizer_step(tmpdir):
|
|
|
|
"""
|
|
|
|
Test overriding step works in automatic_optimization
|
2020-12-07 12:55:49 +00:00
|
|
|
"""
|
2021-02-06 11:07:26 +00:00
|
|
|
|
2020-12-07 12:55:49 +00:00
|
|
|
class TestModel(BoringModel):
|
|
|
|
def training_step(self, batch, batch_idx, optimizer_idx=None):
|
2021-03-01 13:36:46 +00:00
|
|
|
return super().training_step(batch, batch_idx)
|
2020-12-07 12:55:49 +00:00
|
|
|
|
|
|
|
def training_epoch_end(self, outputs):
|
2021-03-01 13:36:46 +00:00
|
|
|
...
|
2020-12-07 12:55:49 +00:00
|
|
|
|
2021-03-01 13:36:46 +00:00
|
|
|
def optimizer_step(self, epoch, batch_idx, optimizer, optimizer_idx, optimizer_closure, **_):
|
2021-06-23 10:25:29 +00:00
|
|
|
assert optimizer_closure.__name__ == "_training_step_and_backward_closure"
|
2021-03-01 13:36:46 +00:00
|
|
|
# not passing the closure to the optimizer because step is mocked
|
|
|
|
# zero_grad is called inside the closure
|
|
|
|
if isinstance(optimizer, SGD) and batch_idx % 2 == 0:
|
|
|
|
optimizer_closure()
|
[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.step()
|
2021-03-01 13:36:46 +00:00
|
|
|
if isinstance(optimizer, Adam) and batch_idx % 4 == 0:
|
|
|
|
optimizer_closure()
|
|
|
|
optimizer.step() # not passing the closure here because it's a mock
|
2020-12-07 12:55:49 +00:00
|
|
|
|
|
|
|
def configure_optimizers(self):
|
|
|
|
optimizer_1 = torch.optim.SGD(self.layer.parameters(), lr=0.1)
|
|
|
|
optimizer_2 = torch.optim.Adam(self.layer.parameters(), lr=0.1)
|
|
|
|
lr_scheduler = torch.optim.lr_scheduler.StepLR(optimizer_1, step_size=1)
|
|
|
|
return [optimizer_1, optimizer_2], [lr_scheduler]
|
|
|
|
|
|
|
|
model = TestModel()
|
2021-03-01 13:36:46 +00:00
|
|
|
|
2020-12-07 12:55:49 +00:00
|
|
|
trainer = Trainer(
|
2021-07-26 11:37:35 +00:00
|
|
|
default_root_dir=tmpdir, limit_train_batches=8, limit_val_batches=1, max_epochs=1, weights_summary=None
|
2020-12-07 12:55:49 +00:00
|
|
|
)
|
|
|
|
|
2021-07-26 11:37:35 +00:00
|
|
|
with patch.multiple(torch.optim.SGD, zero_grad=DEFAULT, step=DEFAULT) as sgd, patch.multiple(
|
|
|
|
torch.optim.Adam, zero_grad=DEFAULT, step=DEFAULT
|
|
|
|
) as adam:
|
2021-03-01 13:36:46 +00:00
|
|
|
trainer.fit(model)
|
2020-12-07 12:55:49 +00:00
|
|
|
|
2021-03-01 13:36:46 +00:00
|
|
|
assert sgd["step"].call_count == 4
|
|
|
|
assert adam["step"].call_count == 2
|
|
|
|
|
|
|
|
assert sgd["zero_grad"].call_count == 4
|
|
|
|
assert adam["zero_grad"].call_count == 2
|
|
|
|
|
|
|
|
|
|
|
|
def test_lightning_optimizer_automatic_optimization_lbfgs_zero_grad(tmpdir):
|
2020-12-07 12:55:49 +00:00
|
|
|
"""
|
2021-03-01 13:36:46 +00:00
|
|
|
Test zero_grad is called the same number of times as LBFGS requires
|
|
|
|
for reevaluation of the loss in automatic_optimization.
|
2020-12-07 12:55:49 +00:00
|
|
|
"""
|
2021-03-02 08:03:32 +00:00
|
|
|
|
2021-03-01 13:36:46 +00:00
|
|
|
class TestModel(BoringModel):
|
|
|
|
def configure_optimizers(self):
|
|
|
|
return torch.optim.LBFGS(self.parameters())
|
2020-12-07 12:55:49 +00:00
|
|
|
|
2021-03-01 13:36:46 +00:00
|
|
|
model = TestModel()
|
|
|
|
trainer = Trainer(
|
2021-07-26 11:37:35 +00:00
|
|
|
default_root_dir=tmpdir, limit_train_batches=1, limit_val_batches=1, max_epochs=1, weights_summary=None
|
2021-03-01 13:36:46 +00:00
|
|
|
)
|
2020-12-07 12:55:49 +00:00
|
|
|
|
2021-03-01 13:36:46 +00:00
|
|
|
with patch("torch.optim.LBFGS.zero_grad") as zero_grad:
|
2020-12-07 12:55:49 +00:00
|
|
|
trainer.fit(model)
|
|
|
|
|
2021-03-01 13:36:46 +00:00
|
|
|
lbfgs = model.optimizers()
|
|
|
|
max_iter = lbfgs.param_groups[0]["max_iter"]
|
|
|
|
assert zero_grad.call_count == max_iter
|
2021-03-04 20:11:59 +00:00
|
|
|
|
|
|
|
|
|
|
|
class OptimizerWithHooks(Optimizer):
|
|
|
|
def __init__(self, model):
|
|
|
|
self._fwd_handles = []
|
|
|
|
self._bwd_handles = []
|
|
|
|
self.params = []
|
|
|
|
for _, mod in model.named_modules():
|
|
|
|
mod_class = mod.__class__.__name__
|
2021-07-26 11:37:35 +00:00
|
|
|
if mod_class != "Linear":
|
2021-03-04 20:11:59 +00:00
|
|
|
continue
|
|
|
|
|
|
|
|
handle = mod.register_forward_pre_hook(self._save_input) # save the inputs
|
|
|
|
self._fwd_handles.append(handle) # collect forward-save-input hooks in list
|
|
|
|
handle = mod.register_backward_hook(self._save_grad_output) # save the gradients
|
|
|
|
self._bwd_handles.append(handle) # collect backward-save-grad hook in list
|
|
|
|
|
|
|
|
# save the parameters
|
|
|
|
params = [mod.weight]
|
|
|
|
if mod.bias is not None:
|
|
|
|
params.append(mod.bias)
|
|
|
|
|
|
|
|
# save a param_group for each module
|
2021-07-26 11:37:35 +00:00
|
|
|
d = {"params": params, "mod": mod, "layer_type": mod_class}
|
2021-03-04 20:11:59 +00:00
|
|
|
self.params.append(d)
|
|
|
|
|
2021-07-26 12:38:12 +00:00
|
|
|
super().__init__(self.params, {"lr": 0.01})
|
2021-03-04 20:11:59 +00:00
|
|
|
|
|
|
|
def _save_input(self, mod, i):
|
|
|
|
"""Saves input of layer"""
|
|
|
|
if mod.training:
|
2021-07-26 11:37:35 +00:00
|
|
|
self.state[mod]["x"] = i[0]
|
2021-03-04 20:11:59 +00:00
|
|
|
|
|
|
|
def _save_grad_output(self, mod, _, grad_output):
|
|
|
|
"""
|
|
|
|
Saves grad on output of layer to
|
|
|
|
grad is scaled with batch_size since gradient is spread over samples in mini batch
|
|
|
|
"""
|
|
|
|
batch_size = grad_output[0].shape[0]
|
|
|
|
if mod.training:
|
2021-07-26 11:37:35 +00:00
|
|
|
self.state[mod]["grad"] = grad_output[0] * batch_size
|
2021-03-04 20:11:59 +00:00
|
|
|
|
|
|
|
def step(self, closure=None):
|
|
|
|
closure()
|
|
|
|
for group in self.param_groups:
|
2021-07-26 11:37:35 +00:00
|
|
|
_ = self.state[group["mod"]]["x"]
|
|
|
|
_ = self.state[group["mod"]]["grad"]
|
2021-03-04 20:11:59 +00:00
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
|
|
def test_lightning_optimizer_keeps_hooks(tmpdir):
|
|
|
|
class TestModel(BoringModel):
|
|
|
|
count_on_train_batch_start = 0
|
|
|
|
count_on_train_batch_end = 0
|
|
|
|
|
|
|
|
def configure_optimizers(self):
|
|
|
|
return OptimizerWithHooks(self)
|
|
|
|
|
|
|
|
def on_train_batch_start(self, batch: Any, batch_idx: int, dataloader_idx: int) -> None:
|
|
|
|
self.count_on_train_batch_start += 1
|
|
|
|
optimizer = self.optimizers(use_pl_optimizer=False)
|
|
|
|
assert len(optimizer._fwd_handles) == 1
|
|
|
|
|
|
|
|
def on_train_batch_end(self, outputs: Any, batch: Any, batch_idx: int, dataloader_idx: int) -> None:
|
|
|
|
self.count_on_train_batch_end += 1
|
|
|
|
del self.trainer._lightning_optimizers
|
|
|
|
gc.collect() # not necessary, just in case
|
|
|
|
|
|
|
|
trainer = Trainer(default_root_dir=tmpdir, limit_train_batches=4, limit_val_batches=1, max_epochs=1)
|
|
|
|
model = TestModel()
|
|
|
|
trainer.fit(model)
|
|
|
|
assert model.count_on_train_batch_start == 4
|
|
|
|
assert model.count_on_train_batch_end == 4
|