ultralytics 8.0.225__tar.gz → 8.0.227__tar.gz

{ultralytics-8.0.225/ultralytics.egg-info → ultralytics-8.0.227}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ultralytics
-Version: 8.0.225
+Version: 8.0.227
 Summary: Ultralytics YOLOv8 for SOTA object detection, multi-object tracking, instance segmentation, pose estimation and image classification.
 Home-page: https://github.com/ultralytics/ultralytics
 Author: Ultralytics

{ultralytics-8.0.225 → ultralytics-8.0.227}/ultralytics/__init__.py

@@ -1,6 +1,6 @@
 # Ultralytics YOLO 🚀, AGPL-3.0 license
 
-__version__ = '8.0.225'
+__version__ = '8.0.227'
 
 from ultralytics.models import RTDETR, SAM, YOLO
 from ultralytics.models.fastsam import FastSAM

{ultralytics-8.0.225 → ultralytics-8.0.227}/ultralytics/cfg/__init__.py

@@ -437,7 +437,7 @@ def entrypoint(debug=''):
         LOGGER.warning(f"WARNING ⚠️ 'source' is missing. Using default 'source={overrides['source']}'.")
     elif mode in ('train', 'val'):
         if 'data' not in overrides and 'resume' not in overrides:
-            overrides['data'] = TASK2DATA.get(task or DEFAULT_CFG.task, DEFAULT_CFG.data)
+            overrides['data'] = DEFAULT_CFG.data or TASK2DATA.get(task or DEFAULT_CFG.task, DEFAULT_CFG.data)
             LOGGER.warning(f"WARNING ⚠️ 'data' is missing. Using default 'data={overrides['data']}'.")
     elif mode == 'export':
         if 'format' not in overrides:

{ultralytics-8.0.225 → ultralytics-8.0.227}/ultralytics/data/augment.py

@@ -163,7 +163,42 @@ class Mosaic(BaseMixTransform):
         """Apply mixup transformation to the input image and labels."""
         assert labels.get('rect_shape', None) is None, 'rect and mosaic are mutually exclusive.'
         assert len(labels.get('mix_labels', [])), 'There are no other images for mosaic augment.'
-        return self._mosaic4(labels) if self.n == 4 else self._mosaic9(labels)
+        return self._mosaic3(labels) if self.n == 3 else self._mosaic4(labels) if self.n == 4 else self._mosaic9(
+            labels)  # This code is modified for mosaic3 method.
+
+    def _mosaic3(self, labels):
+        """Create a 1x3 image mosaic."""
+        mosaic_labels = []
+        s = self.imgsz
+        for i in range(3):
+            labels_patch = labels if i == 0 else labels['mix_labels'][i - 1]
+            # Load image
+            img = labels_patch['img']
+            h, w = labels_patch.pop('resized_shape')
+
+            # Place img in img3
+            if i == 0:  # center
+                img3 = np.full((s * 3, s * 3, img.shape[2]), 114, dtype=np.uint8)  # base image with 3 tiles
+                h0, w0 = h, w
+                c = s, s, s + w, s + h  # xmin, ymin, xmax, ymax (base) coordinates
+            elif i == 1:  # right
+                c = s + w0, s, s + w0 + w, s + h
+            elif i == 2:  # left
+                c = s - w, s + h0 - h, s, s + h0
+
+            padw, padh = c[:2]
+            x1, y1, x2, y2 = (max(x, 0) for x in c)  # allocate coords
+
+            img3[y1:y2, x1:x2] = img[y1 - padh:, x1 - padw:]  # img3[ymin:ymax, xmin:xmax]
+            # hp, wp = h, w  # height, width previous for next iteration
+
+            # Labels assuming imgsz*2 mosaic size
+            labels_patch = self._update_labels(labels_patch, padw + self.border[0], padh + self.border[1])
+            mosaic_labels.append(labels_patch)
+        final_labels = self._cat_labels(mosaic_labels)
+
+        final_labels['img'] = img3[-self.border[0]:self.border[0], -self.border[1]:self.border[1]]
+        return final_labels
 
     def _mosaic4(self, labels):
         """Create a 2x2 image mosaic."""

{ultralytics-8.0.225 → ultralytics-8.0.227}/ultralytics/data/utils.py

@@ -434,7 +434,7 @@ class HUBDatasetStats:
             data = check_cls_dataset(unzip_dir)
             data['path'] = unzip_dir
         else:  # detect, segment, pose
-            zipped, data_dir, yaml_path = self._unzip(Path(path))
+            _, data_dir, yaml_path = self._unzip(Path(path))
             try:
                 # Load YAML with checks
                 data = yaml_load(yaml_path)

{ultralytics-8.0.225 → ultralytics-8.0.227}/ultralytics/engine/exporter.py

