ultralytics 8.2.28__tar.gz → 8.2.29__tar.gz

{ultralytics-8.2.28 → ultralytics-8.2.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ultralytics
-Version: 8.2.28
+Version: 8.2.29
 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.28 → ultralytics-8.2.29}/tests/test_python.py

@@ -140,7 +140,8 @@ def test_youtube():
     model = YOLO(MODEL)
     try:
         model.predict("https://youtu.be/G17sBkb38XQ", imgsz=96, save=True)
-    except urllib.error.HTTPError as e:  # handle 'urllib.error.HTTPError: HTTP Error 429: Too Many Requests'
+    # Handle internet connection errors and 'urllib.error.HTTPError: HTTP Error 429: Too Many Requests'
+    except (urllib.error.HTTPError, ConnectionError) as e:
         LOGGER.warning(f"WARNING: YouTube Test Error: {e}")
 
 

{ultralytics-8.2.28 → ultralytics-8.2.29}/ultralytics/__init__.py

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

{ultralytics-8.2.28 → ultralytics-8.2.29}/ultralytics/cfg/__init__.py

@@ -95,10 +95,19 @@ CLI_HELP_MSG = f"""
     """
 
 # Define keys for arg type checks
-CFG_FLOAT_KEYS = {"warmup_epochs", "box", "cls", "dfl", "degrees", "shear", "time", "workspace"}
-CFG_FRACTION_KEYS = {
+CFG_FLOAT_KEYS = {  # integer or float arguments, i.e. x=2 and x=2.0
+    "warmup_epochs",
+    "box",
+    "cls",
+    "dfl",
+    "degrees",
+    "shear",
+    "time",
+    "workspace",
+    "batch",
+}
+CFG_FRACTION_KEYS = {  # fractional float arguments with 0.0<=values<=1.0
     "dropout",
-    "iou",
     "lr0",
     "lrf",
     "momentum",
@@ -121,11 +130,10 @@ CFG_FRACTION_KEYS = {
     "conf",
     "iou",
     "fraction",
-}  # fraction floats 0.0 - 1.0
-CFG_INT_KEYS = {
+}
+CFG_INT_KEYS = {  # integer-only arguments
     "epochs",
     "patience",
-    "batch",
     "workers",
     "seed",
     "close_mosaic",
@@ -136,7 +144,7 @@ CFG_INT_KEYS = {
     "nbs",
     "save_period",
 }
-CFG_BOOL_KEYS = {
+CFG_BOOL_KEYS = {  # boolean-only arguments
     "save",
     "exist_ok",
     "verbose",

{ultralytics-8.2.28 → ultralytics-8.2.29}/ultralytics/engine/exporter.py

@@ -126,7 +126,7 @@ def gd_outputs(gd):
 
 
 def try_export(inner_func):
-    """YOLOv8 export decorator, i..e @try_export."""
+    """YOLOv8 export decorator, i.e. @try_export."""
     inner_args = get_default_args(inner_func)
 
     def outer_func(*args, **kwargs):
@@ -211,6 +211,9 @@ class Exporter:
             assert self.device.type == "cpu", "optimize=True not compatible with cuda devices, i.e. use device='cpu'"
         if edgetpu and not LINUX:
             raise SystemError("Edge TPU export only supported on Linux. See https://coral.ai/docs/edgetpu/compiler/")
+        elif edgetpu and self.args.batch != 1:  # see github.com/ultralytics/ultralytics/pull/13420
+            LOGGER.warning("WARNING ⚠️ Edge TPU export requires batch size 1, setting batch=1.")
+            self.args.batch = 1
         if isinstance(model, WorldModel):
             LOGGER.warning(
                 "WARNING ⚠️ YOLOWorld (original version) export is not supported to any format.\n"

{ultralytics-8.2.28 → ultralytics-8.2.29}/ultralytics/engine/trainer.py

@@ -178,9 +178,9 @@ class BaseTrainer:
             if self.args.rect:
                 LOGGER.warning("WARNING ⚠️ 'rect=True' is incompatible with Multi-GPU training, setting 'rect=False'")
                 self.args.rect = False
-            if self.args.batch == -1:
+            if self.args.batch < 1.0:
                 LOGGER.warning(
-                    "WARNING ⚠️ 'batch=-1' for AutoBatch is incompatible with Multi-GPU training, setting "
+                    "WARNING ⚠️ 'batch<1' for AutoBatch is incompatible with Multi-GPU training, setting "
                     "default 'batch=16'"
                 )
                 self.args.batch = 16
@@ -269,8 +269,13 @@ class BaseTrainer:
         self.stride = gs  # for multiscale training
 
         # Batch size
-        if self.batch_size == -1 and RANK == -1:  # single-GPU only, estimate best batch size
-            self.args.batch = self.batch_size = check_train_batch_size(self.model, self.args.imgsz, self.amp)
+        if self.batch_size < 1 and RANK == -1:  # single-GPU only, estimate best batch size
+            self.args.batch = self.batch_size = check_train_batch_size(
+                model=self.model,
+                imgsz=self.args.imgsz,
+                amp=self.amp,
+                batch=self.batch_size,
+            )
 
         # Dataloaders
         batch_size = self.batch_size // max(world_size, 1)

{ultralytics-8.2.28 → ultralytics-8.2.29}/ultralytics/models/yolo/model.py

@@ -92,7 +92,7 @@ class YOLOWorld(Model):
         Set classes.
 
         Args:
-            classes (List(str)): A list of categories i.e ["person"].
+            classes (List(str)): A list of categories i.e. ["person"].
         """
         self.model.set_classes(classes)
         # Remove background if it's given

{ultralytics-8.2.28 → ultralytics-8.2.29}/ultralytics/models/yolo/world/train_world.py

@@ -1,3 +1,5 @@
+# Ultralytics YOLO 🚀, AGPL-3.0 license
+
 from ultralytics.data import YOLOConcatDataset, build_grounding, build_yolo_dataset
 from ultralytics.data.utils import check_det_dataset
 from ultralytics.models.yolo.world import WorldTrainer

{ultralytics-8.2.28 → ultralytics-8.2.29}/ultralytics/nn/autobackend.py

@@ -320,6 +320,10 @@ class AutoBackend(nn.Module):
             with open(w, "rb") as f:
                 gd.ParseFromString(f.read())
             frozen_func = wrap_frozen_graph(gd, inputs="x:0", outputs=gd_outputs(gd))
+            try:  # attempt to retrieve metadata from SavedModel file potentially alongside GraphDef file
+                metadata = next(Path(w).resolve().parent.rglob(f"{Path(w).stem}_saved_model*/metadata.yaml"))
+            except StopIteration:
+                pass  # no metadata file found
 
         # TFLite or TFLite Edge TPU
         elif tflite or edgetpu:  # https://www.tensorflow.org/lite/guide/python#install_tensorflow_lite_for_python
@@ -402,7 +406,7 @@ class AutoBackend(nn.Module):
         # Load external metadata YAML
         if isinstance(metadata, (str, Path)) and Path(metadata).exists():
             metadata = yaml_load(metadata)
-        if metadata:
+        if metadata and isinstance(metadata, dict):
             for k, v in metadata.items():
                 if k in {"stride", "batch"}:
                     metadata[k] = int(v)
@@ -563,7 +567,7 @@ class AutoBackend(nn.Module):
                     y = [y]
             elif self.pb:  # GraphDef
                 y = self.frozen_func(x=self.tf.constant(im))
-                if len(y) == 2 and len(self.names) == 999:  # segments and names not defined
+                if (self.task == "segment" or len(y) == 2) and len(self.names) == 999:  # segments and names not defined
                     ip, ib = (0, 1) if len(y[0].shape) == 4 else (1, 0)  # index of protos, boxes
                     nc = y[ib].shape[1] - y[ip].shape[3] - 4  # y = (1, 160, 160, 32), (1, 116, 8400)
                     self.names = {i: f"class{i}" for i in range(nc)}

{ultralytics-8.2.28 → ultralytics-8.2.29}/ultralytics/solutions/analytics.py

@@ -11,7 +11,7 @@ from matplotlib.figure import Figure
 
 
 class Analytics:
-    """A class to create and update various types of charts (line, bar, pie) for visual analytics."""
+    """A class to create and update various types of charts (line, bar, pie, area) for visual analytics."""
 
     def __init__(
         self,
@@ -25,6 +25,7 @@ class Analytics:
         fg_color="black",
         line_color="yellow",
         line_width=2,
+        points_width=10,
         fontsize=13,
         view_img=False,
         save_img=True,
@@ -34,7 +35,7 @@ class Analytics:
         Initialize the Analytics class with various chart types.
 
         Args:
-            type (str): Type of chart to initialize ('line', 'bar', or 'pie').
+            type (str): Type of chart to initialize ('line', 'bar', 'pie', or 'area').
             writer (object): Video writer object to save the frames.
             im0_shape (tuple): Shape of the input image (width, height).
             title (str): Title of the chart.
@@ -44,6 +45,7 @@ class Analytics:
             fg_color (str): Foreground (text) color of the chart.
             line_color (str): Line color for line charts.
             line_width (int): Width of the lines in line charts.
+            points_width (int): Width of line points highlighter
             fontsize (int): Font size for chart text.
             view_img (bool): Whether to display the image.
             save_img (bool): Whether to save the image.
@@ -57,17 +59,24 @@ class Analytics:
         self.title = title
         self.writer = writer
         self.max_points = max_points
+        self.line_color = line_color
+        self.x_label = x_label
+        self.y_label = y_label
+        self.points_width = points_width
+        self.line_width = line_width
+        self.fontsize = fontsize
 
         # Set figure size based on image shape
         figsize = (im0_shape[0] / 100, im0_shape[1] / 100)
 
-        if type == "line":
-            # Initialize line plot
+        if type in {"line", "area"}:
+            # Initialize line or area plot
             self.lines = {}
-            fig = Figure(facecolor=self.bg_color, figsize=figsize)
-            self.canvas = FigureCanvas(fig)
-            self.ax = fig.add_subplot(111, facecolor=self.bg_color)
-            (self.line,) = self.ax.plot([], [], color=line_color, linewidth=line_width)
+            self.fig = Figure(facecolor=self.bg_color, figsize=figsize)
+            self.canvas = FigureCanvas(self.fig)
+            self.ax = self.fig.add_subplot(111, facecolor=self.bg_color)
+            if type == "line":
+                (self.line,) = self.ax.plot([], [], color=self.line_color, linewidth=self.line_width)
 
         elif type in {"bar", "pie"}:
             # Initialize bar or pie plot
@@ -93,11 +102,73 @@ class Analytics:
             self.ax.axis("equal") if type == "pie" else None
 
         # Set common axis properties
-        self.ax.set_title(self.title, color=self.fg_color, fontsize=fontsize)
-        self.ax.set_xlabel(x_label, color=self.fg_color, fontsize=fontsize - 3)
-        self.ax.set_ylabel(y_label, color=self.fg_color, fontsize=fontsize - 3)
+        self.ax.set_title(self.title, color=self.fg_color, fontsize=self.fontsize)
+        self.ax.set_xlabel(x_label, color=self.fg_color, fontsize=self.fontsize - 3)
+        self.ax.set_ylabel(y_label, color=self.fg_color, fontsize=self.fontsize - 3)
         self.ax.tick_params(axis="both", colors=self.fg_color)
 
+    def update_area(self, frame_number, counts_dict):
+        """
+        Update the area graph with new data for multiple classes.
+
+        Args:
+            frame_number (int): The current frame number.
+            counts_dict (dict): Dictionary with class names as keys and counts as values.
+        """
+
+        x_data = np.array([])
+        y_data_dict = {key: np.array([]) for key in counts_dict.keys()}
+
+        if self.ax.lines:
+            x_data = self.ax.lines[0].get_xdata()
+            for line, key in zip(self.ax.lines, counts_dict.keys()):
+                y_data_dict[key] = line.get_ydata()
+
+        x_data = np.append(x_data, float(frame_number))
+        max_length = len(x_data)
+
+        for key in counts_dict.keys():
+            y_data_dict[key] = np.append(y_data_dict[key], float(counts_dict[key]))
+            if len(y_data_dict[key]) < max_length:
+                y_data_dict[key] = np.pad(y_data_dict[key], (0, max_length - len(y_data_dict[key])), "constant")
+
+        # Remove the oldest points if the number of points exceeds max_points
+        if len(x_data) > self.max_points:
+            x_data = x_data[1:]
+            for key in counts_dict.keys():
+                y_data_dict[key] = y_data_dict[key][1:]
+
+        self.ax.clear()
+
+        colors = ["#E1FF25", "#0BDBEB", "#FF64DA", "#111F68", "#042AFF"]
+        color_cycle = cycle(colors)
+
+        for key, y_data in y_data_dict.items():
+            color = next(color_cycle)
+            self.ax.fill_between(x_data, y_data, color=color, alpha=0.6)
+            self.ax.plot(
+                x_data,
+                y_data,
+                color=color,
+                linewidth=self.line_width,
+                marker="o",
+                markersize=self.points_width,
+                label=f"{key} Data Points",
+            )
+
+        self.ax.set_title(self.title, color=self.fg_color, fontsize=self.fontsize)
+        self.ax.set_xlabel(self.x_label, color=self.fg_color, fontsize=self.fontsize - 3)
+        self.ax.set_ylabel(self.y_label, color=self.fg_color, fontsize=self.fontsize - 3)
+        legend = self.ax.legend(loc="upper left", fontsize=13, facecolor=self.bg_color, edgecolor=self.fg_color)
+
+        # Set legend text color
+        for text in legend.get_texts():
+            text.set_color(self.fg_color)
+
+        self.canvas.draw()
+        im0 = np.array(self.canvas.renderer.buffer_rgba())
+        self.write_and_display(im0)
+
     def update_line(self, frame_number, total_counts):
         """
         Update the line graph with new data.
@@ -117,7 +188,7 @@ class Analytics:
         self.ax.autoscale_view()
         self.canvas.draw()
         im0 = np.array(self.canvas.renderer.buffer_rgba())
-        self.write_and_display_line(im0)
+        self.write_and_display(im0)
 
     def update_multiple_lines(self, counts_dict, labels_list, frame_number):
         """
@@ -131,7 +202,7 @@ class Analytics:
         warnings.warn("Display is not supported for multiple lines, output will be stored normally!")
         for obj in labels_list:
             if obj not in self.lines:
-                (line,) = self.ax.plot([], [], label=obj, marker="o", markersize=15)
+                (line,) = self.ax.plot([], [], label=obj, marker="o", markersize=self.points_width)
                 self.lines[obj] = line
 
             x_data = self.lines[obj].get_xdata()
@@ -153,16 +224,14 @@ class Analytics:
 
         im0 = np.array(self.canvas.renderer.buffer_rgba())
         self.view_img = False  # for multiple line view_img not supported yet, coming soon!
-        self.write_and_display_line(im0)
+        self.write_and_display(im0)
 
-    def write_and_display_line(self, im0):
+    def write_and_display(self, im0):
         """
         Write and display the line graph
         Args:
             im0 (ndarray): Image for processing
         """
-
-        # convert image to BGR format
         im0 = cv2.cvtColor(im0[:, :, :3], cv2.COLOR_RGBA2BGR)
         cv2.imshow(self.title, im0) if self.view_img else None
         self.writer.write(im0) if self.save_img else None
@@ -204,10 +273,7 @@ class Analytics:
         canvas.draw()
         buf = canvas.buffer_rgba()
         im0 = np.asarray(buf)
-        im0 = cv2.cvtColor(im0, cv2.COLOR_RGBA2BGR)
-
-        self.writer.write(im0) if self.save_img else None
-        cv2.imshow(self.title, im0) if self.view_img else None
+        self.write_and_display(im0)
 
     def update_pie(self, classes_dict):
         """
@@ -239,9 +305,7 @@ class Analytics:
         # Display and save the updated chart
         im0 = self.fig.canvas.draw()
         im0 = np.array(self.fig.canvas.renderer.buffer_rgba())
-        im0 = cv2.cvtColor(im0[:, :, :3], cv2.COLOR_RGBA2BGR)
-        self.writer.write(im0) if self.save_img else None
-        cv2.imshow(self.title, im0) if self.view_img else None
+        self.write_and_display(im0)
 
 
 if __name__ == "__main__":

{ultralytics-8.2.28 → ultralytics-8.2.29}/ultralytics/utils/autobatch.py

@@ -10,9 +10,9 @@ from ultralytics.utils import DEFAULT_CFG, LOGGER, colorstr
 from ultralytics.utils.torch_utils import profile
 
 
-def check_train_batch_size(model, imgsz=640, amp=True):
+def check_train_batch_size(model, imgsz=640, amp=True, batch=-1):
     """
-    Check YOLO training batch size using the autobatch() function.
+    Compute optimal YOLO training batch size using the autobatch() function.
 
     Args:
         model (torch.nn.Module): YOLO model to check batch size for.
@@ -24,7 +24,7 @@ def check_train_batch_size(model, imgsz=640, amp=True):
     """
 
     with torch.cuda.amp.autocast(amp):
-        return autobatch(deepcopy(model).train(), imgsz)  # compute optimal batch size
+        return autobatch(deepcopy(model).train(), imgsz, fraction=batch if 0.0 < batch < 1.0 else 0.6)
 
 
 def autobatch(model, imgsz=640, fraction=0.60, batch_size=DEFAULT_CFG.batch):
@@ -43,7 +43,7 @@ def autobatch(model, imgsz=640, fraction=0.60, batch_size=DEFAULT_CFG.batch):
 
     # Check device
     prefix = colorstr("AutoBatch: ")
-    LOGGER.info(f"{prefix}Computing optimal batch size for imgsz={imgsz}")
+    LOGGER.info(f"{prefix}Computing optimal batch size for imgsz={imgsz} at {fraction * 100}% CUDA memory utilization.")
     device = next(model.parameters()).device  # get model device
     if device.type == "cpu":
         LOGGER.info(f"{prefix}CUDA not detected, using default CPU batch-size {batch_size}")

{ultralytics-8.2.28 → ultralytics-8.2.29}/ultralytics/utils/callbacks/tensorboard.py

@@ -1,4 +1,5 @@
 # Ultralytics YOLO 🚀, AGPL-3.0 license
+
 import contextlib
 
 from ultralytics.utils import LOGGER, SETTINGS, TESTS_RUNNING, colorstr

{ultralytics-8.2.28 → ultralytics-8.2.29}/ultralytics/utils/ops.py

@@ -215,7 +215,7 @@ def non_max_suppression(
 
     bs = prediction.shape[0]  # batch size
     nc = nc or (prediction.shape[1] - 4)  # number of classes
-    nm = prediction.shape[1] - nc - 4
+    nm = prediction.shape[1] - nc - 4  # number of masks
     mi = 4 + nc  # mask start index
     xc = prediction[:, 4:mi].amax(1) > conf_thres  # candidates
 

{ultralytics-8.2.28 → ultralytics-8.2.29}/ultralytics/utils/torch_utils.py

@@ -146,11 +146,17 @@ def select_device(device="", batch=0, newline=False, verbose=True):
     if not cpu and not mps and torch.cuda.is_available():  # prefer GPU if available
         devices = device.split(",") if device else "0"  # range(torch.cuda.device_count())  # i.e. 0,1,6,7
         n = len(devices)  # device count
-        if n > 1 and batch > 0 and batch % n != 0:  # check batch_size is divisible by device_count
-            raise ValueError(
-                f"'batch={batch}' must be a multiple of GPU count {n}. Try 'batch={batch // n * n}' or "
-                f"'batch={batch // n * n + n}', the nearest batch sizes evenly divisible by {n}."
-            )
+        if n > 1:  # multi-GPU
+            if batch < 1:
+                raise ValueError(
+                    "AutoBatch with batch<1 not supported for Multi-GPU training, "
+                    "please specify a valid batch size, i.e. batch=16."
+                )
+            if batch >= 0 and batch % n != 0:  # check batch_size is divisible by device_count
+                raise ValueError(
+                    f"'batch={batch}' must be a multiple of GPU count {n}. Try 'batch={batch // n * n}' or "
+                    f"'batch={batch // n * n + n}', the nearest batch sizes evenly divisible by {n}."
+                )
         space = " " * (len(s) + 1)
         for i, d in enumerate(devices):
             p = torch.cuda.get_device_properties(i)

{ultralytics-8.2.28 → ultralytics-8.2.29}/ultralytics.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ultralytics
-Version: 8.2.28
+Version: 8.2.29
 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