Commit 1b42c8c4 authored by Myle Ott's avatar Myle Ott
Browse files

Fallback to `--log-format=simple` for non-TTY terminals

parent e5b3c1f4

fairseq/options.py

+1 −1
Changes for fairseq/options.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ def get_parser(desc): 
    parser.add_argument('--no-progress-bar', action='store_true', help='disable progress bar')

    parser.add_argument('--log-interval', type=int, default=1000, metavar='N',

                        help='log progress every N updates (when progress bar is disabled)')

    parser.add_argument('--log-format', default='tqdm', help='log format to use',

    parser.add_argument('--log-format', default=None, help='log format to use',

                        choices=['json', 'none', 'simple', 'tqdm'])

    parser.add_argument('--seed', default=1, type=int, metavar='N',

                        help='pseudo random number generator seed')

fairseq/utils.py

+7 −1
Changes for fairseq/utils.py: 7 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ import logging 
import os

import torch

import traceback

import sys



from torch.autograd import Variable

from torch.serialization import default_restore_location
@@ -37,14 +38,19 @@ def build_criterion(args, src_dict, dst_dict): 




def build_progress_bar(args, iterator, epoch=None, prefix=None):

    if args.log_format is None:

        args.log_format = 'tqdm' if sys.stderr.isatty() else 'simple'



    if args.log_format == 'json':

        bar = progress_bar.json_progress_bar(iterator, epoch, prefix, args.log_interval)

    elif args.log_format == 'none':

        bar = progress_bar.noop_progress_bar(iterator, epoch, prefix)

    elif args.log_format == 'simple':

        bar = progress_bar.simple_progress_bar(iterator, epoch, prefix, args.log_interval)

    elif args.log_format == 'tqdm':

        bar = progress_bar.tqdm_progress_bar(iterator, epoch, prefix)

    else:

        bar = progress_bar.simple_progress_bar(iterator, epoch, prefix, args.log_interval)

        raise ValueError(f'Unknown log format: {args.log_format}')

    return bar

generate.py

+1 −1
Changes for generate.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ def main(): 
    options.add_generation_args(parser)



    args = parser.parse_args()

    if args.no_progress_bar:

    if args.no_progress_bar and args.log_format is None:

        args.log_format = 'none'

    print(args)

train.py

+1 −1
Changes for train.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ def main(): 


    args = utils.parse_args_and_arch(parser)



    if args.no_progress_bar and args.log_format == 'tqdm':

    if args.no_progress_bar and args.log_format is None:

        args.log_format = 'simple'



    if not os.path.exists(args.save_dir):