henry000 commited on
Commit
2275731
Β·
1 Parent(s): 2b2044d

🎨 [Update] the progress bar, with xx -> xx.start()

Browse files
yolo/tools/solver.py CHANGED
@@ -99,17 +99,17 @@ class ModelTrainer:
99
  logger.info("πŸš„ Start Training!")
100
  num_epochs = self.num_epochs
101
 
102
- with self.progress.progress:
103
- self.progress.start_train(num_epochs)
104
- for epoch in range(num_epochs):
105
- if self.use_ddp:
106
- dataloader.sampler.set_epoch(epoch)
107
 
108
- self.progress.start_one_epoch(len(dataloader), self.optimizer, epoch)
109
- epoch_loss = self.train_one_epoch(dataloader)
110
- self.progress.finish_one_epoch()
 
111
 
112
- self.validator.solve(self.validation_dataloader)
113
 
114
 
115
  class ModelTester:
 
99
  logger.info("πŸš„ Start Training!")
100
  num_epochs = self.num_epochs
101
 
102
+ self.progress.start_train(num_epochs)
103
+ for epoch in range(num_epochs):
104
+ if self.use_ddp:
105
+ dataloader.sampler.set_epoch(epoch)
 
106
 
107
+ self.progress.start_one_epoch(len(dataloader), self.optimizer, epoch)
108
+ # TODO: calculate epoch loss
109
+ epoch_loss = self.train_one_epoch(dataloader)
110
+ self.progress.finish_one_epoch()
111
 
112
+ self.validator.solve(self.validation_dataloader)
113
 
114
 
115
  class ModelTester:
yolo/utils/logging_utils.py CHANGED
@@ -51,6 +51,8 @@ class ProgressLogger:
51
  TextColumn("{task.completed:.0f}/{task.total:.0f}"),
52
  TimeRemainingColumn(),
53
  )
 
 
54
  self.use_wandb = cfg.use_wandb
55
  if self.use_wandb:
56
  wandb.errors.term._log = custom_wandb_log
 
51
  TextColumn("{task.completed:.0f}/{task.total:.0f}"),
52
  TimeRemainingColumn(),
53
  )
54
+ self.progress.start()
55
+
56
  self.use_wandb = cfg.use_wandb
57
  if self.use_wandb:
58
  wandb.errors.term._log = custom_wandb_log