Sync master/1.1.5 into release/1.2 [full merge, no squash] by carmocca · Pull Request #5583 · Lightning-AI/pytorch-lightning

carmocca · 2021-01-19T22:19:19Z

What does this PR do?

Update release branch with latest commits from master.
Includes bug-fix release 1.1.5

Continuation of #5483

Borda

@carmocca mind fix the failing test?

    def on_train_start(self, trainer, pl_module):
>       self.log("on_train_start", 1)
E       AttributeError: 'LoggingCallback' object has no attribute 'log'

tests/trainer/logging_process/test_train_loop_logging_1_0.py:826: AttributeError

Borda · 2021-01-23T23:45:56Z

@carmocca any update here?

pep8speaks · 2021-01-25T14:44:35Z

Hello @carmocca! Thanks for updating this PR.

There are currently no PEP 8 issues detected in this Pull Request. Cheers! 🍻

Comment last updated at 2021-02-03 22:07:52 UTC

Borda · 2021-01-25T14:44:57Z

pls, do not merge release/1.2-dev to this branch, always rebase :]

awaelchli · 2021-01-27T05:14:24Z

when approximately is this expected to be merged into dev branch?

Borda · 2021-01-27T12:10:47Z

when approximately is this expected to be merged into dev branch?

I hope just after @carmocca resolves conflicts :]

* 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>

* fix on_after_backward docs * doc fix

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* pipeline release CI * trigger * trigger * . * t1 * t2 * t1 * t2

* ref and fix call for on_pretrained_routine * avoid failing tests * unnecessary_call * unnecessary call in accelerators * tmpdir * rm test_mode * pep * updates * more ref * Revert "more ref" This reverts commit 5d9e95f. * more refac Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* add section * test legacy Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* reset * fix reset * changelog * update chlog * typing Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com> Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com>

* configure mergify * drop gha * drop commented section Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Roger Shieh <sh.rog@protonmail.ch>

* Update accelerator_connector.py * Apply suggestions from code review Co-authored-by: Rohit Gupta <rohitgr1998@gmail.com> Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com> Co-authored-by: Rohit Gupta <rohitgr1998@gmail.com>

* Add documentation to tensorboard * Remove unnecessary whitespaces * Update pytorch_lightning/loggers/tensorboard.py Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com> * Add metrics to tensorboard logger * Whitespace removed Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com>

* update test * syntax * fix * update test * scheduler * only apex * fix * rev drone * chlog

