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

Small code simplification in training_epoch_loop.py #10146

Merged
merged 8 commits into from
Oct 26, 2021
Merged

Small code simplification in training_epoch_loop.py #10146

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
29b113d
dep opt_con
daniellepintz Oct 25, 2021
5966894
fix
daniellepintz Oct 25, 2021
7757b06
protect
daniellepintz Oct 25, 2021
b94cb61
Merge branch 'master' of https://github.com/PyTorchLightning/pytorch-…
daniellepintz Oct 25, 2021
2a4b6db
add changelog entry
awaelchli Oct 25, 2021
4362868
fix training_epoch_loop
daniellepintz Oct 26, 2021
091bd94
Merge branch 'optimizer_connector' of github.com:daniellepintz/pytorc…
daniellepintz Oct 26, 2021
1b6085f
Merge branch 'master' of https://github.com/PyTorchLightning/pytorch-…
daniellepintz Oct 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pytorch_lightning/loops/epoch/training_epoch_loop.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ def _update_learning_rates(
if update_plateau_schedulers ^ lr_scheduler["reduce_on_plateau"]:
continue

current_idx = self.trainer.fit_loop.batch_idx if interval == "step" else self.trainer.current_epoch
current_idx = self.batch_idx if interval == "step" else self.trainer.current_epoch
current_idx += 1 # account for both batch and epoch starts from 0
# Take step if call to update_learning_rates matches the interval key and
# the current step modulo the schedulers frequency is zero
Expand All @@ -502,15 +502,15 @@ def _update_learning_rates(
)
continue

self.trainer.fit_loop.epoch_loop.scheduler_progress.increment_ready()
self.scheduler_progress.increment_ready()

# update LR
if lr_scheduler["reduce_on_plateau"]:
lr_scheduler["scheduler"].step(monitor_val)
else:
lr_scheduler["scheduler"].step()

self.trainer.fit_loop.epoch_loop.scheduler_progress.increment_completed()
self.scheduler_progress.increment_completed()

def _get_monitor_value(self, key: str) -> Any:
# this is a separate method to aid in testing
Expand Down