mirrors
/
mmcv
mirror of https://github.com/open-mmlab/mmcv.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Change dict update order (#1108) 

* Change dict update order

* Change dict() with {}

* Added comments with PR link

* Fixed comments according to Lint Job
pull/1160/head
Antonio Lanza 2021-06-29 16:11:21 +02:00 committed by GitHub
parent 1d5ee6e09a
commit b035fe9171
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mmcv/runner/epoch_based_runner.py
View File

@ -151,14 +151,17 @@ class EpochBasedRunner(BaseRunner):
Defaults to True. Defaults to True.
""" """
if meta is None: if meta is None:
meta = dict(epoch=self.epoch + 1, iter=self.iter) meta = {}
elif isinstance(meta, dict): elif not isinstance(meta, dict):
meta.update(epoch=self.epoch + 1, iter=self.iter)
else:
raise TypeError( raise TypeError(
f'meta should be a dict or None, but got {type(meta)}') f'meta should be a dict or None, but got {type(meta)}')
if self.meta is not None: if self.meta is not None:
meta.update(self.meta) 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) filename = filename_tmpl.format(self.epoch + 1)
filepath = osp.join(out_dir, filename) filepath = osp.join(out_dir, filename)

11
mmcv/runner/iter_based_runner.py
View File

@ -195,14 +195,17 @@ class IterBasedRunner(BaseRunner):
latest checkpoint file. Defaults to True. latest checkpoint file. Defaults to True.
""" """
if meta is None: if meta is None:
meta = dict(iter=self.iter + 1, epoch=self.epoch + 1) meta = {}
elif isinstance(meta, dict): elif not isinstance(meta, dict):
meta.update(iter=self.iter + 1, epoch=self.epoch + 1)
else:
raise TypeError( raise TypeError(
f'meta should be a dict or None, but got {type(meta)}') f'meta should be a dict or None, but got {type(meta)}')
if self.meta is not None: if self.meta is not None:
meta.update(self.meta) 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) filename = filename_tmpl.format(self.iter + 1)
filepath = osp.join(out_dir, filename) filepath = osp.join(out_dir, filename)