From 335e6834faec5d4a2a34c38334b6175078d76340 Mon Sep 17 00:00:00 2001 From: Bingsu Date: Sat, 29 Jul 2023 22:47:23 +0900 Subject: [PATCH] fix: pkg version, YOLO load --- adetailer/__version__.py | 2 +- adetailer/ultralytics.py | 13 +------------ install.py | 4 ++-- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/adetailer/__version__.py b/adetailer/__version__.py index 2a9de0b..fed92c5 100644 --- a/adetailer/__version__.py +++ b/adetailer/__version__.py @@ -1 +1 @@ -__version__ = "23.7.10" +__version__ = "23.8.0.dev0" diff --git a/adetailer/ultralytics.py b/adetailer/ultralytics.py index 188742d..addd0f5 100644 --- a/adetailer/ultralytics.py +++ b/adetailer/ultralytics.py @@ -11,24 +11,13 @@ from adetailer import PredictOutput from adetailer.common import create_mask_from_bbox -def load_yolo(model_path: str | Path): - try: - return YOLO(model_path) - except ModuleNotFoundError: - # https://github.com/ultralytics/ultralytics/issues/3856 - YOLO("yolov8n.pt") - return YOLO(model_path) - - def ultralytics_predict( model_path: str | Path, image: Image.Image, confidence: float = 0.3, device: str = "", ) -> PredictOutput: - model_path = str(model_path) - - model = load_yolo(model_path) + model = YOLO(model_path) pred = model(image, conf=confidence, device=device) bboxes = pred[0].boxes.xyxy.cpu().numpy() diff --git a/install.py b/install.py index 986b1ac..91679b4 100644 --- a/install.py +++ b/install.py @@ -44,8 +44,8 @@ def run_pip(*args): def install(): deps = [ # requirements - ("ultralytics", "8.0.97", None), - ("mediapipe", "0.10.0", None), + ("ultralytics", "8.0.143", None), + ("mediapipe", "0.10.2", None), ("rich", "13.4.2", None), # ultralytics ("py-cpuinfo", None, None),