HongChuang/ultralytics-ascend
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Replace nosave and noval with save and val (#127)

Browse source 
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
Glenn Jocher 2023-01-01 17:50:06 +01:00 • committed by GitHub
parent 598f17a472
commit 63c7a74691
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 74 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ultralytics/yolo/engine/predictor.py
View file

@ -104,7 +104,6 @@ class BasePredictor:
def setup(self, source=None, model=None):
# source
source = str(source or self.args.source)
self.save_img = not self.args.nosave and not source.endswith('.txt')
is_file = Path(source).suffix[1:] in (IMG_FORMATS + VID_FORMATS)
is_url = source.lower().startswith(('rtsp://', 'rtmp://', 'http://', 'https://'))
webcam = source.isnumeric() or source.endswith('.streams') or (is_url and not is_file)
@ -168,10 +167,10 @@ class BasePredictor:
p = Path(path)
s += self.write_results(i, preds, (p, im, im0s))
if self.args.view_img:
if self.args.show:
self.show(p)
if self.save_img:
if self.args.save:
self.save_preds(vid_cap, i, str(self.save_dir / p.name))
# Print time (inference-only)
@ -182,7 +181,7 @@ class BasePredictor:
LOGGER.info(
f'Speed: %.1fms pre-process, %.1fms inference, %.1fms postprocess per image at shape {(1, 3, *self.imgsz)}'
% t)
if self.args.save_txt or self.save_img:
if self.args.save_txt or self.args.save:
s = f"\n{len(list(self.save_dir.glob('labels/*.txt')))} labels saved to {self.save_dir / 'labels'}" if self.args.save_txt else ''
LOGGER.info(f"Results saved to {colorstr('bold', self.save_dir)}{s}")