Skip to content
This repository was archived by the owner on Oct 10, 2024. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions cogitare/plugins/logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ class Logger(PluginInterface):
model.register_plugin(logger2, 'on_end_batch')
"""

def __init__(self, title='[Logger]', msg='Loss: {loss_mean:.6f}', show_time=True, output_file=None, freq=1):
def __init__(self, title='[Logger]', msg='Loss: {loss_mean:.6f}', show_time=True, output_file=None, freq=1,
csv=False):
super(Logger, self).__init__(freq=freq)

self.title = title
Expand All @@ -48,7 +49,9 @@ def __init__(self, title='[Logger]', msg='Loss: {loss_mean:.6f}', show_time=True
self.output_file = output_file
self.logger = logging.getLogger(title)
coloredlogs.install(level='DEBUG', logger=self.logger)

self.separator = '| '
if csv:
self.separator = ', '
if show_time:
self._start_time = time.time()

Expand All @@ -61,7 +64,7 @@ def _time_spent(self):
time_str = ' '.join('{} {}'.format(getattr(seconds, k), k) for k in intervals
if getattr(seconds, k))

return '| ' + time_str
return self.separator + time_str

def function(self, *args, **kwargs):
log = '%s %s %s' % (self.title, self.msg.format(**kwargs), self._time_spent())
Expand Down
11 changes: 11 additions & 0 deletions tests/test_plugins/test_logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,14 @@ def test_logger_with_tqdm(capsys):
l(loss_mean=1.0)
out, err = capsys.readouterr()
assert '[Logger] Loss: 1.000000 ' in err


def test_logger_file_csv_format(capsys):
f = mock.Mock()
f.write = mock.MagicMock(return_value=None)

l = Logger(output_file=f, csv=True)
l(loss_mean=1.0)
out, err = capsys.readouterr()
assert f.write.called
assert ', ' in err