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

Change dict update order #1108

Merged
merged 4 commits into from
Jun 29, 2021
Merged

Change dict update order #1108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5baf772
Change dict update order
antoniolanza1996 Jun 17, 2021
19b3904
Change dict() with {}
antoniolanza1996 Jun 18, 2021
2ba652c
Added comments with PR link
antoniolanza1996 Jun 28, 2021
9f36da0
Fixed comments according to Lint Job
antoniolanza1996 Jun 28, 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
11 changes: 7 additions & 4 deletions mmcv/runner/epoch_based_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,14 +149,17 @@ def save_checkpoint(self,
Defaults to True.
"""
if meta is None:
meta = dict(epoch=self.epoch + 1, iter=self.iter)
elif isinstance(meta, dict):
meta.update(epoch=self.epoch + 1, iter=self.iter)
else:
meta = {}
elif not isinstance(meta, dict):
raise TypeError(
f'meta should be a dict or None, but got {type(meta)}')
if self.meta is not None:
antoniolanza1996 marked this conversation as resolved.
Show resolved Hide resolved
meta.update(self.meta)
# Note: meta.update(self.meta) should be done before
# meta.update(epoch=self.epoch + 1, iter=self.iter) otherwise
# there will be problems with resumed checkpoints.
# More details in https://github.com/open-mmlab/mmcv/pull/1108
meta.update(epoch=self.epoch + 1, iter=self.iter)

filename = filename_tmpl.format(self.epoch + 1)
filepath = osp.join(out_dir, filename)
Expand Down
11 changes: 7 additions & 4 deletions mmcv/runner/iter_based_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,14 +193,17 @@ def save_checkpoint(self,
latest checkpoint file. Defaults to True.
"""
if meta is None:
meta = dict(iter=self.iter + 1, epoch=self.epoch + 1)
elif isinstance(meta, dict):
meta.update(iter=self.iter + 1, epoch=self.epoch + 1)
else:
meta = {}
elif not isinstance(meta, dict):
raise TypeError(
f'meta should be a dict or None, but got {type(meta)}')
if self.meta is not None:
meta.update(self.meta)
# Note: meta.update(self.meta) should be done before
# meta.update(epoch=self.epoch + 1, iter=self.iter) otherwise
# there will be problems with resumed checkpoints.
# More details in https://github.com/open-mmlab/mmcv/pull/1108
meta.update(epoch=self.epoch + 1, iter=self.iter)

filename = filename_tmpl.format(self.iter + 1)
filepath = osp.join(out_dir, filename)
Expand Down