ultralytics 8.3.69__tar.gz → 8.3.70__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ultralytics
-Version: 8.3.69
+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.69 → 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.69 → ultralytics-8.3.70}/ultralytics/__init__.py

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

{ultralytics-8.3.69 → 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.69 → 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.69 → ultralytics-8.3.70}/ultralytics/utils/benchmarks.py

@@ -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,
@@ -94,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"
@@ -155,10 +165,10 @@ def benchmark(
 
             # 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])

{ultralytics-8.3.69 → 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.69 → ultralytics-8.3.70/ultralytics.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ultralytics
-Version: 8.3.69
+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.69 → 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]