ultralytics 8.2.56__tar.gz → 8.2.57__tar.gz

{ultralytics-8.2.56/ultralytics.egg-info → ultralytics-8.2.57}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ultralytics
-Version: 8.2.56
+Version: 8.2.57
 Summary: Ultralytics YOLOv8 for SOTA object detection, multi-object tracking, instance segmentation, pose estimation and image classification.
 Author: Glenn Jocher, Ayush Chaurasia, Jing Qiu
 Maintainer: Glenn Jocher, Ayush Chaurasia, Jing Qiu

ultralytics-8.2.57/tests/test_solutions.py

@@ -0,0 +1,90 @@
+# Ultralytics YOLO 🚀, AGPL-3.0 license
+
+import cv2
+import pytest
+
+from ultralytics import YOLO, solutions
+from ultralytics.utils.downloads import safe_download
+
+MAJOR_SOLUTIONS_DEMO = "https://github.com/ultralytics/assets/releases/download/v0.0.0/solutions_ci_demo.mp4"
+WORKOUTS_SOLUTION_DEMO = "https://github.com/ultralytics/assets/releases/download/v0.0.0/solution_ci_pose_demo.mp4"
+
+
+@pytest.mark.slow
+def test_major_solutions():
+    """Test the object counting, heatmap, speed estimation and queue management solution."""
+
+    safe_download(url=MAJOR_SOLUTIONS_DEMO)
+    model = YOLO("yolov8n.pt")
+    names = model.names
+    cap = cv2.VideoCapture("solutions_ci_demo.mp4")
+    assert cap.isOpened(), "Error reading video file"
+    region_points = [(20, 400), (1080, 404), (1080, 360), (20, 360)]
+    counter = solutions.ObjectCounter(reg_pts=region_points, names=names, view_img=False)
+    heatmap = solutions.Heatmap(colormap=cv2.COLORMAP_PARULA, names=names, view_img=False)
+    speed = solutions.SpeedEstimator(reg_pts=region_points, names=names, view_img=False)
+    queue = solutions.QueueManager(names=names, reg_pts=region_points, view_img=False)
+    while cap.isOpened():
+        success, im0 = cap.read()
+        if not success:
+            break
+        original_im0 = im0.copy()
+        tracks = model.track(im0, persist=True, show=False)
+        _ = counter.start_counting(original_im0.copy(), tracks)
+        _ = heatmap.generate_heatmap(original_im0.copy(), tracks)
+        _ = speed.estimate_speed(original_im0.copy(), tracks)
+        _ = queue.process_queue(original_im0.copy(), tracks)
+    cap.release()
+    cv2.destroyAllWindows()
+
+
+@pytest.mark.slow
+def test_aigym():
+    """Test the workouts monitoring solution."""
+
+    safe_download(url=WORKOUTS_SOLUTION_DEMO)
+    model = YOLO("yolov8n-pose.pt")
+    cap = cv2.VideoCapture("solution_ci_pose_demo.mp4")
+    assert cap.isOpened(), "Error reading video file"
+    gym_object = solutions.AIGym(line_thickness=2, pose_type="squat", kpts_to_check=[5, 11, 13])
+    while cap.isOpened():
+        success, im0 = cap.read()
+        if not success:
+            break
+        results = model.track(im0, verbose=False)
+        _ = gym_object.start_counting(im0, results)
+    cap.release()
+    cv2.destroyAllWindows()
+
+
+@pytest.mark.slow
+def test_instance_segmentation():
+    """Test the instance segmentation solution."""
+
+    from ultralytics.utils.plotting import Annotator, colors
+
+    model = YOLO("yolov8n-seg.pt")
+    names = model.names
+    cap = cv2.VideoCapture("solutions_ci_demo.mp4")
+    assert cap.isOpened(), "Error reading video file"
+    while cap.isOpened():
+        success, im0 = cap.read()
+        if not success:
+            break
+        results = model.predict(im0)
+        annotator = Annotator(im0, line_width=2)
+        if results[0].masks is not None:
+            clss = results[0].boxes.cls.cpu().tolist()
+            masks = results[0].masks.xy
+            for mask, cls in zip(masks, clss):
+                color = colors(int(cls), True)
+                annotator.seg_bbox(mask=mask, mask_color=color, label=names[int(cls)])
+    cap.release()
+    cv2.destroyAllWindows()
+
+
+@pytest.mark.slow
+def test_streamlit_predict():
+    """Test streamlit predict live inference solution."""
+
+    solutions.inference()

{ultralytics-8.2.56 → ultralytics-8.2.57}/ultralytics/__init__.py

@@ -1,6 +1,6 @@
 # Ultralytics YOLO 🚀, AGPL-3.0 license
 
