merge with master to support latest timer

tools/train_utils/train_utils.py

@@ -24,8 +24,8 @@ def train_one_epoch(model, optimizer, train_loader, model_func, lr_scheduler, ac
         batch_time = common_utils.AverageMeter()
         forward_time = common_utils.AverageMeter()
 
-    for cur_it in range(start_it, total_it_each_epoch):
     end = time.time()
+    for cur_it in range(start_it, total_it_each_epoch):
         try:
             batch = next(dataloader_iter)
         except StopIteration:
@@ -51,16 +51,16 @@ def train_one_epoch(model, optimizer, train_loader, model_func, lr_scheduler, ac
 
         loss, tb_dict, disp_dict = model_func(model, batch)
 
-        forward_timer = time.time()
-        cur_forward_time = forward_timer - data_timer
-
         loss.backward()
         clip_grad_norm_(model.parameters(), optim_cfg.GRAD_NORM_CLIP)
         optimizer.step()
 
         accumulated_iter += 1
  
+        cur_forward_time = time.time() - data_timer
         cur_batch_time = time.time() - end
+        end = time.time()
+
         # average reduce
         avg_data_time = commu_utils.average_reduce_value(cur_data_time)
         avg_forward_time = commu_utils.average_reduce_value(cur_forward_time)