Skip to content

Commit

Permalink
Check None logger
Browse files Browse the repository at this point in the history
  • Loading branch information
priba committed May 23, 2017
1 parent 2917297 commit 58d67db
Show file tree
Hide file tree
Showing 11 changed files with 45 additions and 32 deletions.
7 changes: 4 additions & 3 deletions demos/demo_grec_ggnn.py
Original file line number Diff line number Diff line change
Expand Up @@ -296,9 +296,10 @@ def validate(val_loader, model, criterion, evaluation, logger=None):

print(' * Average Accuracy {acc.avg:.3f}; Average Loss {loss.avg:.3f}'
.format(acc=accuracies, loss=losses))

logger.log_value('test_epoch_loss', losses.avg)
logger.log_value('test_epoch_accuracy', accuracies.avg)

if logger is not None:
logger.log_value('test_epoch_loss', losses.avg)
logger.log_value('test_epoch_accuracy', accuracies.avg)

return accuracies.avg

Expand Down
7 changes: 4 additions & 3 deletions demos/demo_grec_intnet.py
Original file line number Diff line number Diff line change
Expand Up @@ -302,9 +302,10 @@ def validate(val_loader, model, criterion, evaluation, logger=None):

print(' * Average Accuracy {acc.avg:.3f}; Average Loss {loss.avg:.3f}'
.format(acc=accuracies, loss=losses))

logger.log_value('test_epoch_loss', losses.avg)
logger.log_value('test_epoch_accuracy', accuracies.avg)

if logger is not None:
logger.log_value('test_epoch_loss', losses.avg)
logger.log_value('test_epoch_accuracy', accuracies.avg)

return accuracies.avg

Expand Down
7 changes: 4 additions & 3 deletions demos/demo_grec_mpnn.py
Original file line number Diff line number Diff line change
Expand Up @@ -301,9 +301,10 @@ def validate(val_loader, model, criterion, evaluation, logger=None):

print(' * Average Accuracy {acc.avg:.3f}; Average Loss {loss.avg:.3f}'
.format(acc=accuracies, loss=losses))

logger.log_value('test_epoch_loss', losses.avg)
logger.log_value('test_epoch_accuracy', accuracies.avg)

if logger is not None:
logger.log_value('test_epoch_loss', losses.avg)
logger.log_value('test_epoch_accuracy', accuracies.avg)

return accuracies.avg

Expand Down
7 changes: 4 additions & 3 deletions demos/demo_gwhist_duvenaud.py
Original file line number Diff line number Diff line change
Expand Up @@ -289,9 +289,10 @@ def validate(val_loader, model, criterion, evaluation, logger=None):

print(' * Average Accuracy {acc.avg:.3f}; Average Loss {loss.avg:.3f}'
.format(acc=accuracies, loss=losses))

logger.log_value('test_epoch_loss', losses.avg)
logger.log_value('test_epoch_accuracy', accuracies.avg)

if logger is not None:
logger.log_value('test_epoch_loss', losses.avg)
logger.log_value('test_epoch_accuracy', accuracies.avg)

if __name__ == '__main__':
main()
8 changes: 5 additions & 3 deletions demos/demo_gwhist_ggnn.py
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ def closure():
print('Epoch: [{0}] Average Accuracy {acc.avg:.3f}; Average Loss {loss.avg:.3f}'
.format(epoch, acc=accuracies, loss=losses))


def validate(val_loader, model, criterion, evaluation, logger=None):
batch_time = AverageMeter()
losses = AverageMeter()
Expand Down Expand Up @@ -314,9 +315,10 @@ def validate(val_loader, model, criterion, evaluation, logger=None):

print(' * Average Accuracy {acc.avg:.3f}'
.format(acc=accuracies))

logger.log_value('test_epoch_loss', losses.avg)
logger.log_value('test_epoch_accuracy', accuracies.avg)

if logger is not None:
logger.log_value('test_epoch_loss', losses.avg)
logger.log_value('test_epoch_accuracy', accuracies.avg)

return accuracies.avg

Expand Down
7 changes: 4 additions & 3 deletions demos/demo_letter_duvenaud.py
Original file line number Diff line number Diff line change
Expand Up @@ -303,9 +303,10 @@ def validate(val_loader, model, criterion, evaluation, logger=None):