…vice (#5505) * Update ddp_cpu_hpc_accelerator.py * Update CHANGELOG.md

* fix val_check_interval with fast_dev_run * chlog

…#5521) * Start with the failing test * Then fix the failing test * Update CHANGELOG

* fix wrong argument in argparse * remove wrong default arg in argparser * disable add help argparse

Co-authored-by: chaton <thomas@grid.ai>

Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com> Co-authored-by: Nicki Skafte <skaftenicki@gmail.com> Co-authored-by: chaton <thomas@grid.ai>

Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com>

Co-authored-by: Rohit Gupta <rohitgr1998@gmail.com>

Borda · 2021-02-03T19:08:11Z

is the config changed?

yes: #5739 (comment)

yes, changing it back in #5768

resolve wrong merge tpu yapf

carmocca requested review from Borda, SeanNaren, awaelchli, edenlightning, justusschock, tchaton and williamFalcon as code owners January 19, 2021 22:19

carmocca added this to the 1.2 milestone Jan 19, 2021

carmocca added the Important label Jan 19, 2021

carmocca assigned SeanNaren and carmocca Jan 19, 2021

Borda requested changes Jan 22, 2021

View reviewed changes

SeanNaren mentioned this pull request Jan 23, 2021

sync 1.1.4 >> feature 1.2 [full merge, no squash] #5483

Merged

12 tasks

mergify bot added has conflicts and removed has conflicts labels Jan 24, 2021

carmocca requested a review from Borda January 25, 2021 14:35

mergify bot added the has conflicts label Jan 25, 2021

Borda changed the title ~~Sync master/1.1.{4,5} into release/1.2 [full merge, no squash]~~ Sync master/1.1.5 into release/1.2 [full merge, no squash] Jan 26, 2021

mergify bot removed the has conflicts label Jan 26, 2021

rohitgr7 mentioned this pull request Jan 26, 2021

Refactor RunningStage usage in advance of implementing Trainer.validate() #4945

Merged

9 tasks

mergify bot added the has conflicts label Jan 26, 2021

awaelchli approved these changes Jan 27, 2021

View reviewed changes

mergify bot added has conflicts and removed has conflicts labels Jan 27, 2021

rohitgr7 and others added 19 commits February 3, 2021 19:39

update tests with new auto_opt api (#5466)

7a50c33

* 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>

[Docs] fix on_after_backward example (#5278)

5bef046

* fix on_after_backward docs * doc fix

fix typo in multi-gpu docs (#5402)

0ff4c56

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

pipeline release CI (#5494)

c27d4d2

* pipeline release CI * trigger * trigger * . * t1 * t2 * t1 * t2

add section & add testing ckpt 1.1.4 (#5495)

a9a3760

* add section * test legacy Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

reconfigure mergify (#5499)

f8abcf7

* configure mergify * drop gha * drop commented section Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Roger Shieh <sh.rog@protonmail.ch>

Fix Wrong exception message (#5492)

43e926b

* Update accelerator_connector.py * Apply suggestions from code review Co-authored-by: Rohit Gupta <rohitgr1998@gmail.com> Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com> Co-authored-by: Rohit Gupta <rohitgr1998@gmail.com>

fix reinit_schedulers with correct optimizer (#5519)

293984b

* update test * syntax * fix * update test * scheduler * only apex * fix * rev drone * chlog

[bugfix] Fix signature mismatch in DDPCPUHPCAccelerator's model_to_de…

ad4e25f

…vice (#5505) * Update ddp_cpu_hpc_accelerator.py * Update CHANGELOG.md

Fix val_check_interval with fast_dev_run (#5540)

f2229fd

* fix val_check_interval with fast_dev_run * chlog

Fix logging on_train_batch_end in a callback with multiple optimizers (…

b7920b1

…#5521) * Start with the failing test * Then fix the failing test * Update CHANGELOG

Fix command line run for refinforce_learn_qnet in pl_examples (#5414)

f72d939

* fix wrong argument in argparse * remove wrong default arg in argparser * disable add help argparse

Drop greetings comment (#5563)

fd6b3ec

Co-authored-by: chaton <thomas@grid.ai>

Fix root node resolution in slurm environment

1d99530

Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com> Co-authored-by: Nicki Skafte <skaftenicki@gmail.com> Co-authored-by: chaton <thomas@grid.ai>

fix argparse conflicting options error (#5569)

2b67388

Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com>

Prepare 1.1.5 release (#5576)

09b8dc7

Co-authored-by: Rohit Gupta <rohitgr1998@gmail.com>

Fix sync

a374168

resolve wrong merge tpu yapf

Borda self-assigned this Feb 3, 2021

Borda approved these changes Feb 3, 2021

View reviewed changes

carmocca closed this Feb 3, 2021

carmocca reopened this Feb 3, 2021

justusschock approved these changes Feb 4, 2021

View reviewed changes

rohitgr7 approved these changes Feb 4, 2021

View reviewed changes

carmocca added the ready to be merged PRs ready to be merged label Feb 4, 2021

lexierule merged commit d05cdf8 into Lightning-AI:release/1.2-dev Feb 4, 2021

carmocca deleted the sync-1.1.5 branch February 4, 2021 14:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sync master/1.1.5 into release/1.2 [full merge, no squash]#5583

Sync master/1.1.5 into release/1.2 [full merge, no squash]#5583
lexierule merged 21 commits intoLightning-AI:release/1.2-devfrom
carmocca:sync-1.1.5

carmocca commented Jan 19, 2021 •

edited

Loading

Uh oh!

Borda left a comment

Uh oh!

Borda commented Jan 23, 2021

Uh oh!

pep8speaks commented Jan 25, 2021 •

edited

Loading

Uh oh!

Borda commented Jan 25, 2021

Uh oh!

awaelchli commented Jan 27, 2021

Uh oh!

Borda commented Jan 27, 2021

Uh oh!

Borda commented Feb 3, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

14 participants

Conversation

carmocca commented Jan 19, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Uh oh!

Borda left a comment

Choose a reason for hiding this comment

Uh oh!

Borda commented Jan 23, 2021

Uh oh!

pep8speaks commented Jan 25, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Comment last updated at 2021-02-03 22:07:52 UTC

Uh oh!

Borda commented Jan 25, 2021

Uh oh!

awaelchli commented Jan 27, 2021

Uh oh!

Borda commented Jan 27, 2021

Uh oh!

Borda commented Feb 3, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

14 participants

carmocca commented Jan 19, 2021 •

edited

Loading

pep8speaks commented Jan 25, 2021 •

edited

Loading