From 4d258bc63b271b8f6e2c6755942eea835ffe7c0e Mon Sep 17 00:00:00 2001 From: SeanNaren Date: Thu, 17 Dec 2020 11:57:19 +0000 Subject: [PATCH 1/9] update CHANGELOG.md, increment for RC --- CHANGELOG.md | 13 +++++++++++++ pytorch_lightning/__init__.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 051fe5fae09e5..cc752cbce20ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,9 +18,22 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). ### Removed +Disable pl optimizer by default to temporarily fix AMP issues ([#5163](https://github.com/PyTorchLightning/pytorch-lightning/pull/5163) ### Fixed +Metric reduction with Logging ([#5150](https://github.com/PyTorchLightning/pytorch-lightning/pull/5150) + + +Remove nan loss in manual optimization ([#5121](https://github.com/PyTorchLightning/pytorch-lightning/pull/5121) + + +Support number for logging with `sync_dist=True` ([#5080](https://github.com/PyTorchLightning/pytorch-lightning/pull/5080) + + +Un-balanced logging properly supported ([#5119](https://github.com/PyTorchLightning/pytorch-lightning/pull/5119) + + ## [1.1.1] - 2020-12-15 diff --git a/pytorch_lightning/__init__.py b/pytorch_lightning/__init__.py index 222263ea2d385..6832441a77309 100644 --- a/pytorch_lightning/__init__.py +++ b/pytorch_lightning/__init__.py @@ -1,6 +1,6 @@ """Root package info.""" -__version__ = '1.1.1' +__version__ = '1.1.2rc' __author__ = 'William Falcon et al.' __author_email__ = 'waf2107@columbia.edu' __license__ = 'Apache-2.0' From 4701266e8f04240f38c3ddeb5fcd3caabc3dd78b Mon Sep 17 00:00:00 2001 From: SeanNaren Date: Thu, 17 Dec 2020 11:59:13 +0000 Subject: [PATCH 2/9] Add missing changelog update --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc752cbce20ea..52df6ddcc71e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,8 @@ Support number for logging with `sync_dist=True` ([#5080](https://github.com/PyT Un-balanced logging properly supported ([#5119](https://github.com/PyTorchLightning/pytorch-lightning/pull/5119) +Fix hanging in DDP HPC accelerators ([#5157](https://github.com/PyTorchLightning/pytorch-lightning/pull/5157) + ## [1.1.1] - 2020-12-15 From fba205808eb7f3495701cec71e5f7d106359d8d3 Mon Sep 17 00:00:00 2001 From: SeanNaren Date: Thu, 17 Dec 2020 12:00:31 +0000 Subject: [PATCH 3/9] Added a few more --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52df6ddcc71e5..bfda4f518af2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,12 @@ Un-balanced logging properly supported ([#5119](https://github.com/PyTorchLightn Fix hanging in DDP HPC accelerators ([#5157](https://github.com/PyTorchLightning/pytorch-lightning/pull/5157) +Fix saved filename in ModelCheckpoint if it already exists ([#4861](https://github.com/PyTorchLightning/pytorch-lightning/pull/4861) + + +Fix reset TensorRunningAccum ([#5106](https://github.com/PyTorchLightning/pytorch-lightning/pull/5106) + + ## [1.1.1] - 2020-12-15 ### Added From ed3ec4677e29751f56a9d9112df0086c81594153 Mon Sep 17 00:00:00 2001 From: SeanNaren Date: Thu, 17 Dec 2020 12:02:09 +0000 Subject: [PATCH 4/9] Move to added --- CHANGELOG.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bfda4f518af2e..aafa01bc1ffae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). ### Added +Support number for logging with `sync_dist=True` ([#5080](https://github.com/PyTorchLightning/pytorch-lightning/pull/5080) + ### Changed @@ -28,9 +30,6 @@ Metric reduction with Logging ([#5150](https://github.com/PyTorchLightning/pytor Remove nan loss in manual optimization ([#5121](https://github.com/PyTorchLightning/pytorch-lightning/pull/5121) -Support number for logging with `sync_dist=True` ([#5080](https://github.com/PyTorchLightning/pytorch-lightning/pull/5080) - - Un-balanced logging properly supported ([#5119](https://github.com/PyTorchLightning/pytorch-lightning/pull/5119) From 64cdee9d879ec40d8dc89a95aa162ba55706067e Mon Sep 17 00:00:00 2001 From: SeanNaren Date: Thu, 17 Dec 2020 12:18:16 +0000 Subject: [PATCH 5/9] Address code review --- CHANGELOG.md | 33 +++++++++++++++++++++++++-------- pytorch_lightning/__init__.py | 2 +- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aafa01bc1ffae..08eebe2294ff7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,24 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). ### Added -Support number for logging with `sync_dist=True` ([#5080](https://github.com/PyTorchLightning/pytorch-lightning/pull/5080) + +### Changed + + +### Deprecated + + +### Removed + + +### Fixed + + +## [1.1.2rc1] - 2020-12-17 + +### Added + +- Support number for logging with `sync_dist=True` ([#5080](https://github.com/PyTorchLightning/pytorch-lightning/pull/5080) ### Changed @@ -20,26 +37,26 @@ Support number for logging with `sync_dist=True` ([#5080](https://github.com/PyT ### Removed -Disable pl optimizer by default to temporarily fix AMP issues ([#5163](https://github.com/PyTorchLightning/pytorch-lightning/pull/5163) +- `enable_pl_optimizer=False` by default to temporarily fix AMP issues ([#5163](https://github.com/PyTorchLightning/pytorch-lightning/pull/5163) ### Fixed -Metric reduction with Logging ([#5150](https://github.com/PyTorchLightning/pytorch-lightning/pull/5150) +- Metric reduction with Logging ([#5150](https://github.com/PyTorchLightning/pytorch-lightning/pull/5150) -Remove nan loss in manual optimization ([#5121](https://github.com/PyTorchLightning/pytorch-lightning/pull/5121) +- Remove nan loss in manual optimization ([#5121](https://github.com/PyTorchLightning/pytorch-lightning/pull/5121) -Un-balanced logging properly supported ([#5119](https://github.com/PyTorchLightning/pytorch-lightning/pull/5119) +- Un-balanced logging properly supported ([#5119](https://github.com/PyTorchLightning/pytorch-lightning/pull/5119) -Fix hanging in DDP HPC accelerators ([#5157](https://github.com/PyTorchLightning/pytorch-lightning/pull/5157) +- Fix hanging in DDP HPC accelerators ([#5157](https://github.com/PyTorchLightning/pytorch-lightning/pull/5157) -Fix saved filename in ModelCheckpoint if it already exists ([#4861](https://github.com/PyTorchLightning/pytorch-lightning/pull/4861) +- Fix saved filename in ModelCheckpoint if it already exists ([#4861](https://github.com/PyTorchLightning/pytorch-lightning/pull/4861) -Fix reset TensorRunningAccum ([#5106](https://github.com/PyTorchLightning/pytorch-lightning/pull/5106) +- Fix reset TensorRunningAccum ([#5106](https://github.com/PyTorchLightning/pytorch-lightning/pull/5106) ## [1.1.1] - 2020-12-15 diff --git a/pytorch_lightning/__init__.py b/pytorch_lightning/__init__.py index 6832441a77309..af63190037711 100644 --- a/pytorch_lightning/__init__.py +++ b/pytorch_lightning/__init__.py @@ -1,6 +1,6 @@ """Root package info.""" -__version__ = '1.1.2rc' +__version__ = '1.1.2rc1' __author__ = 'William Falcon et al.' __author_email__ = 'waf2107@columbia.edu' __license__ = 'Apache-2.0' From 2ecf4b28290c4d58d24154a0f3259aab3a4c24aa Mon Sep 17 00:00:00 2001 From: SeanNaren Date: Thu, 17 Dec 2020 12:18:48 +0000 Subject: [PATCH 6/9] Missing space --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 08eebe2294ff7..c116cc072bead 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - `enable_pl_optimizer=False` by default to temporarily fix AMP issues ([#5163](https://github.com/PyTorchLightning/pytorch-lightning/pull/5163) + ### Fixed - Metric reduction with Logging ([#5150](https://github.com/PyTorchLightning/pytorch-lightning/pull/5150) From ed26d2442cd281065447d0c7d94ada025740f718 Mon Sep 17 00:00:00 2001 From: SeanNaren Date: Thu, 17 Dec 2020 12:21:27 +0000 Subject: [PATCH 7/9] Remove unreleased --- CHANGELOG.md | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c116cc072bead..66ccab23bc6de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,23 +5,6 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). -## [unreleased.BugFix] - YYYY-MM-DD - -### Added - - -### Changed - - -### Deprecated - - -### Removed - - -### Fixed - - ## [1.1.2rc1] - 2020-12-17 ### Added From 296f1f88f986f73cdabe48d53554b16c6a78fefa Mon Sep 17 00:00:00 2001 From: SeanNaren Date: Thu, 17 Dec 2020 12:28:40 +0000 Subject: [PATCH 8/9] Remove lines --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66ccab23bc6de..cccc84e4af004 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -55,8 +55,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - Refactor load in checkpoint connector ([#4593](https://github.com/PyTorchLightning/pytorch-lightning/pull/4593) - Fixed the saved filename in `ModelCheckpoint` when it already exists ([#4861](https://github.com/PyTorchLightning/pytorch-lightning/pull/4861)) - -======= ### Removed - Drop duplicate metrics ([#5014](https://github.com/PyTorchLightning/pytorch-lightning/pull/5014) From d28f8437deff178c9281d6502c2b7658e4d721cc Mon Sep 17 00:00:00 2001 From: Rohit Gupta Date: Thu, 17 Dec 2020 18:20:42 +0530 Subject: [PATCH 9/9] Update CHANGELOG.md --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cccc84e4af004..eb2ae514f2133 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,10 +37,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - Fix hanging in DDP HPC accelerators ([#5157](https://github.com/PyTorchLightning/pytorch-lightning/pull/5157) -- Fix saved filename in ModelCheckpoint if it already exists ([#4861](https://github.com/PyTorchLightning/pytorch-lightning/pull/4861) +- Fix saved filename in `ModelCheckpoint` if it already exists ([#4861](https://github.com/PyTorchLightning/pytorch-lightning/pull/4861) -- Fix reset TensorRunningAccum ([#5106](https://github.com/PyTorchLightning/pytorch-lightning/pull/5106) +- Fix reset `TensorRunningAccum` ([#5106](https://github.com/PyTorchLightning/pytorch-lightning/pull/5106) ## [1.1.1] - 2020-12-15