diff --git a/export.py b/export.py index bca2564a7333..11fead4a9e1d 100644 --- a/export.py +++ b/export.py @@ -452,8 +452,7 @@ def run(data=ROOT / 'data/coco128.yaml', # 'dataset.yaml path' assert not (tflite and tfjs), 'TFLite and TF.js models must be exported separately, please pass only one type.' model, f = export_saved_model(model, im, file, dynamic, tf_nms=nms or agnostic_nms or tfjs, agnostic_nms=agnostic_nms or tfjs, topk_per_class=topk_per_class, - topk_all=topk_all, - conf_thres=conf_thres, iou_thres=iou_thres) # keras model + topk_all=topk_all, conf_thres=conf_thres, iou_thres=iou_thres) # keras model if pb or tfjs: # pb prerequisite to tfjs f = export_pb(model, im, file) if tflite or edgetpu: diff --git a/utils/datasets.py b/utils/datasets.py index a8f453aa1904..8159c3dcf264 100755 --- a/utils/datasets.py +++ b/utils/datasets.py @@ -424,9 +424,9 @@ def __init__(self, path, img_size=640, batch_size=16, augment=False, hyp=None, r cache, exists = self.cache_labels(cache_path, prefix), False # cache # Display cache - nf, nm, ne, nc, n = cache.pop('results') # found, missing, empty, corrupted, total + nf, nm, ne, nc, n = cache.pop('results') # found, missing, empty, corrupt, total if exists: - d = f"Scanning '{cache_path}' images and labels... {nf} found, {nm} missing, {ne} empty, {nc} corrupted" + d = f"Scanning '{cache_path}' images and labels... {nf} found, {nm} missing, {ne} empty, {nc} corrupt" tqdm(None, desc=prefix + d, total=n, initial=n) # display cache results if cache['msgs']: LOGGER.info('\n'.join(cache['msgs'])) # display warnings @@ -523,7 +523,7 @@ def cache_labels(self, path=Path('./labels.cache'), prefix=''): x[im_file] = [l, shape, segments] if msg: msgs.append(msg) - pbar.desc = f"{desc}{nf} found, {nm} missing, {ne} empty, {nc} corrupted" + pbar.desc = f"{desc}{nf} found, {nm} missing, {ne} empty, {nc} corrupt" pbar.close() if msgs: