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

Resolve batch_size in ResultCollection not resetted to 1 on epoch end #10242

Merged
merged 4 commits into from
Oct 29, 2021
Merged

Resolve batch_size in ResultCollection not resetted to 1 on epoch end #10242

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f41a87b
resolve logging not resetting batch size on epoch end
tchaton Oct 29, 2021
3240cb4
add changelog
tchaton Oct 29, 2021
61d12a5
use batch_size setter
tchaton Oct 29, 2021
4d6b672
mypy
carmocca Oct 29, 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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,6 +680,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
- Fixed iterating over a logger collection when `fast_dev_run > 0` ([#10232](https://github.com/PyTorchLightning/pytorch-lightning/pull/10232))


- Fixed `batch_size` in `ResultCollection` not being reset to 1 on epoch end ([#10242](https://github.com/PyTorchLightning/pytorch-lightning/pull/10242))


## [1.4.9] - 2021-09-30

Expand Down
1 change: 1 addition & 0 deletions pytorch_lightning/trainer/connectors/logger_connector/logger_connector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ def epoch_end_reached(self) -> None:
self._epoch_end_reached = True
self._batch_idx = None
self._split_idx = None
self.trainer._results.batch_size = 1

def on_epoch_end(self) -> None:
assert self._epoch_end_reached
Expand Down
8 changes: 8 additions & 0 deletions tests/trainer/logging_/test_train_loop_logging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,6 +726,14 @@ def on_validation_batch_end(self, outputs, batch, batch_idx, dataloader_idx):
assert self.trainer._results.batch_size == 2
self.log("on_validation_batch_end", 1.0, reduce_fx="sum")

def training_epoch_end(self, *_) -> None:
self.log("training_epoch_end", 3.0, reduce_fx="mean")
assert self.trainer._results["training_epoch_end.training_epoch_end"].value == 3.0

def validation_epoch_end(self, *_) -> None:
self.log("validation_epoch_end", 3.0, reduce_fx="mean")
assert self.trainer._results["validation_epoch_end.validation_epoch_end"].value == 3.0

model = TestModel()
trainer = Trainer(
enable_progress_bar=False,
Expand Down