-__version__ = "8.2.56"
+__version__ = "8.2.57"
 
 import os
 

{ultralytics-8.2.56 → ultralytics-8.2.57}/ultralytics/data/dataset.py

@@ -15,7 +15,7 @@ from torch.utils.data import ConcatDataset
 
 from ultralytics.utils import LOCAL_RANK, NUM_THREADS, TQDM, colorstr
 from ultralytics.utils.ops import resample_segments
-from ultralytics.utils.torch_utils import TORCH_1_13
+from ultralytics.utils.torch_utils import TORCHVISION_0_18
 
 from .augment import (
     Compose,
@@ -417,7 +417,7 @@ class ClassificationDataset:
         import torchvision  # scope for faster 'import ultralytics'
 
         # Base class assigned as attribute rather than used as base class to allow for scoping slow torchvision import
-        if TORCH_1_13:  # 'allow_empty' argument first introduced in torch 1.13
+        if TORCHVISION_0_18:  # 'allow_empty' argument first introduced in torchvision 0.18
             self.base = torchvision.datasets.ImageFolder(root=root, allow_empty=True)
         else:
             self.base = torchvision.datasets.ImageFolder(root=root)

{ultralytics-8.2.56 → ultralytics-8.2.57}/ultralytics/engine/model.py

@@ -311,11 +311,13 @@ class Model(nn.Module):
             AssertionError: If the model is not a PyTorch model.
         """
         self._check_is_pytorch_model()
+        from copy import deepcopy
         from datetime import datetime
 
         from ultralytics import __version__
 
         updates = {
+            "model": deepcopy(self.model).half() if isinstance(self.model, nn.Module) else self.model,
             "date": datetime.now().isoformat(),
             "version": __version__,
             "license": "AGPL-3.0 License (https://ultralytics.com/license)",

{ultralytics-8.2.56 → ultralytics-8.2.57}/ultralytics/solutions/distance_calculation.py

@@ -24,7 +24,7 @@ class DistanceCalculation:
         Initializes the DistanceCalculation class with the given parameters.
 
         Args:
-            names (dict): Dictionary mapping class indices to class names.
+            names (dict): Dictionary of classes names.
             pixels_per_meter (int, optional): Conversion factor from pixels to meters. Defaults to 10.
             view_img (bool, optional): Flag to indicate if the video stream should be displayed. Defaults to False.
             line_thickness (int, optional): Thickness of the lines drawn on the image. Defaults to 2.

{ultralytics-8.2.56 → ultralytics-8.2.57}/ultralytics/solutions/heatmap.py

@@ -18,7 +18,7 @@ class Heatmap:
 
     def __init__(
         self,
-        classes_names,
+        names,
         imw=0,
         imh=0,
         colormap=cv2.COLORMAP_JET,
@@ -44,7 +44,7 @@ class Heatmap:
         self.shape = shape
 
         self.initialized = False
-        self.names = classes_names  # Classes names
+        self.names = names  # Classes names
 
         # Image information
         self.imw = imw

{ultralytics-8.2.56 → ultralytics-8.2.57}/ultralytics/solutions/object_counter.py

@@ -17,7 +17,7 @@ class ObjectCounter:
 
     def __init__(
         self,
-        classes_names,
+        names,
         reg_pts=None,
         count_reg_color=(255, 0, 255),
         count_txt_color=(0, 0, 0),
@@ -37,7 +37,7 @@ class ObjectCounter:
         Initializes the ObjectCounter with various tracking and counting parameters.
 
         Args:
-            classes_names (dict): Dictionary of class names.
+            names (dict): Dictionary of class names.
             reg_pts (list): List of points defining the counting region.
             count_reg_color (tuple): RGB color of the counting region.
             count_txt_color (tuple): RGB color of the count text.
@@ -72,7 +72,7 @@ class ObjectCounter:
         self.view_in_counts = view_in_counts
         self.view_out_counts = view_out_counts
 
-        self.names = classes_names  # Classes names
+        self.names = names  # Classes names
         self.annotator = None  # Annotator
         self.window_name = "Ultralytics YOLOv8 Object Counter"
 

{ultralytics-8.2.56 → ultralytics-8.2.57}/ultralytics/solutions/queue_management.py

@@ -17,7 +17,7 @@ class QueueManager:
 
     def __init__(
         self,
-        classes_names,
+        names,
         reg_pts=None,
         line_thickness=2,
         track_thickness=2,
@@ -34,7 +34,7 @@ class QueueManager:
         Initializes the QueueManager with specified parameters for tracking and counting objects.
 
         Args:
-            classes_names (dict): A dictionary mapping class IDs to class names.
+            names (dict): A dictionary mapping class IDs to class names.
             reg_pts (list of tuples, optional): Points defining the counting region polygon. Defaults to a predefined
                 rectangle.
             line_thickness (int, optional): Thickness of the annotation lines. Defaults to 2.
@@ -69,7 +69,7 @@ class QueueManager:
         self.view_queue_counts = view_queue_counts
         self.fontsize = fontsize
 
-        self.names = classes_names  # Class names
+        self.names = names  # Class names
         self.annotator = None  # Annotator
         self.window_name = "Ultralytics YOLOv8 Queue Manager"
 
@@ -139,7 +139,7 @@ class QueueManager:
 
     def display_frames(self):
         """Displays the current frame with annotations."""
-        if self.env_check:
+        if self.env_check and self.view_img:
             self.annotator.draw_region(reg_pts=self.reg_pts, thickness=self.region_thickness, color=self.region_color)
             cv2.namedWindow(self.window_name)
             cv2.imshow(self.window_name, self.im0)

{ultralytics-8.2.56 → ultralytics-8.2.57}/ultralytics/utils/plotting.py

@@ -726,20 +726,18 @@ class Annotator:
         )
         cv2.putText(self.im, stage_text, stage_text_position, 0, self.sf, txt_color, self.tf)
 
-    def seg_bbox(self, mask, mask_color=(255, 0, 255), det_label=None, track_label=None):
+    def seg_bbox(self, mask, mask_color=(255, 0, 255), label=None, txt_color=(255, 255, 255)):
         """
         Function for drawing segmented object in bounding box shape.
 
         Args:
             mask (list): masks data list for instance segmentation area plotting
-            mask_color (tuple): mask foreground color
-            det_label (str): Detection label text
-            track_label (str): Tracking label text
+            mask_color (RGB): mask foreground color
+            label (str): Detection label text
+            txt_color (RGB): text color
         """
 
         cv2.polylines(self.im, [np.int32([mask])], isClosed=True, color=mask_color, thickness=2)
-
-        label = f"Track ID: {track_label}" if track_label else det_label
         text_size, _ = cv2.getTextSize(label, 0, self.sf, self.tf)
 
         cv2.rectangle(
@@ -750,9 +748,10 @@ class Annotator:
             -1,
         )
 
-        cv2.putText(
-            self.im, label, (int(mask[0][0]) - text_size[0] // 2, int(mask[0][1])), 0, self.sf, (255, 255, 255), self.tf
-        )
+        if label:
+            cv2.putText(
+                self.im, label, (int(mask[0][0]) - text_size[0] // 2, int(mask[0][1])), 0, self.sf, txt_color, self.tf
+            )
 
     def plot_distance_and_line(self, distance_m, distance_mm, centroids, line_color, centroid_color):
         """

{ultralytics-8.2.56 → ultralytics-8.2.57}/ultralytics/utils/torch_utils.py

@@ -40,6 +40,7 @@ TORCH_2_0 = check_version(torch.__version__, "2.0.0")
 TORCHVISION_0_10 = check_version(TORCHVISION_VERSION, "0.10.0")
 TORCHVISION_0_11 = check_version(TORCHVISION_VERSION, "0.11.0")
 TORCHVISION_0_13 = check_version(TORCHVISION_VERSION, "0.13.0")
+TORCHVISION_0_18 = check_version(TORCHVISION_VERSION, "0.18.0")
 
 
 @contextmanager

{ultralytics-8.2.56 → ultralytics-8.2.57/ultralytics.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ultralytics
-Version: 8.2.56
+Version: 8.2.57
 Summary: Ultralytics YOLOv8 for SOTA object detection, multi-object tracking, instance segmentation, pose estimation and image classification.
 Author: Glenn Jocher, Ayush Chaurasia, Jing Qiu
 Maintainer: Glenn Jocher, Ayush Chaurasia, Jing Qiu

{ultralytics-8.2.56 → ultralytics-8.2.57}/ultralytics.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ tests/test_explorer.py
 tests/test_exports.py
 tests/test_integrations.py
 tests/test_python.py
+tests/test_solutions.py
 ultralytics/__init__.py
 ultralytics.egg-info/PKG-INFO
 ultralytics.egg-info/SOURCES.txt
@@ -24,6 +25,7 @@ ultralytics/../tests/test_explorer.py
 ultralytics/../tests/test_exports.py
 ultralytics/../tests/test_integrations.py
 ultralytics/../tests/test_python.py
+ultralytics/../tests/test_solutions.py
 ultralytics/assets/bus.jpg
 ultralytics/assets/zidane.jpg
 ultralytics/cfg/__init__.py