Skip to content

Commit c74ff18

Browse files
MGAMZHAOCHENYE
authored andcommitted
Lint using yapf.
1 parent 9ef0785 commit c74ff18

File tree

20 files changed

+60
-58
lines changed

20 files changed

+60
-58
lines changed

mmengine/_strategy/deepspeed.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -310,10 +310,10 @@ def __init__(
310310
self.config.setdefault('gradient_accumulation_steps', 1)
311311
self.config['steps_per_print'] = steps_per_print
312312
self._inputs_to_half = inputs_to_half
313-
assert (exclude_frozen_parameters is None or
314-
digit_version(deepspeed.__version__) >= digit_version('0.13.2')
315-
), ('DeepSpeed >= 0.13.2 is required to enable '
316-
'exclude_frozen_parameters')
313+
assert (exclude_frozen_parameters is None or digit_version(
314+
deepspeed.__version__) >= digit_version('0.13.2')), (
315+
'DeepSpeed >= 0.13.2 is required to enable '
316+
'exclude_frozen_parameters')
317317
self.exclude_frozen_parameters = exclude_frozen_parameters
318318

319319
register_deepspeed_optimizers()

mmengine/config/config.py

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,10 @@
4646
def _lazy2string(cfg_dict, dict_type=None):
4747
if isinstance(cfg_dict, dict):
4848
dict_type = dict_type or type(cfg_dict)
49-
return dict_type(
50-
{k: _lazy2string(v, dict_type)
51-
for k, v in dict.items(cfg_dict)})
49+
return dict_type({
50+
k: _lazy2string(v, dict_type)
51+
for k, v in dict.items(cfg_dict)
52+
})
5253
elif isinstance(cfg_dict, (tuple, list)):
5354
return type(cfg_dict)(_lazy2string(v, dict_type) for v in cfg_dict)
5455
elif isinstance(cfg_dict, (LazyAttr, LazyObject)):
@@ -271,13 +272,15 @@ def __reduce_ex__(self, proto):
271272
# called by CPython interpreter during pickling. See more details in
272273
# https://github.com/python/cpython/blob/8d61a71f9c81619e34d4a30b625922ebc83c561b/Objects/typeobject.c#L6196 # noqa: E501
273274
if digit_version(platform.python_version()) < digit_version('3.8'):
274-
return (self.__class__, ({k: v
275-
for k, v in super().items()}, ), None,
276-
None, None)
275+
return (self.__class__, ({
276+
k: v
277+
for k, v in super().items()
278+
}, ), None, None, None)
277279
else:
278-
return (self.__class__, ({k: v
279-
for k, v in super().items()}, ), None,
280-
None, None, None)
280+
return (self.__class__, ({
281+
k: v
282+
for k, v in super().items()
283+
}, ), None, None, None, None)
281284

282285
def __eq__(self, other):
283286
if isinstance(other, ConfigDict):

mmengine/dataset/utils.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,8 @@ def default_collate(data_batch: Sequence) -> Any:
158158
return [default_collate(samples) for samples in transposed]
159159
elif isinstance(data_item, Mapping):
160160
return data_item_type({
161-
key: default_collate([d[key] for d in data_batch])
161+
key:
162+
default_collate([d[key] for d in data_batch])
162163
for key in data_item
163164
})
164165
else:

mmengine/fileio/backends/local_backend.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ def isfile(self, filepath: Union[str, Path]) -> bool:
156156
"""
157157
return osp.isfile(filepath)
158158

159-
def join_path(self, filepath: Union[str, Path],
160-
*filepaths: Union[str, Path]) -> str:
159+
def join_path(self, filepath: Union[str, Path], *filepaths:
160+
Union[str, Path]) -> str:
161161
r"""Concatenate all file paths.
162162
163163
Join one or more filepath components intelligently. The return value

mmengine/fileio/file_client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,8 +385,8 @@ def isfile(self, filepath: Union[str, Path]) -> bool:
385385
"""
386386
return self.client.isfile(filepath)
387387

388-
def join_path(self, filepath: Union[str, Path],
389-
*filepaths: Union[str, Path]) -> str:
388+
def join_path(self, filepath: Union[str, Path], *filepaths:
389+
Union[str, Path]) -> str:
390390
r"""Concatenate all file paths.
391391
392392
Join one or more filepath components intelligently. The return value

mmengine/hooks/checkpoint_hook.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,10 @@ def __init__(self,
196196
self.save_best = save_best
197197

198198
# rule logic
199-
assert (isinstance(rule, str) or is_list_of(rule, str)
200-
or (rule is None)), (
201-
'"rule" should be a str or list of str or None, '
202-
f'but got {type(rule)}')
199+
assert (isinstance(rule, str) or is_list_of(rule, str) or
200+
(rule
201+
is None)), ('"rule" should be a str or list of str or None, '
202+
f'but got {type(rule)}')
203203
if isinstance(rule, list):
204204
# check the length of rule list
205205
assert len(rule) in [

mmengine/model/test_time_aug.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,10 @@ def test_step(self, data):
124124
data_list: Union[List[dict], List[list]]
125125
if isinstance(data, dict):
126126
num_augs = len(data[next(iter(data))])
127-
data_list = [{key: value[idx]
128-
for key, value in data.items()}
129-
for idx in range(num_augs)]
127+
data_list = [{
128+
key: value[idx]
129+
for key, value in data.items()
130+
} for idx in range(num_augs)]
130131
elif isinstance(data, (tuple, list)):
131132
num_augs = len(data[0])
132133
data_list = [[_data[idx] for _data in data]

mmengine/runner/checkpoint.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -601,9 +601,10 @@ def _load_checkpoint_to_model(model,
601601
# strip prefix of state_dict
602602
metadata = getattr(state_dict, '_metadata', OrderedDict())
603603
for p, r in revise_keys:
604-
state_dict = OrderedDict(
605-
{re.sub(p, r, k): v
606-
for k, v in state_dict.items()})
604+
state_dict = OrderedDict({
605+
re.sub(p, r, k): v
606+
for k, v in state_dict.items()
607+
})
607608
# Keep metadata in state_dict
608609
state_dict._metadata = metadata
609610

mmengine/utils/dl_utils/torch_ops.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
from ..version_utils import digit_version
55
from .parrots_wrapper import TORCH_VERSION
66

7-
_torch_version_meshgrid_indexing = (
8-
'parrots' not in TORCH_VERSION
9-
and digit_version(TORCH_VERSION) >= digit_version('1.10.0a0'))
7+
_torch_version_meshgrid_indexing = ('parrots' not in TORCH_VERSION
8+
and digit_version(TORCH_VERSION)
9+
>= digit_version('1.10.0a0'))
1010

1111

1212
def torch_meshgrid(*tensors):

mmengine/utils/package_utils.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ def get_installed_path(package: str) -> str:
6464
f'{package} is a namespace package, which is invalid '
6565
'for `get_install_path`')
6666
else:
67-
raise PackageNotFoundError(
68-
f'Package {package} is not installed')
67+
raise PackageNotFoundError(f'Package {package} is not installed')
6968

7069
# Check if package directory exists in the location
7170
possible_path = osp.join(location, package)

0 commit comments

Comments
 (0)