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

Fix support for ModelCheckpoint monitors with dots #12783

Merged
merged 6 commits into from
Apr 21, 2022
Merged

Fix support for ModelCheckpoint monitors with dots #12783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a2cddec
fix bug #12770: ModelCheckpoint can't work properly with filename whi…
HenryLau0220 Apr 16, 2022
ec77928
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 16, 2022
16cc83a
Add test
carmocca Apr 21, 2022
36fcb35
Merge branch 'master' into bugfix/12770_ModelCheckpoint
carmocca Apr 21, 2022
b597b7c
CHANGELOG
carmocca Apr 21, 2022
5d00659
Add reference
carmocca Apr 21, 2022
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: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
- When using custom DataLoaders in LightningDataModule, multiple inheritance is resolved properly ([#12716](https://github.com/PyTorchLightning/pytorch-lightning/pull/12716))


-
- Fixed support for `ModelCheckpoint` monitors with dots ([#12783](https://github.com/PyTorchLightning/pytorch-lightning/pull/12783))


## [1.6.1] - 2022-04-13
Expand Down
5 changes: 4 additions & 1 deletion pytorch_lightning/callbacks/model_checkpoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,9 +517,12 @@ def _format_checkpoint_name(
if auto_insert_metric_name:
filename = filename.replace(group, name + "={" + name)

# support for dots: https://stackoverflow.com/a/7934969
filename = filename.replace(group, f"{{0[{name}]")

if name not in metrics:
metrics[name] = 0
filename = filename.format(**metrics)
filename = filename.format(metrics)

if prefix:
filename = cls.CHECKPOINT_JOIN_CHAR.join([prefix, filename])
Expand Down
6 changes: 6 additions & 0 deletions tests/checkpointing/test_model_checkpoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,12 @@ def test_model_checkpoint_format_checkpoint_name(tmpdir):
)
assert ckpt_name == "epoch=003-val_acc=0.03"

# dots in the metric name
ckpt_name = ModelCheckpoint._format_checkpoint_name(
"mAP@0.50={val/mAP@0.50:.4f}", {"val/mAP@0.50": 0.2}, auto_insert_metric_name=False
)
assert ckpt_name == "mAP@0.50=0.2000"


class ModelCheckpointExtensionTest(ModelCheckpoint):
FILE_EXTENSION = ".tpkc"
Expand Down