From 88c9418087753395173486dc4a733997f41296b4 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Wed, 11 Jan 2023 00:37:07 +0100 Subject: [PATCH] is_docker() fix for `show=True` predict bug (#218) Co-authored-by: Hardik Dava <39372750+hardikdava@users.noreply.github.com> Co-authored-by: Onuralp Sezer Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- ultralytics/__init__.py | 2 +- ultralytics/yolo/engine/predictor.py | 3 +-- ultralytics/yolo/utils/__init__.py | 8 ++++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ultralytics/__init__.py b/ultralytics/__init__.py index 1b84830..660ab44 100644 --- a/ultralytics/__init__.py +++ b/ultralytics/__init__.py @@ -1,6 +1,6 @@ # Ultralytics YOLO 🚀, GPL-3.0 license -__version__ = "8.0.2" +__version__ = "8.0.3" from ultralytics.hub import checks from ultralytics.yolo.engine.model import YOLO diff --git a/ultralytics/yolo/engine/predictor.py b/ultralytics/yolo/engine/predictor.py index 309e7d1..efbd78f 100644 --- a/ultralytics/yolo/engine/predictor.py +++ b/ultralytics/yolo/engine/predictor.py @@ -124,9 +124,8 @@ class BasePredictor: # Dataloader bs = 1 # batch_size - if self.args.show: - self.args.show = check_imshow(warn=True) if webcam: + self.args.show = check_imshow(warn=True) self.dataset = LoadStreams(source, imgsz=imgsz, stride=stride, diff --git a/ultralytics/yolo/utils/__init__.py b/ultralytics/yolo/utils/__init__.py index 3366222..e6747c5 100644 --- a/ultralytics/yolo/utils/__init__.py +++ b/ultralytics/yolo/utils/__init__.py @@ -119,8 +119,12 @@ def is_docker() -> bool: Returns: bool: True if the script is running inside a Docker container, False otherwise. """ - with open('/proc/self/cgroup') as f: - return 'docker' in f.read() + file = Path('/proc/self/cgroup') + if file.exists(): + with open(file) as f: + return 'docker' in f.read() + else: + return False def is_git_directory() -> bool: