Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add automatic optimization property setter to lightning module #5169

Merged
merged 3 commits into from
Jan 11, 2021
Merged

Add automatic optimization property setter to lightning module #5169

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37ef01a
add automatic optimization property setter to lightning module
ananthsub Dec 17, 2020
5513649
Update test_manual_optimization.py
ananthsub Dec 17, 2020
bb42800
Merge branch 'master' into auto-opt-setter
tchaton Jan 11, 2021
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
9 changes: 8 additions & 1 deletion pytorch_lightning/core/lightning.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ def __init__(self, *args, **kwargs):
self._current_hook_fx_name = None
self._current_dataloader_idx = None

self._automatic_optimization: bool = True

def optimizers(self):
opts = self.trainer.optimizers

Expand Down Expand Up @@ -160,7 +162,12 @@ def automatic_optimization(self) -> bool:
"""
If False you are responsible for calling .backward, .step, zero_grad.
"""
return True
return self._automatic_optimization

@automatic_optimization.setter
def automatic_optimization(self, automatic_optimization: bool) -> None:
self._automatic_optimization = automatic_optimization


def print(self, *args, **kwargs) -> None:
r"""
Expand Down
9 changes: 5 additions & 4 deletions tests/trainer/optimization/test_manual_optimization.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ def test_multiple_optimizers_manual(tmpdir):
Tests that only training_step can be used
"""
class TestModel(BoringModel):

def __init__(self):
super().__init__()
self.automatic_optimization = False

def training_step(self, batch, batch_idx, optimizer_idx):
# manual
(opt_a, opt_b) = self.optimizers()
Expand Down Expand Up @@ -69,10 +74,6 @@ def configure_optimizers(self):
optimizer_2 = torch.optim.SGD(self.layer.parameters(), lr=0.1)
return optimizer, optimizer_2

@property
def automatic_optimization(self) -> bool:
return False

model = TestModel()
model.val_dataloader = None

Expand Down