Merge pull request #518 from CharlesAuthier/feature/eta_tqdm

adding total to tqdm

inference_segmentation.py

@@ -171,8 +171,10 @@ def segmentation(param,
  fp = np.memmap(tp_mem, dtype='float16', mode='w+', shape=(tf_len, h_padded, w_padded, num_classes))
  img_gen = gen_img_samples(src=input_image, patch_list=patch_list, chunk_size=chunk_size)
  single_class_mode = False if num_classes > 1 else True
- for sub_image, h_idxs, w_idxs, hann_win in tqdm(img_gen, position=0, leave=True,
- desc=f'Inferring on patches'):
+ for sub_image, h_idxs, w_idxs, hann_win in tqdm(
+ img_gen, position=0, leave=True, desc='Inferring on patches',
+ total=len(patch_list)
+ ):
  hann_win = np.expand_dims(hann_win, -1)
  image_metadata = add_metadata_from_raster_to_sample(sat_img_arr=sub_image,
  raster_handle=input_image,
@@ -285,7 +287,7 @@ def override_model_params_from_checkpoint(
 
  if model_ckpt != params.model or classes_ckpt != classes or bands_ckpt != bands \
  or clip_limit != clip_limit_ckpt:
- logging.info(f"\nParameters from checkpoint will override inputted parameters."
+ logging.info("\nParameters from checkpoint will override inputted parameters."
  f"\n\t\t\t Inputted | Overriden"
  f"\nModel:\t\t {params.model} | {model_ckpt}"
  f"\nInput bands:\t\t{bands} | {bands_ckpt}"

tiling_segmentation.py

@@ -741,7 +741,7 @@ def main(cfg: DictConfig) -> None:
  # TODO: use mp.Manager() to modify aoi.tiling_pairs_list from within tiling_per_aoi
  tiler.src_aoi_list = []
  for tiled_aoi, rs_tiler_paths, vec_tiler_paths in tqdm(
- tilers, desc=f"Updating AOIs' information about their patches paths"):
+ tilers, desc="Updating AOIs' information about their patches paths"):
  tiled_aoi.patches_pairs_list = [(rs_ptch, gt_ptch) for rs_ptch, gt_ptch in zip(rs_tiler_paths, vec_tiler_paths)]
  tiler.src_aoi_list.append(tiled_aoi)