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

Jump to bottom

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

Merged
merged 21 commits into from
Feb 4, 2021
Merged

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

merged 21 commits into from
Feb 4, 2021

Conversation

carmocca
Copy link
Contributor

@carmocca carmocca commented Jan 19, 2021 •
edited
Loading

What does this PR do?

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

Continuation of #5483

@carmocca carmocca added this to the 1.2 milestone Jan 19, 2021
Borda
Borda requested changes Jan 22, 2021
View reviewed changes
Copy link
Member

@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.

@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
Copy link
Member

Borda commented Jan 23, 2021

@carmocca any update here?

@SeanNaren SeanNaren mentioned this pull request Jan 23, 2021
Merged
12 tasks
@carmocca carmocca requested a review from Borda January 25, 2021 14:35
@pep8speaks
Copy link

pep8speaks commented Jan 25, 2021 •
edited
Loading

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
Copy link
Member

Borda commented Jan 25, 2021

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

@Borda 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 mergify bot removed the has conflicts label Jan 26, 2021
@rohitgr7 rohitgr7 mentioned this pull request Jan 26, 2021
Merged
9 tasks
@awaelchli
Copy link
Contributor

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

@Borda
Copy link
Member

Borda commented Jan 27, 2021

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

I hope just after @carmocca resolves conflicts :]

rohitgr7 and others added 19 commits February 3, 2021 19:39
@rohitgr7 @github-actions @Borda
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>
@rohitgr7 @Borda
[Docs] fix on_after_backward example (#5278)
5bef046 
* fix on_after_backward docs

* doc fix
@awaelchli @github-actions @Borda
fix typo in multi-gpu docs (#5402)
0ff4c56 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@Borda
pipeline release CI (#5494)
c27d4d2 
* pipeline release CI

* trigger

* trigger

* .

* t1

* t2

* t1

* t2
@rohitgr7 @github-actions @Borda
Refactor setup_training and remove test_mode (#5388)
10c7dbe 
* 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>
@Borda @github-actions
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>
@awaelchli @carmocca
@github-actions @Borda
Fix visual progress bar bug / properly reset progress bar (#4579)
7b42494 
* 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>
@Borda @github-actions @s-rog
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>
@lacrosse91 @Borda @rohitgr7
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>
@Skyy93 @Borda
Tensorboard Docu about Hyperparams saving (#5158)
a375240 
* 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>
@rohitgr7 @Borda
fix reinit_schedulers with correct optimizer (#5519)
293984b 
* update test

* syntax

* fix

* update test

* scheduler

* only apex

* fix

* rev drone

* chlog
@ananthsub @Borda
[bugfix] Fix signature mismatch in DDPCPUHPCAccelerator's model_to_de…
ad4e25f 
…vice (#5505)

* Update ddp_cpu_hpc_accelerator.py

* Update CHANGELOG.md
@rohitgr7 @Borda
Fix val_check_interval with fast_dev_run (#5540)
f2229fd 
* fix val_check_interval with fast_dev_run

* chlog
@carmocca @Borda
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
@sidhantls @Borda
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
@carmocca @tchaton @Borda
Drop greetings comment (#5563)
fd6b3ec 
Co-authored-by: chaton <thomas@grid.ai>
@tobiasmaier @Borda
@SkafteNicki @tchaton
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>
@sidhantls @Borda
fix argparse conflicting options error (#5569)
2b67388 
Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com>
@carmocca @rohitgr7 @Borda
Prepare 1.1.5 release (#5576)
09b8dc7 
Co-authored-by: Rohit Gupta <rohitgr1998@gmail.com>
@Borda
Copy link
Member

Borda commented Feb 3, 2021

is the config changed?

yes: #5739 (comment)

yes, changing it back in #5768

@rohitgr7 @Borda
Fix sync
a374168 
resolve wrong merge

tpu

yapf
@Borda Borda self-assigned this Feb 3, 2021
@carmocca carmocca closed this Feb 3, 2021
@carmocca carmocca reopened this Feb 3, 2021
@carmocca carmocca added the ready PRs ready to be merged label Feb 4, 2021
@lexierule lexierule merged commit d05cdf8 into Lightning-AI:release/1.2-dev Feb 4, 2021
@carmocca carmocca deleted the sync-1.1.5 branch February 4, 2021 14:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tchaton tchaton tchaton approved these changes

@awaelchli awaelchli awaelchli approved these changes

@rohitgr7 rohitgr7 rohitgr7 approved these changes

@justusschock justusschock justusschock approved these changes

@Borda Borda Borda approved these changes

@edenlightning edenlightning Awaiting requested review from edenlightning

@SeanNaren SeanNaren Awaiting requested review from SeanNaren

@williamFalcon williamFalcon Awaiting requested review from williamFalcon

Assignees

@Borda Borda

@SeanNaren SeanNaren

@carmocca carmocca

Labels
priority: 1 Medium priority task ready PRs ready to be merged
Projects
None yet
Milestone
pl:1.2
Development

Successfully merging this pull request may close these issues.