提交 7525da9f 编写于 作者: S shippingwang

refine log format

上级 ca78dc0f
...@@ -42,18 +42,18 @@ class AverageMeter(object): ...@@ -42,18 +42,18 @@ class AverageMeter(object):
@property @property
def total(self): def total(self):
return '[{self.name}_sum: {self.sum:{self.fmt}}]'.format(self=self) return '{self.name}_sum: {self.sum:{self.fmt}}'.format(self=self)
@property @property
def total_minute(self): def total_minute(self):
return '[{self.name}_sum: {s:{self.fmt}} min]'.format( return '{self.name}_sum: {s:{self.fmt}} min'.format(
s=self.sum / 60, self=self) s=self.sum / 60, self=self)
@property @property
def mean(self): def mean(self):
return '[{self.name}_avg: {self.avg:{self.fmt}}]'.format( return '{self.name}_avg: {self.avg:{self.fmt}}'.format(
self=self) if self.need_avg else '' self=self) if self.need_avg else ''
@property @property
def value(self): def value(self):
return '[{self.name}: {self.val:{self.fmt}}]'.format(self=self) return '{self.name}: {self.val:{self.fmt}}'.format(self=self)
...@@ -375,7 +375,7 @@ def run(dataloader, exe, program, fetchs, epoch=0, mode='train'): ...@@ -375,7 +375,7 @@ def run(dataloader, exe, program, fetchs, epoch=0, mode='train'):
metric_list = [f[1] for f in fetchs.values()] metric_list = [f[1] for f in fetchs.values()]
for m in metric_list: for m in metric_list:
m.reset() m.reset()
batch_time = AverageMeter('cost', '.3f') batch_time = AverageMeter('elapse', '.3f')
tic = time.time() tic = time.time()
for idx, batch in enumerate(dataloader()): for idx, batch in enumerate(dataloader()):
metrics = exe.run(program=program, feed=batch, fetch_list=fetch_list) metrics = exe.run(program=program, feed=batch, fetch_list=fetch_list)
...@@ -383,9 +383,9 @@ def run(dataloader, exe, program, fetchs, epoch=0, mode='train'): ...@@ -383,9 +383,9 @@ def run(dataloader, exe, program, fetchs, epoch=0, mode='train'):
tic = time.time() tic = time.time()
for i, m in enumerate(metrics): for i, m in enumerate(metrics):
metric_list[i].update(m[0], len(batch[0])) metric_list[i].update(m[0], len(batch[0]))
fetchs_str = ''.join([m.value fetchs_str = ''.join([str(m.value)+' '
for m in metric_list] + [batch_time.value]) for m in metric_list]+ [batch_time.value])
logger.info("[epoch:{:3d}][{:s}][step:{:4d}]{:s}".format( logger.info("epoch:{:<3d} {:s} step:{:<4d} {:s}".format(
epoch, mode, idx, fetchs_str)) epoch, mode, idx, fetchs_str))
end_str = ''.join([m.mean for m in metric_list] + [batch_time.total]) end_str = ''.join([str(m.mean)+' ' for m in metric_list] + [batch_time.total])
logger.info("END [epoch:{:3d}][{:s}]{:s}".format(epoch, mode, end_str)) logger.info("END epoch:{:<3d} {:s} {:s}".format(epoch, mode, end_str))
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册