From d52f9d52273ddbc2c688c90963b26871c128a9be Mon Sep 17 00:00:00 2001 From: Mike Clark Date: Sun, 26 Jan 2020 00:19:23 +0000 Subject: [PATCH] use tqdm.auto in trainer This will import the ipywidgets version of tqdm if available. This works nicely in notebooks by not filling up the log. In the terminal it will use the same old tqdm. We might also want to consider passing in the tqdm we want as an argument since there may be some edge cases where ipywidgets is available but the interface doesn't support it (e.g. vscode?) or isn't working. In which case people will get a warning message, but may want to configure it themselves. --- pytorch_lightning/trainer/trainer.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pytorch_lightning/trainer/trainer.py b/pytorch_lightning/trainer/trainer.py index c2add794..5466bc9d 100644 --- a/pytorch_lightning/trainer/trainer.py +++ b/pytorch_lightning/trainer/trainer.py @@ -7,7 +7,7 @@ import logging import torch import torch.distributed as dist import torch.multiprocessing as mp -import tqdm +from tqdm.auto import tqdm from torch.optim.optimizer import Optimizer from pytorch_lightning.trainer.auto_mix_precision import TrainerAMPMixin @@ -808,13 +808,13 @@ class Trainer(TrainerIOMixin, ref_model.on_train_start() if not self.disable_validation and self.num_sanity_val_steps > 0: # init progress bars for validation sanity check - pbar = tqdm.tqdm(desc='Validation sanity check', + pbar = tqdm(desc='Validation sanity check', total=self.num_sanity_val_steps * len(self.get_val_dataloaders()), leave=False, position=2 * self.process_position, disable=not self.show_progress_bar, dynamic_ncols=True, unit='batch') self.main_progress_bar = pbar # dummy validation progress bar - self.val_progress_bar = tqdm.tqdm(disable=True) + self.val_progress_bar = tqdm(disable=True) eval_results = self.evaluate(model, self.get_val_dataloaders(), self.num_sanity_val_steps, False) @@ -828,7 +828,7 @@ class Trainer(TrainerIOMixin, self.early_stop_callback.check_metrics(callback_metrics) # init progress bar - pbar = tqdm.tqdm(leave=True, position=2 * self.process_position, + pbar = tqdm(leave=True, position=2 * self.process_position, disable=not self.show_progress_bar, dynamic_ncols=True, unit='batch', file=sys.stdout) self.main_progress_bar = pbar