ultralytics 8.3.68__tar.gz → 8.3.70__tar.gz

{ultralytics-8.3.68/ultralytics.egg-info → ultralytics-8.3.70}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ultralytics
-Version: 8.3.68
+Version: 8.3.70
 Summary: Ultralytics YOLO 🚀 for SOTA object detection, multi-object tracking, instance segmentation, pose estimation and image classification.
 Author-email: Glenn Jocher <glenn.jocher@ultralytics.com>, Jing Qiu <jing.qiu@ultralytics.com>
 Maintainer-email: Ultralytics <hello@ultralytics.com>
@@ -32,8 +32,7 @@ Classifier: Operating System :: Microsoft :: Windows
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: numpy>=1.23.0
-Requires-Dist: numpy<2.0.0; sys_platform == "darwin"
+Requires-Dist: numpy<=2.1.1,>=1.23.0
 Requires-Dist: matplotlib>=3.3.0
 Requires-Dist: opencv-python>=4.6.0
 Requires-Dist: pillow>=7.1.2
@@ -58,7 +57,7 @@ Requires-Dist: mkdocs>=1.6.0; extra == "dev"
 Requires-Dist: mkdocs-material>=9.5.9; extra == "dev"
 Requires-Dist: mkdocstrings[python]; extra == "dev"
 Requires-Dist: mkdocs-redirects; extra == "dev"
-Requires-Dist: mkdocs-ultralytics-plugin>=0.1.8; extra == "dev"
+Requires-Dist: mkdocs-ultralytics-plugin>=0.1.16; extra == "dev"
 Requires-Dist: mkdocs-macros-plugin>=1.0.5; extra == "dev"
 Provides-Extra: export
 Requires-Dist: onnx>=1.12.0; extra == "export"

{ultralytics-8.3.68 → ultralytics-8.3.70}/pyproject.toml