@@ -64,7 +64,7 @@ import torch
 from ultralytics.cfg import get_cfg
 from ultralytics.data.dataset import YOLODataset
 from ultralytics.data.utils import check_det_dataset
-from ultralytics.nn.autobackend import check_class_names
+from ultralytics.nn.autobackend import check_class_names, default_class_names
 from ultralytics.nn.modules import C2f, Detect, RTDETRDecoder
 from ultralytics.nn.tasks import DetectionModel, SegmentationModel
 from ultralytics.utils import (ARM64, DEFAULT_CFG, LINUX, LOGGER, MACOS, ROOT, WINDOWS, __version__, callbacks,
@@ -172,6 +172,8 @@ class Exporter:
         self.device = select_device('cpu' if self.args.device is None else self.args.device)
 
         # Checks
+        if not hasattr(model, 'names'):
+            model.names = default_class_names()
         model.names = check_class_names(model.names)
         if self.args.half and onnx and self.device.type == 'cpu':
             LOGGER.warning('WARNING ⚠️ half=True only compatible with GPU export, i.e. use device=0')

{ultralytics-8.0.225 → ultralytics-8.0.227}/ultralytics/engine/model.py

@@ -325,7 +325,7 @@ class Model(nn.Module):
         checks.check_pip_update_available()
 
         overrides = yaml_load(checks.check_yaml(kwargs['cfg'])) if kwargs.get('cfg') else self.overrides
-        custom = {'data': TASK2DATA[self.task]}  # method defaults
+        custom = {'data': DEFAULT_CFG_DICT['data'] or TASK2DATA[self.task]}  # method defaults
         args = {**overrides, **custom, **kwargs, 'mode': 'train'}  # highest priority args on the right
         if args.get('resume'):
             args['resume'] = self.ckpt_path

{ultralytics-8.0.225 → ultralytics-8.0.227}/ultralytics/engine/tuner.py

@@ -56,6 +56,14 @@ class Tuner:
         model = YOLO('yolov8n.pt')
         model.tune(data='coco8.yaml', epochs=10, iterations=300, optimizer='AdamW', plots=False, save=False, val=False)
         ```
+
+        Tune with custom search space.
+        ```python
+        from ultralytics import YOLO
+
+        model = YOLO('yolov8n.pt')
+        model.tune(space={key1: val1, key2: val2})  # custom search space dictionary
+        ```
     """
 
     def __init__(self, args=DEFAULT_CFG, _callbacks=None):
@@ -65,10 +73,9 @@ class Tuner:
         Args:
             args (dict, optional): Configuration for hyperparameter evolution.
         """
-        self.args = get_cfg(overrides=args)
-        self.space = {  # key: (min, max, gain(optional))
+        self.space = args.pop('space', None) or {  # key: (min, max, gain(optional))
             # 'optimizer': tune.choice(['SGD', 'Adam', 'AdamW', 'NAdam', 'RAdam', 'RMSProp']),
-            'lr0': (1e-5, 1e-1),
+            'lr0': (1e-5, 1e-1),  # initial learning rate (i.e. SGD=1E-2, Adam=1E-3)
             'lrf': (0.0001, 0.1),  # final OneCycleLR learning rate (lr0 * lrf)
             'momentum': (0.7, 0.98, 0.3),  # SGD momentum/Adam beta1
             'weight_decay': (0.0, 0.001),  # optimizer weight decay 5e-4
@@ -90,6 +97,7 @@ class Tuner:
             'mosaic': (0.0, 1.0),  # image mixup (probability)
             'mixup': (0.0, 1.0),  # image mixup (probability)
             'copy_paste': (0.0, 1.0)}  # segment copy-paste (probability)
+        self.args = get_cfg(overrides=args)
         self.tune_dir = get_save_dir(self.args, name='tune')
         self.tune_csv = self.tune_dir / 'tune_results.csv'
         self.callbacks = _callbacks or callbacks.get_default_callbacks()

{ultralytics-8.0.225 → ultralytics-8.0.227}/ultralytics/engine/validator.py

@@ -135,7 +135,7 @@ class BaseValidator:
                 self.args.batch = 1  # export.py models default to batch-size 1
                 LOGGER.info(f'Forcing batch=1 square inference (1,3,{imgsz},{imgsz}) for non-PyTorch models')
 
-            if isinstance(self.args.data, str) and self.args.data.split('.')[-1] in ('yaml', 'yml'):
+            if str(self.args.data).split('.')[-1] in ('yaml', 'yml'):
                 self.data = check_det_dataset(self.args.data)
             elif self.args.task == 'classify':
                 self.data = check_cls_dataset(self.args.data, split=self.args.split)

{ultralytics-8.0.225 → ultralytics-8.0.227}/ultralytics/nn/autobackend.py

@@ -40,6 +40,14 @@ def check_class_names(names):
     return names
 
 
+def default_class_names(data=None):
+    """Applies default class names to an input YAML file or returns numerical class names."""
+    if data:
+        with contextlib.suppress(Exception):
+            return yaml_load(check_yaml(data))['names']
+    return {i: f'class{i}' for i in range(999)}  # return default if above errors
+
+
 class AutoBackend(nn.Module):
     """
     Handles dynamic backend selection for running inference using Ultralytics YOLO models.
@@ -315,7 +323,7 @@ class AutoBackend(nn.Module):
 
         # Check names
         if 'names' not in locals():  # names missing
-            names = self._apply_default_class_names(data)
+            names = default_class_names(data)
         names = check_class_names(names)
 
         # Disable gradients
@@ -479,13 +487,6 @@ class AutoBackend(nn.Module):
             for _ in range(2 if self.jit else 1):
                 self.forward(im)  # warmup
 
-    @staticmethod
-    def _apply_default_class_names(data):
-        """Applies default class names to an input YAML file or returns numerical class names."""
-        with contextlib.suppress(Exception):
-            return yaml_load(check_yaml(data))['names']
-        return {i: f'class{i}' for i in range(999)}  # return default if above errors
-
     @staticmethod
     def _model_type(p='path/to/model.pt'):
         """

{ultralytics-8.0.225 → ultralytics-8.0.227}/ultralytics/solutions/ai_gym.py

@@ -2,6 +2,7 @@
 
 import cv2
 
+from ultralytics.utils.checks import check_imshow
 from ultralytics.utils.plotting import Annotator
 
 
@@ -32,6 +33,9 @@ class AIGym:
         self.view_img = False
         self.annotator = None
 
+        # Check if environment support imshow
+        self.env_check = check_imshow(warn=True)
+
     def set_args(self,
                  kpts_to_check,
                  line_thickness=2,
@@ -120,7 +124,7 @@ class AIGym:
 
             self.annotator.kpts(k, shape=(640, 640), radius=1, kpt_line=True)
 
-        if self.view_img:
+        if self.env_check and self.view_img:
             cv2.imshow('Ultralytics YOLOv8 AI GYM', self.im0)
             if cv2.waitKey(1) & 0xFF == ord('q'):
                 return

{ultralytics-8.0.225 → ultralytics-8.0.227}/ultralytics/solutions/heatmap.py

@@ -5,7 +5,7 @@ from collections import defaultdict
 import cv2
 import numpy as np
 
-from ultralytics.utils.checks import check_requirements
+from ultralytics.utils.checks import check_imshow, check_requirements
 from ultralytics.utils.plotting import Annotator
 
 check_requirements('shapely>=2.0.0')
@@ -50,6 +50,9 @@ class Heatmap:
         self.count_reg_color = (0, 255, 0)
         self.region_thickness = 5
 
+        # Check if environment support imshow
+        self.env_check = check_imshow(warn=True)
+
     def set_args(self,
                  imw,
                  imh,
@@ -155,7 +158,7 @@ class Heatmap:
 
         im0_with_heatmap = cv2.addWeighted(self.im0, 1 - self.heatmap_alpha, heatmap_colored, self.heatmap_alpha, 0)
 
-        if self.view_img:
+        if self.env_check and self.view_img:
             self.display_frames(im0_with_heatmap)
 
         return im0_with_heatmap

{ultralytics-8.0.225 → ultralytics-8.0.227}/ultralytics/solutions/object_counter.py

@@ -4,7 +4,7 @@ from collections import defaultdict
 
 import cv2
 
-from ultralytics.utils.checks import check_requirements
+from ultralytics.utils.checks import check_imshow, check_requirements
 from ultralytics.utils.plotting import Annotator, colors
 
 check_requirements('shapely>=2.0.0')
@@ -46,6 +46,9 @@ class ObjectCounter:
         self.track_thickness = 2
         self.draw_tracks = False
 
+        # Check if environment support imshow
+        self.env_check = check_imshow(warn=True)
+
     def set_args(self,
                  classes_names,
                  reg_pts,
@@ -136,7 +139,7 @@ class ObjectCounter:
                     else:
                         self.in_counts += 1
 
-        if self.view_img:
+        if self.env_check and self.view_img:
             incount_label = 'InCount : ' + f'{self.in_counts}'
             outcount_label = 'OutCount : ' + f'{self.out_counts}'
             self.annotator.count_labels(in_count=incount_label, out_count=outcount_label)

{ultralytics-8.0.225 → ultralytics-8.0.227/ultralytics.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ultralytics
-Version: 8.0.225
+Version: 8.0.227
 Summary: Ultralytics YOLOv8 for SOTA object detection, multi-object tracking, instance segmentation, pose estimation and image classification.
 Home-page: https://github.com/ultralytics/ultralytics
 Author: Ultralytics