From de406174f3ddd26785a86dbb8f69a94e6f7139ac Mon Sep 17 00:00:00 2001 From: ananthsub Date: Thu, 17 Dec 2020 02:55:48 -0800 Subject: [PATCH 1/4] Update test_manual_optimization.py --- tests/trainer/optimization/test_manual_optimization.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/trainer/optimization/test_manual_optimization.py b/tests/trainer/optimization/test_manual_optimization.py index 338769f2ee40f..0a04db140d17b 100644 --- a/tests/trainer/optimization/test_manual_optimization.py +++ b/tests/trainer/optimization/test_manual_optimization.py @@ -99,6 +99,11 @@ def test_multiple_optimizers_manual_return(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() @@ -137,10 +142,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 From 1eaafef7223a615a3a8aaf8e2c81e95c88c7a37c Mon Sep 17 00:00:00 2001 From: ananthsub Date: Mon, 11 Jan 2021 20:47:06 -0800 Subject: [PATCH 2/4] Update governance.rst --- docs/source/governance.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/source/governance.rst b/docs/source/governance.rst index 74d24e306d3f9..22fba33771c0a 100644 --- a/docs/source/governance.rst +++ b/docs/source/governance.rst @@ -25,3 +25,4 @@ Core Maintainers - Jeff Yang (`ydcjeff `_) - Roger Shieh (`s-rog `_) - Carlos Mocholí (`carmocca `_) +- Ananth Subramaniam (`ananthsub `_) From a10e1506581908cf0b8de239fb263f067a896550 Mon Sep 17 00:00:00 2001 From: ananthsub Date: Mon, 11 Jan 2021 20:51:11 -0800 Subject: [PATCH 3/4] Update test_manual_optimization.py --- tests/trainer/optimization/test_manual_optimization.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/trainer/optimization/test_manual_optimization.py b/tests/trainer/optimization/test_manual_optimization.py index 0a04db140d17b..a14bc93d1d655 100644 --- a/tests/trainer/optimization/test_manual_optimization.py +++ b/tests/trainer/optimization/test_manual_optimization.py @@ -34,10 +34,6 @@ def test_multiple_optimizers_manual(tmpdir): """ 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() @@ -74,6 +70,10 @@ 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 From 9ca37f6177bd66e3817c8ed06acf85f2874c55c5 Mon Sep 17 00:00:00 2001 From: ananthsub Date: Mon, 11 Jan 2021 20:53:12 -0800 Subject: [PATCH 4/4] Update test_manual_optimization.py --- .../optimization/test_manual_optimization.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tests/trainer/optimization/test_manual_optimization.py b/tests/trainer/optimization/test_manual_optimization.py index a14bc93d1d655..338769f2ee40f 100644 --- a/tests/trainer/optimization/test_manual_optimization.py +++ b/tests/trainer/optimization/test_manual_optimization.py @@ -34,6 +34,10 @@ def test_multiple_optimizers_manual(tmpdir): """ 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() @@ -70,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 @@ -99,11 +99,6 @@ def test_multiple_optimizers_manual_return(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() @@ -142,6 +137,10 @@ 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