henry000 commited on
Commit
c3ee284
Β·
2 Parent(s): 6bd86f4 564b976

πŸ”€ [Merge] branch 'DATASET' into TEST

Browse files
Files changed (1) hide show
  1. yolo/tools/data_loader.py +3 -4
yolo/tools/data_loader.py CHANGED
@@ -141,7 +141,7 @@ class YoloDataset(Dataset):
141
  if bboxes:
142
  return torch.stack(bboxes)
143
  else:
144
- logger.warning("No valid BBox in {}", label_path)
145
  return torch.zeros((0, 5))
146
 
147
  def get_data(self, idx):
@@ -158,8 +158,7 @@ class YoloDataset(Dataset):
158
  def _update_image_size(self, idx: int) -> None:
159
  """Update image size based on dynamic shape and batch settings."""
160
  batch_start_idx = (idx // self.batch_size) * self.batch_size
161
- image_ratio = self.ratios[batch_start_idx]
162
-
163
  shift = ((self.base_size / 32 * (image_ratio - 1)) // (image_ratio + 1)) * 32
164
 
165
  self.image_size = [int(self.base_size + shift), int(self.base_size - shift)]
@@ -214,7 +213,7 @@ def create_dataloader(data_cfg: DataConfig, dataset_cfg: DatasetConfig, task: st
214
  if task == "inference":
215
  return StreamDataLoader(data_cfg)
216
 
217
- if dataset_cfg.auto_download:
218
  prepare_dataset(dataset_cfg, task)
219
  dataset = YoloDataset(data_cfg, dataset_cfg, task)
220
 
 
141
  if bboxes:
142
  return torch.stack(bboxes)
143
  else:
144
+ logger.warning(f"No valid BBox in {label_path}")
145
  return torch.zeros((0, 5))
146
 
147
  def get_data(self, idx):
 
158
  def _update_image_size(self, idx: int) -> None:
159
  """Update image size based on dynamic shape and batch settings."""
160
  batch_start_idx = (idx // self.batch_size) * self.batch_size
161
+ image_ratio = self.ratios[batch_start_idx].clip(1 / 3, 3)
 
162
  shift = ((self.base_size / 32 * (image_ratio - 1)) // (image_ratio + 1)) * 32
163
 
164
  self.image_size = [int(self.base_size + shift), int(self.base_size - shift)]
 
213
  if task == "inference":
214
  return StreamDataLoader(data_cfg)
215
 
216
+ if getattr(dataset_cfg, "auto_download", False):
217
  prepare_dataset(dataset_cfg, task)
218
  dataset = YoloDataset(data_cfg, dataset_cfg, task)
219