print(' * Average Accuracy {acc.avg:.3f}; Average Loss {loss.avg:.3f}'
.format(acc=accuracies, loss=losses))

logger.log_value('test_epoch_loss', losses.avg)
logger.log_value('test_epoch_accuracy', accuracies.avg)

if logger is not None:
logger.log_value('test_epoch_loss', losses.avg)
logger.log_value('test_epoch_accuracy', accuracies.avg)

return accuracies.avg

Expand Down
8 changes: 5 additions & 3 deletions demos/demo_letter_ggnn.py
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ def closure():
print('Epoch: [{0}] Average Accuracy {acc.avg:.3f}; Average Loss {loss.avg:.3f}'
.format(epoch, acc=accuracies, loss=losses))


def validate(val_loader, model, criterion, evaluation, logger=None):
batch_time = AverageMeter()
losses = AverageMeter()
Expand Down Expand Up @@ -303,9 +304,10 @@ def validate(val_loader, model, criterion, evaluation, logger=None):

print(' * Average Accuracy {acc.avg:.3f}; Average Loss {loss.avg:.3f}'
.format(acc=accuracies, loss=losses))

logger.log_value('test_epoch_loss', losses.avg)
logger.log_value('test_epoch_accuracy', accuracies.avg)

if logger is not None:
logger.log_value('test_epoch_loss', losses.avg)
logger.log_value('test_epoch_accuracy', accuracies.avg)

return accuracies.avg

Expand Down
7 changes: 4 additions & 3 deletions demos/demo_letter_intnet.py
Original file line number Diff line number Diff line change
Expand Up @@ -302,9 +302,10 @@ def validate(val_loader, model, criterion, evaluation, logger=None):

print(' * Average Accuracy {acc.avg:.3f}; Average Loss {loss.avg:.3f}'
.format(acc=accuracies, loss=losses))

logger.log_value('test_epoch_loss', losses.avg)
logger.log_value('test_epoch_accuracy', accuracies.avg)

if logger is not None:
logger.log_value('test_epoch_loss', losses.avg)
logger.log_value('test_epoch_accuracy', accuracies.avg)

return accuracies.avg

Expand Down
5 changes: 3 additions & 2 deletions demos/demo_qm9_duvenaud.py
Original file line number Diff line number Diff line change
Expand Up @@ -314,8 +314,9 @@ def validate(val_loader, model, criterion, evaluation, logger=None):
print(' * Average Error Ratio {err.avg:.3f}; Average Loss {loss.avg:.3f}'
.format(err=error_ratio, loss=losses))

logger.log_value('test_epoch_loss', losses.avg)
logger.log_value('test_epoch_error_ratio', error_ratio.avg)
if logger is not None:
logger.log_value('test_epoch_loss', losses.avg)
logger.log_value('test_epoch_error_ratio', error_ratio.avg)


if __name__ == '__main__':
Expand Down
7 changes: 4 additions & 3 deletions demos/demo_qm9_ggnn.py
Original file line number Diff line number Diff line change
Expand Up @@ -313,9 +313,10 @@ def validate(val_loader, model, criterion, evaluation, logger=None):

print(' * Average Error Ratio {err.avg:.3f}; Average Loss {loss.avg:.3f}'
.format(err=error_ratio, loss=losses))

logger.log_value('test_epoch_loss', losses.avg)
logger.log_value('test_epoch_error_ratio', error_ratio.avg)

if logger is not None:
logger.log_value('test_epoch_loss', losses.avg)
logger.log_value('test_epoch_error_ratio', error_ratio.avg)


if __name__ == '__main__':
Expand Down
7 changes: 4 additions & 3 deletions demos/demo_qm9_intnet.py
Original file line number Diff line number Diff line change
Expand Up @@ -312,9 +312,10 @@ def validate(val_loader, model, criterion, evaluation, logger=None):

print(' * Average Error Ratio {err.avg:.3f}; Average Loss {loss.avg:.3f}'
.format(err=error_ratio, loss=losses))

logger.log_value('test_epoch_loss', losses.avg)
logger.log_value('test_epoch_error_ratio', error_ratio.avg)

if logger is not None:
logger.log_value('test_epoch_loss', losses.avg)
logger.log_value('test_epoch_error_ratio', error_ratio.avg)


if __name__ == '__main__':
Expand Down

0 comments on commit 58d67db

Please sign in to comment.