@@ -61,8 +61,7 @@ classifiers = [
 
 # Required dependencies ------------------------------------------------------------------------------------------------
 dependencies = [
-    "numpy>=1.23.0",
-    "numpy<2.0.0; sys_platform == 'darwin'", # macOS OpenVINO errors https://github.com/ultralytics/ultralytics/pull/17221
+    "numpy>=1.23.0,<=2.1.1", # OpenVINO and TFLite errors on '--slow' CI Tests https://github.com/ultralytics/ultralytics/pull/18943
     "matplotlib>=3.3.0",
     "opencv-python>=4.6.0",
     "pillow>=7.1.2",
@@ -91,7 +90,7 @@ dev = [
     "mkdocs-material>=9.5.9",
     "mkdocstrings[python]",
     "mkdocs-redirects", # 301 redirects
-    "mkdocs-ultralytics-plugin>=0.1.8", # for meta descriptions and images, dates and authors
+    "mkdocs-ultralytics-plugin>=0.1.16", # for meta descriptions and images, dates and authors
     "mkdocs-macros-plugin>=1.0.5"  # duplicating content (i.e. export tables) in multiple places
 ]
 export = [

{ultralytics-8.3.68 → ultralytics-8.3.70}/ultralytics/__init__.py

@@ -1,6 +1,6 @@
 # Ultralytics 🚀 AGPL-3.0 License - https://ultralytics.com/license
 
-__version__ = "8.3.68"
+__version__ = "8.3.70"
 
 import os
 

{ultralytics-8.3.68 → ultralytics-8.3.70}/ultralytics/engine/model.py

@@ -661,6 +661,7 @@ class Model(nn.Module):
                 - int8 (bool): Whether to use int8 precision mode.
                 - device (str): Device to run the benchmark on (e.g., 'cpu', 'cuda').
                 - verbose (bool): Whether to print detailed benchmark information.
+                - format (str): Export format name for specific benchmarking
 
         Returns:
             (Dict): A dictionary containing the results of the benchmarking process, including metrics for
@@ -686,7 +687,8 @@ class Model(nn.Module):
             half=args["half"],
             int8=args["int8"],
             device=args["device"],
-            verbose=kwargs.get("verbose"),
+            verbose=kwargs.get("verbose", False),
+            format=kwargs.get("format", ""),
         )
 
     def export(

{ultralytics-8.3.68 → ultralytics-8.3.70}/ultralytics/engine/results.py

@@ -937,6 +937,75 @@ class Results(SimpleClass):
 
         return json.dumps(self.summary(normalize=normalize, decimals=decimals), indent=2)
 
+    def to_sql(self, table_name="results", normalize=False, decimals=5, db_path="results.db"):
+        """
+        Converts detection results to an SQL-compatible format.
+
+        This method serializes the detection results into a format compatible with SQL databases.
+        It includes information about detected objects such as bounding boxes, class names, confidence scores,
+        and optionally segmentation masks, keypoints or oriented bounding boxes.
+
+        Args:
+            table_name (str): Name of the SQL table where the data will be inserted. Defaults to "detection_results".
+            normalize (bool): Whether to normalize the bounding box coordinates by the image dimensions.
+                If True, coordinates will be returned as float values between 0 and 1. Defaults to False.
+            decimals (int): Number of decimal places to round the bounding boxes values to. Defaults to 5.
+            db_path (str): Path to the SQLite database file. Defaults to "results.db".
+
+        Examples:
+            >>> results = model("path/to/image.jpg")
+            >>> results[0].to_sql()
+            >>> print("SQL data written successfully.")
+        """
+        import json
+        import sqlite3
+
+        # Convert results to a list of dictionaries
+        data = self.summary(normalize=normalize, decimals=decimals)
+        if not data:
+            LOGGER.warning("⚠️ No results to save to SQL. Results dict is empty")
+            return
+
+        # Connect to the SQLite database
+        conn = sqlite3.connect(db_path)
+        cursor = conn.cursor()
+
+        # Create table if it doesn't exist
+        columns = (
+            "id INTEGER PRIMARY KEY AUTOINCREMENT, class_name TEXT, confidence REAL, "
+            "box TEXT, masks TEXT, kpts TEXT, obb TEXT"
+        )
+        cursor.execute(f"CREATE TABLE IF NOT EXISTS {table_name} ({columns})")
+
+        # Insert data into the table
+        for i, item in enumerate(data):
+            detect, obb = None, None  # necessary to reinit these variables inside for loop to avoid duplication
+            class_name = item.get("name")
+            box = item.get("box", {})
+            # Serialize the box as JSON for 'detect' and 'obb' based on key presence
+            if all(key in box for key in ["x1", "y1", "x2", "y2"]) and not any(key in box for key in ["x3", "x4"]):
+                detect = json.dumps(box)
+            if all(key in box for key in ["x1", "y1", "x2", "y2", "x3", "x4"]):
+                obb = json.dumps(box)
+
+            cursor.execute(
+                f"INSERT INTO {table_name} (class_name, confidence, box, masks, kpts, obb) VALUES (?, ?, ?, ?, ?, ?)",
+                (
+                    class_name,
+                    item.get("confidence"),
+                    detect,
+                    json.dumps(item.get("segments", {}).get("x", [])),
+                    json.dumps(item.get("keypoints", {}).get("x", [])),
+                    obb,
+                ),
+            )
+
+        # Commit and close the connection
+        conn.commit()
+        conn.close()
+
+        LOGGER.info(f"✅ Detection results successfully written to SQL table '{table_name}' in database '{db_path}'.")
+
 
 class Boxes(BaseTensor):
     """

{ultralytics-8.3.68 → ultralytics-8.3.70}/ultralytics/models/utils/ops.py

@@ -172,7 +172,7 @@ def get_cdn_group(
             bounding boxes, attention mask and meta information for denoising. If not in training mode or 'num_dn'
             is less than or equal to 0, the function returns None for all elements in the tuple.
     """
-    if (not training) or num_dn <= 0:
+    if (not training) or num_dn <= 0 or batch is None:
         return None, None, None, None
     gt_groups = batch["gt_groups"]
     total_num = sum(gt_groups)

{ultralytics-8.3.68 → ultralytics-8.3.70}/ultralytics/nn/autobackend.py

@@ -293,6 +293,12 @@ class AutoBackend(nn.Module):
                 except UnicodeDecodeError:
                     f.seek(0)  # engine file may lack embedded Ultralytics metadata
                 model = runtime.deserialize_cuda_engine(f.read())  # read engine
+                if "dla" in str(device.type):
+                    dla_core = int(device.type.split(":")[1])
+                    assert dla_core in {0, 1}, (
+                        "Expected device type for inference in DLA is 'dla:0' or 'dla:1', but received '{device.type}'"
+                    )
+                    runtime.DLA_core = dla_core
 
             # Model context
             try:

{ultralytics-8.3.68 → ultralytics-8.3.70}/ultralytics/utils/benchmarks.py

@@ -42,7 +42,7 @@ from ultralytics import YOLO, YOLOWorld
 from ultralytics.cfg import TASK2DATA, TASK2METRIC
 from ultralytics.engine.exporter import export_formats
 from ultralytics.utils import ARM64, ASSETS, LINUX, LOGGER, MACOS, TQDM, WEIGHTS_DIR
-from ultralytics.utils.checks import IS_PYTHON_3_12, check_requirements, check_yolo, is_rockchip
+from ultralytics.utils.checks import IS_PYTHON_3_12, check_imgsz, check_requirements, check_yolo, is_rockchip
 from ultralytics.utils.downloads import safe_download
 from ultralytics.utils.files import file_size
 from ultralytics.utils.torch_utils import get_cpu_info, select_device
@@ -57,6 +57,7 @@ def benchmark(
     device="cpu",
     verbose=False,
     eps=1e-3,
+    format="",
 ):
     """
     Benchmark a YOLO model across different formats for speed and accuracy.
@@ -70,6 +71,7 @@ def benchmark(
         device (str): Device to run the benchmark on, either 'cpu' or 'cuda'.
         verbose (bool | float): If True or a float, assert benchmarks pass with given metric.
         eps (float): Epsilon value for divide by zero prevention.
+        format (str): Export format for benchmarking. If not supplied all formats are benchmarked.
 
     Returns:
         (pandas.DataFrame): A pandas DataFrame with benchmark results for each format, including file size, metric,
@@ -80,6 +82,9 @@ def benchmark(
         >>> from ultralytics.utils.benchmarks import benchmark
         >>> benchmark(model="yolo11n.pt", imgsz=640)
     """
+    imgsz = check_imgsz(imgsz)
+    assert imgsz[0] == imgsz[1] if isinstance(imgsz, list) else True, "benchmark() only supports square imgsz."
+
     import pandas as pd  # scope for faster 'import ultralytics'
 
     pd.options.display.max_columns = 10
@@ -91,9 +96,17 @@ def benchmark(
 
     y = []
     t0 = time.time()
+
+    format_arg = format.lower()
+    if format_arg:
+        formats = frozenset(export_formats()["Argument"])
+        assert format in formats, f"Expected format to be one of {formats}, but got '{format_arg}'."
     for i, (name, format, suffix, cpu, gpu, _) in enumerate(zip(*export_formats().values())):
         emoji, filename = "❌", None  # export defaults
         try:
+            if format_arg and format_arg != format:
+                continue
+
             # Checks
             if i == 7:  # TF GraphDef
                 assert model.task != "obb", "TensorFlow GraphDef not supported for OBB task"
@@ -148,14 +161,14 @@ def benchmark(
             assert i != 5 or platform.system() == "Darwin", "inference only supported on macOS>=10.13"  # CoreML
             if i in {13}:
                 assert not is_end2end, "End-to-end torch.topk operation is not supported for NCNN prediction yet"
-            exported_model.predict(ASSETS / "bus.jpg", imgsz=imgsz, device=device, half=half)
+            exported_model.predict(ASSETS / "bus.jpg", imgsz=imgsz, device=device, half=half, verbose=False)
 
             # Validate
             data = data or TASK2DATA[model.task]  # task to dataset, i.e. coco8.yaml for task=detect
-            key = TASK2METRIC[model.task]  # task to metric, i.e. metrics/mAP50-95(B) for task=detect
             results = exported_model.val(
                 data=data, batch=1, imgsz=imgsz, plots=False, device=device, half=half, int8=int8, verbose=False
             )
+            key = TASK2METRIC[model.task]  # task to metric, i.e. metrics/mAP50-95(B) for task=detect
             metric, speed = results.results_dict[key], results.speed["inference"]
             fps = round(1000 / (speed + eps), 2)  # frames per second
             y.append([name, "✅", round(file_size(filename), 1), round(metric, 4), round(speed, 2), fps])
@@ -170,7 +183,9 @@ def benchmark(
     df = pd.DataFrame(y, columns=["Format", "Status❔", "Size (MB)", key, "Inference time (ms/im)", "FPS"])
 
     name = model.model_name
-    s = f"\nBenchmarks complete for {name} on {data} at imgsz={imgsz} ({time.time() - t0:.2f}s)\n{df}\n"
+    dt = time.time() - t0
+    legend = "Benchmarks legend:  - ✅ Success  - ❎ Export passed but validation failed  - ❌️ Export failed"
+    s = f"\nBenchmarks complete for {name} on {data} at imgsz={imgsz} ({dt:.2f}s)\n{legend}\n{df.fillna('-')}\n"
     LOGGER.info(s)
     with open("benchmarks.log", "a", errors="ignore", encoding="utf-8") as f:
         f.write(s)

{ultralytics-8.3.68 → ultralytics-8.3.70}/ultralytics/utils/checks.py

@@ -433,8 +433,8 @@ def check_torchvision():
     The compatibility table is a dictionary where the keys are PyTorch versions and the values are lists of compatible
     Torchvision versions.
     """
-    # Compatibility table
     compatibility_table = {
+        "2.6": ["0.21"],
         "2.5": ["0.20"],
         "2.4": ["0.19"],
         "2.3": ["0.18"],
@@ -445,7 +445,7 @@ def check_torchvision():
         "1.12": ["0.13"],
     }
 
-    # Extract only the major and minor versions
+    # Check major and minor versions
     v_torch = ".".join(torch.__version__.split("+")[0].split(".")[:2])
     if v_torch in compatibility_table:
         compatible_versions = compatibility_table[v_torch]

{ultralytics-8.3.68 → ultralytics-8.3.70}/ultralytics/utils/torch_utils.py

@@ -667,7 +667,7 @@ def profile(input, ops, n=10, device=None, max_num_obj=0):
             m = m.half() if hasattr(m, "half") and isinstance(x, torch.Tensor) and x.dtype is torch.float16 else m
             tf, tb, t = 0, 0, [0, 0, 0]  # dt forward, backward
             try:
-                flops = thop.profile(m, inputs=[x], verbose=False)[0] / 1e9 * 2  # GFLOPs
+                flops = thop.profile(deepcopy(m), inputs=[x], verbose=False)[0] / 1e9 * 2  # GFLOPs
             except Exception:
                 flops = 0
 

{ultralytics-8.3.68 → ultralytics-8.3.70/ultralytics.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ultralytics
-Version: 8.3.68
+Version: 8.3.70
 Summary: Ultralytics YOLO 🚀 for SOTA object detection, multi-object tracking, instance segmentation, pose estimation and image classification.
 Author-email: Glenn Jocher <glenn.jocher@ultralytics.com>, Jing Qiu <jing.qiu@ultralytics.com>
 Maintainer-email: Ultralytics <hello@ultralytics.com>
@@ -32,8 +32,7 @@ Classifier: Operating System :: Microsoft :: Windows
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: numpy>=1.23.0
-Requires-Dist: numpy<2.0.0; sys_platform == "darwin"
+Requires-Dist: numpy<=2.1.1,>=1.23.0
 Requires-Dist: matplotlib>=3.3.0
 Requires-Dist: opencv-python>=4.6.0
 Requires-Dist: pillow>=7.1.2
@@ -58,7 +57,7 @@ Requires-Dist: mkdocs>=1.6.0; extra == "dev"
 Requires-Dist: mkdocs-material>=9.5.9; extra == "dev"
 Requires-Dist: mkdocstrings[python]; extra == "dev"
 Requires-Dist: mkdocs-redirects; extra == "dev"
-Requires-Dist: mkdocs-ultralytics-plugin>=0.1.8; extra == "dev"
+Requires-Dist: mkdocs-ultralytics-plugin>=0.1.16; extra == "dev"
 Requires-Dist: mkdocs-macros-plugin>=1.0.5; extra == "dev"
 Provides-Extra: export
 Requires-Dist: onnx>=1.12.0; extra == "export"

{ultralytics-8.3.68 → ultralytics-8.3.70}/ultralytics.egg-info/requires.txt

@@ -1,4 +1,4 @@
-numpy>=1.23.0
+numpy<=2.1.1,>=1.23.0
 matplotlib>=3.3.0
 opencv-python>=4.6.0
 pillow>=7.1.2
@@ -14,9 +14,6 @@ pandas>=1.1.4
 seaborn>=0.11.0
 ultralytics-thop>=2.0.0
 
-[:sys_platform == "darwin"]
-numpy<2.0.0
-
 [:sys_platform == "win32"]
 torch!=2.4.0,>=1.8.0
 
@@ -29,7 +26,7 @@ mkdocs>=1.6.0
 mkdocs-material>=9.5.9
 mkdocstrings[python]
 mkdocs-redirects
-mkdocs-ultralytics-plugin>=0.1.8
+mkdocs-ultralytics-plugin>=0.1.16
 mkdocs-macros-plugin>=1.0.5
 
 [export]