Skip to content

Commit 8ce22df

Browse files
committed
ep/h removed
1 parent 59a6c0e commit 8ce22df

File tree

1 file changed

+5
-15
lines changed

1 file changed

+5
-15
lines changed

utils/training.py

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
import os
1010
import sys
1111
from argparse import Namespace
12-
from time import time
13-
from typing import Iterable, Tuple
12+
from typing import Iterable
1413
import logging
1514
import torch
1615
from tqdm import tqdm
@@ -23,7 +22,7 @@
2322

2423
from utils import disable_logging
2524
from utils.checkpoints import mammoth_load_checkpoint, save_mammoth_checkpoint
26-
from utils.loggers import log_extra_metrics, log_accs, Logger
25+
from utils.loggers import log_extra_metrics, Logger
2726
from utils.schedulers import get_scheduler
2827
from utils.stats import track_system_stats
2928

@@ -80,10 +79,7 @@ def train_single_epoch(model: ContinualModel,
8079
the number of iterations performed in the current epoch
8180
"""
8281
train_iter = iter(train_loader)
83-
epoch_len = len(train_loader) if hasattr(train_loader, "__len__") else None
84-
8582
i = 0
86-
previous_time = time()
8783

8884
while True:
8985
try:
@@ -116,13 +112,7 @@ def train_single_epoch(model: ContinualModel,
116112
system_tracker()
117113
i += 1
118114

119-
time_diff = time() - previous_time
120-
previous_time = time()
121-
bar_log = {'loss': loss, 'lr': model.opt.param_groups[0]['lr']}
122-
if epoch_len:
123-
ep_h = 3600 / (epoch_len * time_diff)
124-
bar_log['ep/h'] = ep_h
125-
pbar.set_postfix(bar_log, refresh=False)
115+
pbar.set_postfix({'loss': loss, 'lr': model.opt.param_groups[0]['lr']}, refresh=False)
126116
pbar.update()
127117

128118
if scheduler is not None and args.scheduler_mode == 'epoch':
@@ -207,8 +197,8 @@ def train(model: ContinualModel, dataset: ContinualDataset,
207197
random_res_class, random_res_task = dataset.evaluate(model, dataset, last=True) # the ugliness of this line is for backward compatibility
208198
random_results_class.append(random_res_class)
209199
random_results_task.append(random_res_task)
210-
except Exception as e:
211-
logging.info(f"Could not evaluate before `begin_task`, will try after")
200+
except Exception:
201+
logging.info("Could not evaluate before `begin_task`, will try after")
212202
# will try after the begin_task in case the model needs to setup something
213203
can_compute_fwd_beforetask = False
214204

0 commit comments

Comments
 (0)