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

Jump to bottom

[Enhance] Right align the log #436

Merged
merged 7 commits into from
Nov 21, 2022
Merged

[Enhance] Right align the log #436

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c1ac287
right allign the log
HAOCHENYE Aug 15, 2022
231e1b0
fix as comment
HAOCHENYE Aug 25, 2022
edac386
Merge branch 'main' into HAOCHENYE/allign_the_log
HAOCHENYE Oct 27, 2022
40cd08b
Add comments for magic number 3
HAOCHENYE Nov 20, 2022
9e661a3
Merge remote-tracking branch 'origin/main' into HAOCHENYE/allign_the_log
HAOCHENYE Nov 20, 2022
92c1abd
remove max_len_str
HAOCHENYE Nov 20, 2022
9196e21
Update mmengine/runner/log_processor.py
zhouzaida Nov 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 25 additions & 5 deletions mmengine/runner/log_processor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,20 +140,40 @@ def get_log_after_iter(self, runner, batch_idx: int,
# train: Epoch [5/10000] ... (divided by `max_iter`)
# val/test: Epoch [5/2000] ... (divided by length of dataloader)
if self.by_epoch:
# Align the iteration log:
# Epoch(train) [9][010/270]
HAOCHENYE marked this conversation as resolved.
Show resolved Hide resolved
# ... ||| |||
# Epoch(train) [9][100/270]
max_dataloader_len = len(current_loop.dataloader)
max_str_len = len(str(max_dataloader_len))
HAOCHENYE marked this conversation as resolved.
Show resolved Hide resolved
cur_iter_str = str(cur_iter).rjust(max_str_len)

if mode in ['train', 'val']:
# Right Align the epoch log:
# Epoch(train) [9][100/270]
# ... ||
# Epoch(train) [100][100/270]
cur_epoch = self._get_epoch(runner, mode)
max_epochs = runner.max_epochs
max_str_len = len(str(max_epochs)) + 3
HAOCHENYE marked this conversation as resolved.
Show resolved Hide resolved
cur_epoch_str = str(f'[{cur_epoch}]').rjust(max_str_len, ' ')
tag['epoch'] = cur_epoch
log_str = (f'Epoch({mode}) [{cur_epoch}]'
f'[{cur_iter}/{len(current_loop.dataloader)}] ')
log_str = (f'Epoch({mode}){cur_epoch_str}'
f'[{cur_iter_str}/{max_dataloader_len}] ')
else:
log_str = (f'Epoch({mode}) '
f'[{cur_iter}/{len(current_loop.dataloader)}] ')
f'[{cur_iter_str}/{max_dataloader_len}] ')
else:
if mode == 'train':
max_str_len = len(str(runner.max_iters))
cur_iter_str = str(cur_iter).rjust(max_str_len)
log_str = (f'Iter({mode}) '
f'[{cur_iter}/{runner.max_iters}] ')
f'[{cur_iter_str}/{runner.max_iters}] ')
else:
log_str = (f'Iter({mode}) [{batch_idx + 1}'
max_dataloader_len = len(current_loop.dataloader)
max_str_len = len(str(max_dataloader_len))
cur_iter_str = str(batch_idx + 1).rjust(max_str_len)
log_str = (f'Iter({mode}) [{cur_iter_str}'
f'/{len(current_loop.dataloader)}] ')
# Concatenate lr, momentum string with log header.
log_str += f'{lr_str} '
Expand Down
6 changes: 5 additions & 1 deletion tests/test_runner/test_log_processor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def test_get_log_after_iter(self, by_epoch, mode):
if by_epoch:
if mode in ['train', 'val']:
cur_epoch = log_processor._get_epoch(self.runner, mode)
log_str = (f'Epoch({mode}) [{cur_epoch}][2/'
log_str = (f'Epoch({mode}) [{cur_epoch}][ 2/'
f'{len(cur_loop.dataloader)}] ')
else:
log_str = (f'Epoch({mode}) [2/{len(cur_loop.dataloader)}] ')
Expand All @@ -114,6 +114,9 @@ def test_get_log_after_iter(self, by_epoch, mode):
if mode == 'train':
max_iters = self.runner.max_iters
log_str = f'Iter({mode}) [11/{max_iters}] '
elif mode == 'val':
max_iters = len(cur_loop.dataloader)
log_str = f'Iter({mode}) [ 2/{max_iters}] '
else:
max_iters = len(cur_loop.dataloader)
log_str = f'Iter({mode}) [2/{max_iters}] '
Expand Down Expand Up @@ -238,6 +241,7 @@ def test_get_cur_loop(self):
def setup(self):
runner = MagicMock()
runner.epoch = 1
runner.max_epochs = 10
runner.iter = 10
runner.max_iters = 50
runner.train_dataloader = [0] * 20
Expand Down