Skip to content

update tests with new auto_opt api#5466

Merged
Borda merged 6 commits intomasterfrom
tests/auto_opt
Jan 12, 2021
Merged

update tests with new auto_opt api#5466
Borda merged 6 commits intomasterfrom
tests/auto_opt

Conversation

@rohitgr7
Copy link
Copy Markdown
Contributor

@rohitgr7 rohitgr7 commented Jan 11, 2021 •
edited by Borda
Loading

What does this PR do?

updates tests missed here #5169

Before submitting

  • Was this discussed/approved via a GitHub issue? (not for typos and docs)
  • Did you read the contributor guideline, Pull Request section?
  • Did you make sure your PR does only one thing, instead of bundling different changes together?
  • Did you make sure to update the documentation with your changes? (if necessary)
  • Did you write any new necessary tests? (not for typos and docs)
  • Did you verify new and existing tests pass locally with your changes?
  • Did you update the CHANGELOG? (not for typos, docs, test updates, or internal minor changes/refactorings)

PR review

Anyone in the community is free to review the PR once the tests have passed.
Before you start reviewing make sure you have read Review guidelines. In short, see the following bullet-list:

  • Is this pull request ready for review? (if not, please submit in draft mode)
  • Check that all items from Before submitting are resolved
  • Make sure the title is self-explanatory and the description concisely explains the PR
  • Add labels and milestones (and optionally projects) to the PR so it can be classified
  • Check that target branch and milestone match!

Did you have fun?

Make sure you had fun coding 🙃

@Borda Borda added the ci Continuous Integration label Jan 11, 2021
Borda
Borda approved these changes Jan 11, 2021
View reviewed changes
Copy link
Copy Markdown
Collaborator

@Borda Borda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

correct

@Borda Borda added this to the 1.1.x milestone Jan 11, 2021
@Borda Borda enabled auto-merge (squash) January 11, 2021 21:15
@Borda Borda added the ready to be merged PRs ready to be merged label Jan 11, 2021
justusschock
justusschock approved these changes Jan 12, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@justusschock justusschock left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rohitgr7 I added some suggestions, since the way you implemented it, you overwrite the property, but this way we just change the value used by the property.

tests/core/test_lightning_optimizer.py
class TestModel(BoringModel):
def __init__(self):
super().__init__()
self.automatic_optimization = False
Copy link
Copy Markdown
Member

@justusschock justusschock Jan 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
self.automatic_optimization = False
self._automatic_optimization = False

tests/core/test_lightning_optimizer.py
class TestModel(BoringModel):
def __init__(self):
super().__init__()
self.automatic_optimization = False
Copy link
Copy Markdown
Member

@justusschock justusschock Jan 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
self.automatic_optimization = False
self._automatic_optimization = False

tests/plugins/test_ddp_sequential_plugin.py
def __init__(self):
super().__init__()
self.sequential_module = nn.Sequential(torch.nn.Linear(32, 32), nn.ReLU(), nn.Linear(32, 2))
self.automatic_optimization = False
Copy link
Copy Markdown
Member

@justusschock justusschock Jan 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
self.automatic_optimization = False
self._automatic_optimization = False

tests/plugins/test_ddp_sequential_plugin.py Outdated
class SequentialModelRPCAutomatic(SequentialModelRPCManual):
def __init__(self):
super().__init__()
self.automatic_optimization = False
Copy link
Copy Markdown
Member

@justusschock justusschock Jan 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
self.automatic_optimization = False
self._automatic_optimization = False

tests/trainer/dynamic_args/test_multiple_optimizers.py
class TestModel(BoringModel):
def __init__(self):
super().__init__()
self.automatic_optimization = False
Copy link
Copy Markdown
Member

@justusschock justusschock Jan 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
self.automatic_optimization = False
self._automatic_optimization = False

tests/trainer/optimization/test_manual_optimization.py

def __init__(self):
super().__init__()
self.automatic_optimization = False
Copy link
Copy Markdown
Member

@justusschock justusschock Jan 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
self.automatic_optimization = False
self._automatic_optimization = False

tests/trainer/optimization/test_manual_optimization.py
class TestModel(BoringModel):
def __init__(self):
super().__init__()
self.automatic_optimization = False
Copy link
Copy Markdown
Member

@justusschock justusschock Jan 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
self.automatic_optimization = False
self._automatic_optimization = False

tests/trainer/optimization/test_manual_optimization.py
class TestModel(BoringModel):
def __init__(self):
super().__init__()
self.automatic_optimization = False
Copy link
Copy Markdown
Member

@justusschock justusschock Jan 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
self.automatic_optimization = False
self._automatic_optimization = False

tests/trainer/optimization/test_manual_optimization.py
class TestModel(BoringModel):
def __init__(self):
super().__init__()
self.automatic_optimization = False
Copy link
Copy Markdown
Member

@justusschock justusschock Jan 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
self.automatic_optimization = False
self._automatic_optimization = False

tests/trainer/optimization/test_manual_optimization.py
class TestModel(BoringModel):
def __init__(self):
super().__init__()
self.automatic_optimization = False
Copy link
Copy Markdown
Member

@justusschock justusschock Jan 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
self.automatic_optimization = False
self._automatic_optimization = False

@rohitgr7
Copy link
Copy Markdown
Contributor Author

rohitgr7 commented Jan 12, 2021

@justusschock there's a setter for that.
https://github.com/PyTorchLightning/pytorch-lightning/blob/652df1886abc63820d956aef7a468ff4cf1bea7f/pytorch_lightning/core/lightning.py#L169-L171

@codecov
Copy link
Copy Markdown

codecov bot commented Jan 12, 2021 •
edited
Loading

Codecov Report

Merging #5466 (652df18) into master (1f6236a) will increase coverage by 49%.
The diff coverage is n/a.

@@           Coverage Diff            @@
##           master   #5466     +/-   ##
========================================
+ Coverage      44%     93%    +49%     
========================================
  Files         135     135             
  Lines        9875   10015    +140     
========================================
+ Hits         4380    9338   +4958     
+ Misses       5495     677   -4818

rohitgr7
rohitgr7 commented Jan 12, 2021
View reviewed changes
@Borda Borda merged commit 1ec1d3e into master Jan 12, 2021
@Borda Borda deleted the tests/auto_opt branch January 12, 2021 22:53
Borda added a commit that referenced this pull request Feb 4, 2021
@rohitgr7 @github-actions @Borda
update tests with new auto_opt api (#5466)
dd5c715 
* update tests with new auto_opt api

* Apply suggestions from code review

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Borda Borda Borda approved these changes

@justusschock justusschock justusschock approved these changes

@awaelchli awaelchli Awaiting requested review from awaelchli

@SeanNaren SeanNaren Awaiting requested review from SeanNaren

@tchaton tchaton Awaiting requested review from tchaton tchaton is a code owner

@williamFalcon williamFalcon Awaiting requested review from williamFalcon

@s-rog s-rog Awaiting requested review from s-rog

@SkafteNicki SkafteNicki Awaiting requested review from SkafteNicki

+1 more reviewer

@carmocca carmocca carmocca approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

ci Continuous Integration ready to be merged PRs ready to be merged

Projects

None yet

Milestone

pl:1.1.x

Development

Successfully merging this pull request may close these issues.

4 participants

@rohitgr7 @Borda @carmocca @justusschock