glenn-jocher commited on
Commit
fd55271
1 Parent(s): 3119b2f

Console corrupted -> corrupt (#6338)

Browse files

* Console corrupted -> corrupt

Minor style changes.

* Update export.py

Files changed (2) hide show
  1. export.py +1 -2
  2. utils/datasets.py +3 -3
export.py CHANGED
@@ -452,8 +452,7 @@ def run(data=ROOT / 'data/coco128.yaml', # 'dataset.yaml path'
452
  assert not (tflite and tfjs), 'TFLite and TF.js models must be exported separately, please pass only one type.'
453
  model, f = export_saved_model(model, im, file, dynamic, tf_nms=nms or agnostic_nms or tfjs,
454
  agnostic_nms=agnostic_nms or tfjs, topk_per_class=topk_per_class,
455
- topk_all=topk_all,
456
- conf_thres=conf_thres, iou_thres=iou_thres) # keras model
457
  if pb or tfjs: # pb prerequisite to tfjs
458
  f = export_pb(model, im, file)
459
  if tflite or edgetpu:
 
452
  assert not (tflite and tfjs), 'TFLite and TF.js models must be exported separately, please pass only one type.'
453
  model, f = export_saved_model(model, im, file, dynamic, tf_nms=nms or agnostic_nms or tfjs,
454
  agnostic_nms=agnostic_nms or tfjs, topk_per_class=topk_per_class,
455
+ topk_all=topk_all, conf_thres=conf_thres, iou_thres=iou_thres) # keras model
 
456
  if pb or tfjs: # pb prerequisite to tfjs
457
  f = export_pb(model, im, file)
458
  if tflite or edgetpu:
utils/datasets.py CHANGED
@@ -424,9 +424,9 @@ class LoadImagesAndLabels(Dataset):
424
  cache, exists = self.cache_labels(cache_path, prefix), False # cache
425
 
426
  # Display cache
427
- nf, nm, ne, nc, n = cache.pop('results') # found, missing, empty, corrupted, total
428
  if exists:
429
- d = f"Scanning '{cache_path}' images and labels... {nf} found, {nm} missing, {ne} empty, {nc} corrupted"
430
  tqdm(None, desc=prefix + d, total=n, initial=n) # display cache results
431
  if cache['msgs']:
432
  LOGGER.info('\n'.join(cache['msgs'])) # display warnings
@@ -523,7 +523,7 @@ class LoadImagesAndLabels(Dataset):
523
  x[im_file] = [l, shape, segments]
524
  if msg:
525
  msgs.append(msg)
526
- pbar.desc = f"{desc}{nf} found, {nm} missing, {ne} empty, {nc} corrupted"
527
 
528
  pbar.close()
529
  if msgs:
 
424
  cache, exists = self.cache_labels(cache_path, prefix), False # cache
425
 
426
  # Display cache
427
+ nf, nm, ne, nc, n = cache.pop('results') # found, missing, empty, corrupt, total
428
  if exists:
429
+ d = f"Scanning '{cache_path}' images and labels... {nf} found, {nm} missing, {ne} empty, {nc} corrupt"
430
  tqdm(None, desc=prefix + d, total=n, initial=n) # display cache results
431
  if cache['msgs']:
432
  LOGGER.info('\n'.join(cache['msgs'])) # display warnings
 
523
  x[im_file] = [l, shape, segments]
524
  if msg:
525
  msgs.append(msg)
526
+ pbar.desc = f"{desc}{nf} found, {nm} missing, {ne} empty, {nc} corrupt"
527
 
528
  pbar.close()
529
  if msgs: