ultralytics 8.2.33__tar.gz → 8.2.35__tar.gz

{ultralytics-8.2.33 → ultralytics-8.2.35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ultralytics
-Version: 8.2.33
+Version: 8.2.35
 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
@@ -44,7 +44,7 @@ Requires-Dist: psutil
 Requires-Dist: py-cpuinfo
 Requires-Dist: pandas>=1.1.4
 Requires-Dist: seaborn>=0.11.0
-Requires-Dist: ultralytics-thop>=0.2.5
+Requires-Dist: ultralytics-thop>=2.0.0
 Provides-Extra: dev
 Requires-Dist: ipython; extra == "dev"
 Requires-Dist: check-manifest; extra == "dev"
@@ -57,7 +57,7 @@ Requires-Dist: mkdocs-material>=9.5.9; extra == "dev"
 Requires-Dist: mkdocstrings[python]; extra == "dev"
 Requires-Dist: mkdocs-jupyter; extra == "dev"
 Requires-Dist: mkdocs-redirects; extra == "dev"
-Requires-Dist: mkdocs-ultralytics-plugin>=0.0.45; extra == "dev"
+Requires-Dist: mkdocs-ultralytics-plugin>=0.0.48; extra == "dev"
 Provides-Extra: export
 Requires-Dist: onnx>=1.12.0; extra == "export"
 Requires-Dist: coremltools>=7.0; (platform_system != "Windows" and python_version <= "3.11") and extra == "export"

{ultralytics-8.2.33 → ultralytics-8.2.35}/pyproject.toml

@@ -78,7 +78,7 @@ dependencies = [
     "py-cpuinfo", # display CPU info
     "pandas>=1.1.4",
     "seaborn>=0.11.0", # plotting
-    "ultralytics-thop>=0.2.5", # FLOPs computation https://github.com/ultralytics/thop
+    "ultralytics-thop>=2.0.0", # FLOPs computation https://github.com/ultralytics/thop
 ]
 
 # Optional dependencies ------------------------------------------------------------------------------------------------
@@ -95,7 +95,7 @@ dev = [
     "mkdocstrings[python]",
     "mkdocs-jupyter", # for notebooks
     "mkdocs-redirects", # for 301 redirects
-    "mkdocs-ultralytics-plugin>=0.0.45", # for meta descriptions and images, dates and authors
+    "mkdocs-ultralytics-plugin>=0.0.48", # for meta descriptions and images, dates and authors
 ]
 export = [
     "onnx>=1.12.0", # ONNX export

{ultralytics-8.2.33 → ultralytics-8.2.35}/tests/test_cuda.py

@@ -19,6 +19,7 @@ def test_checks():
 
 
 @pytest.mark.slow
+@pytest.mark.skipif(True, reason="CUDA export tests disabled pending additional Ultralytics GPU server availability")
 @pytest.mark.skipif(not CUDA_IS_AVAILABLE, reason="CUDA is not available")
 @pytest.mark.parametrize(
     "task, dynamic, int8, half, batch",

{ultralytics-8.2.33 → ultralytics-8.2.35}/ultralytics/__init__.py

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

{ultralytics-8.2.33 → ultralytics-8.2.35}/ultralytics/cfg/datasets/lvis.yaml

@@ -221,8 +221,7 @@ names:
   204: cape
   205: cappuccino/coffee cappuccino
   206: car/car automobile/auto/auto automobile/automobile
-  207: railcar/railcar part of a train/railway car/railway car part of a train/railroad
-    car/railroad car part of a train
+  207: railcar/railcar part of a train/railway car/railway car part of a train/railroad car/railroad car part of a train
   208: elevator car
   209: car battery/automobile battery
   210: identity card
@@ -241,8 +240,7 @@ names:
   223: cast/plaster cast/plaster bandage
   224: cat
   225: cauliflower
-  226: cayenne/cayenne spice/cayenne pepper/cayenne pepper spice/red pepper/red pepper
-    spice
+  226: cayenne/cayenne spice/cayenne pepper/cayenne pepper spice/red pepper/red pepper spice
   227: CD player
   228: celery
   229: cellular telephone/cellular phone/cellphone/mobile phone/smart phone
@@ -258,8 +256,7 @@ names:
   239: chessboard
   240: chicken/chicken animal
   241: chickpea/garbanzo
-  242: chili/chili vegetable/chili pepper/chili pepper vegetable/chilli/chilli vegetable/chilly/chilly
-    vegetable/chile/chile vegetable
+  242: chili/chili vegetable/chili pepper/chili pepper vegetable/chilli/chilli vegetable/chilly/chilly vegetable/chile/chile vegetable
   243: chime/gong
   244: chinaware
   245: crisp/crisp potato chip/potato chip
@@ -1061,8 +1058,7 @@ names:
   1041: sweater
   1042: sweatshirt
   1043: sweet potato
-  1044: swimsuit/swimwear/bathing suit/swimming costume/bathing costume/swimming trunks/bathing
-    trunks
+  1044: swimsuit/swimwear/bathing suit/swimming costume/bathing costume/swimming trunks/bathing trunks
   1045: sword
   1046: syringe
   1047: Tabasco sauce

{ultralytics-8.2.33 → ultralytics-8.2.35}/ultralytics/cfg/models/v9/yolov9e-seg.yaml

@@ -7,7 +7,7 @@ nc: 80 # number of classes
 
 # gelan backbone
 backbone:
-  - [-1, 1, Silence, []]
+  - [-1, 1, nn.Identity, []]
   - [-1, 1, Conv, [64, 3, 2]] # 1-P1/2
   - [-1, 1, Conv, [128, 3, 2]] # 2-P2/4
   - [-1, 1, RepNCSPELAN4, [256, 128, 64, 2]] # 3

{ultralytics-8.2.33 → ultralytics-8.2.35}/ultralytics/cfg/models/v9/yolov9e.yaml

@@ -7,7 +7,7 @@ nc: 80 # number of classes
 
 # gelan backbone
 backbone:
-  - [-1, 1, Silence, []]
+  - [-1, 1, nn.Identity, []]
   - [-1, 1, Conv, [64, 3, 2]] # 1-P1/2
   - [-1, 1, Conv, [128, 3, 2]] # 2-P2/4
   - [-1, 1, RepNCSPELAN4, [256, 128, 64, 2]] # 3

ultralytics-8.2.35/ultralytics/cfg/models/v9/yolov9m.yaml

@@ -0,0 +1,38 @@
+# Ultralytics YOLO 🚀, AGPL-3.0 license
+# YOLOv9t
+# 603 layers, 20216160 parameters, 77.9 GFLOPs
+
+# parameters
+nc: 80 # number of classes
+
+# gelan backbone
+backbone:
+  - [-1, 1, Conv, [32, 3, 2]] # 0-P1/2
+  - [-1, 1, Conv, [64, 3, 2]] # 1-P2/4
+  - [-1, 1, RepNCSPELAN4, [128, 128, 64, 1]] # 2
+  - [-1, 1, AConv, [240]] # 3-P3/8
+  - [-1, 1, RepNCSPELAN4, [240, 240, 120, 1]] # 4
+  - [-1, 1, AConv, [360]] # 5-P4/16
+  - [-1, 1, RepNCSPELAN4, [360, 360, 180, 1]] # 6
+  - [-1, 1, AConv, [480]] # 7-P5/32
+  - [-1, 1, RepNCSPELAN4, [480, 480, 240, 1]] # 8
+  - [-1, 1, SPPELAN, [480, 240]] # 9
+
+head:
+  - [-1, 1, nn.Upsample, [None, 2, "nearest"]]
+  - [[-1, 6], 1, Concat, [1]] # cat backbone P4
+  - [-1, 1, RepNCSPELAN4, [360, 360, 180, 1]] # 12
+
+  - [-1, 1, nn.Upsample, [None, 2, "nearest"]]
+  - [[-1, 4], 1, Concat, [1]] # cat backbone P3
+  - [-1, 1, RepNCSPELAN4, [240, 240, 120, 1]] # 15
+
+  - [-1, 1, AConv, [180]]
+  - [[-1, 12], 1, Concat, [1]] # cat head P4
+  - [-1, 1, RepNCSPELAN4, [360, 360, 180, 1]] # 18 (P4/16-medium)
+
+  - [-1, 1, AConv, [240]]
+  - [[-1, 9], 1, Concat, [1]] # cat head P5
+  - [-1, 1, RepNCSPELAN4, [480, 480, 240, 1]] # 21 (P5/32-large)
+
+  - [[15, 18, 21], 1, Detect, [nc]] # Detect(P3, P4, P5)

ultralytics-8.2.35/ultralytics/cfg/models/v9/yolov9s.yaml

@@ -0,0 +1,38 @@
+# Ultralytics YOLO 🚀, AGPL-3.0 license
+# YOLOv9s
+# 917 layers, 7318368 parameters, 27.6 GFLOPs
+
+# parameters
+nc: 80 # number of classes
+
+# gelan backbone
+backbone:
+  - [-1, 1, Conv, [32, 3, 2]] # 0-P1/2
+  - [-1, 1, Conv, [64, 3, 2]] # 1-P2/4
+  - [-1, 1, ELAN1, [64, 64, 32]] # 2
+  - [-1, 1, AConv, [128]] # 3-P3/8
+  - [-1, 1, RepNCSPELAN4, [128, 128, 64, 3]] # 4
+  - [-1, 1, AConv, [192]] # 5-P4/16
+  - [-1, 1, RepNCSPELAN4, [192, 192, 96, 3]] # 6
+  - [-1, 1, AConv, [256]] # 7-P5/32
+  - [-1, 1, RepNCSPELAN4, [256, 256, 128, 3]] # 8
+  - [-1, 1, SPPELAN, [256, 128]] # 9
+
+head:
+  - [-1, 1, nn.Upsample, [None, 2, "nearest"]]
+  - [[-1, 6], 1, Concat, [1]] # cat backbone P4
+  - [-1, 1, RepNCSPELAN4, [192, 192, 96, 3]] # 12
+
+  - [-1, 1, nn.Upsample, [None, 2, "nearest"]]
+  - [[-1, 4], 1, Concat, [1]] # cat backbone P3
+  - [-1, 1, RepNCSPELAN4, [128, 128, 64, 3]] # 15
+
+  - [-1, 1, AConv, [96]]
+  - [[-1, 12], 1, Concat, [1]] # cat head P4
+  - [-1, 1, RepNCSPELAN4, [192, 192, 96, 3]] # 18 (P4/16-medium)
+
+  - [-1, 1, AConv, [128]]
+  - [[-1, 9], 1, Concat, [1]] # cat head P5
+  - [-1, 1, RepNCSPELAN4, [256, 256, 128, 3]] # 21 (P5/32-large)
+
+  - [[15, 18, 21], 1, Detect, [nc]] # Detect(P3, P4 P5)

ultralytics-8.2.35/ultralytics/cfg/models/v9/yolov9t.yaml

@@ -0,0 +1,38 @@
+# Ultralytics YOLO 🚀, AGPL-3.0 license
+# YOLOv9t
+# 917 layers, 2128720 parameters, 8.5 GFLOPs
+
+# parameters
+nc: 80 # number of classes
+
+# gelan backbone
+backbone:
+  - [-1, 1, Conv, [16, 3, 2]] # 0-P1/2
+  - [-1, 1, Conv, [32, 3, 2]] # 1-P2/4
+  - [-1, 1, ELAN1, [32, 32, 16]] # 2
+  - [-1, 1, AConv, [64]] # 3-P3/8
+  - [-1, 1, RepNCSPELAN4, [64, 64, 32, 3]] # 4
+  - [-1, 1, AConv, [96]] # 5-P4/16
+  - [-1, 1, RepNCSPELAN4, [96, 96, 48, 3]] # 6
+  - [-1, 1, AConv, [128]] # 7-P5/32
+  - [-1, 1, RepNCSPELAN4, [128, 128, 64, 3]] # 8
+  - [-1, 1, SPPELAN, [128, 64]] # 9
+
+head:
+  - [-1, 1, nn.Upsample, [None, 2, "nearest"]]
+  - [[-1, 6], 1, Concat, [1]] # cat backbone P4
+  - [-1, 1, RepNCSPELAN4, [96, 96, 48, 3]] # 12
+
+  - [-1, 1, nn.Upsample, [None, 2, "nearest"]]
+  - [[-1, 4], 1, Concat, [1]] # cat backbone P3
+  - [-1, 1, RepNCSPELAN4, [64, 64, 32, 3]] # 15
+
+  - [-1, 1, AConv, [48]]
+  - [[-1, 12], 1, Concat, [1]] # cat head P4
+  - [-1, 1, RepNCSPELAN4, [96, 96, 48, 3]] # 18 (P4/16-medium)
+
+  - [-1, 1, AConv, [64]]
+  - [[-1, 9], 1, Concat, [1]] # cat head P5
+  - [-1, 1, RepNCSPELAN4, [128, 128, 64, 3]] # 21 (P5/32-large)
+
+  - [[15, 18, 21], 1, Detect, [nc]] # Detect(P3, P4, P5)

{ultralytics-8.2.33 → ultralytics-8.2.35}/ultralytics/data/explorer/gui/dash.py

@@ -259,7 +259,7 @@ def layout():
 
     with col2:
         similarity_form(selected_imgs)
-        display_labels = st.checkbox("Labels", value=False, key="display_labels")
+        st.checkbox("Labels", value=False, key="display_labels")
         utralytics_explorer_docs_callback()
 
 

{ultralytics-8.2.33 → ultralytics-8.2.35}/ultralytics/nn/modules/__init__.py

@@ -23,9 +23,11 @@ from .block import (
     C3,
     C3TR,
     DFL,
+    ELAN1,
     SPP,
     SPPELAN,
     SPPF,
+    AConv,
     ADown,
     BNContrastiveHead,
     Bottleneck,
@@ -45,7 +47,6 @@ from .block import (
     RepC3,
     RepNCSPELAN4,
     ResNetLayer,
-    Silence,
 )
 from .conv import (
     CBAM,
@@ -134,5 +135,6 @@ __all__ = (
     "SPPELAN",
     "CBFuse",
     "CBLinear",
-    "Silence",
+    "AConv",
+    "ELAN1",
 )

{ultralytics-8.2.33 → ultralytics-8.2.35}/ultralytics/nn/modules/block.py

@@ -32,7 +32,9 @@ __all__ = (
     "RepC3",
     "ResNetLayer",
     "RepNCSPELAN4",
+    "ELAN1",
     "ADown",
+    "AConv",
     "SPPELAN",
     "CBFuse",
     "CBLinear",
@@ -603,6 +605,33 @@ class RepNCSPELAN4(nn.Module):
         return self.cv4(torch.cat(y, 1))
 
 
+class ELAN1(RepNCSPELAN4):
+    """ELAN1 module with 4 convolutions."""
+
+    def __init__(self, c1, c2, c3, c4):
+        """Initializes ELAN1 layer with specified channel sizes."""
+        super().__init__(c1, c2, c3, c4)
+        self.c = c3 // 2
+        self.cv1 = Conv(c1, c3, 1, 1)
+        self.cv2 = Conv(c3 // 2, c4, 3, 1)
+        self.cv3 = Conv(c4, c4, 3, 1)
+        self.cv4 = Conv(c3 + (2 * c4), c2, 1, 1)
+
+
+class AConv(nn.Module):
+    """AConv."""
+
+    def __init__(self, c1, c2):
+        """Initializes AConv module with convolution layers."""
+        super().__init__()
+        self.cv1 = Conv(c1, c2, 3, 2, 1)
+
+    def forward(self, x):
+        """Forward pass through AConv layer."""
+        x = torch.nn.functional.avg_pool2d(x, 2, 1, 0, False, True)
+        return self.cv1(x)
+
+
 class ADown(nn.Module):
     """ADown."""
 

{ultralytics-8.2.33 → ultralytics-8.2.35}/ultralytics/nn/tasks.py

@@ -13,10 +13,12 @@ from ultralytics.nn.modules import (
     C2,
     C3,
     C3TR,
+    ELAN1,
     OBB,
     SPP,
     SPPELAN,
     SPPF,
+    AConv,
     ADown,
     Bottleneck,
     BottleneckCSP,
@@ -292,8 +294,12 @@ class DetectionModel(BaseModel):
         if isinstance(m, Detect):  # includes all Detect subclasses like Segment, Pose, OBB, WorldDetect
             s = 256  # 2x min stride
             m.inplace = self.inplace
-            forward = lambda x: self.forward(x)[0] if isinstance(m, (Segment, Pose, OBB)) else self.forward(x)
-            m.stride = torch.tensor([s / x.shape[-2] for x in forward(torch.zeros(1, ch, s, s))])  # forward
+
+            def _forward(x):
+                """Performs a forward pass through the model, handling different Detect subclass types accordingly."""
+                return self.forward(x)[0] if isinstance(m, (Segment, Pose, OBB)) else self.forward(x)
+
+            m.stride = torch.tensor([s / x.shape[-2] for x in _forward(torch.zeros(1, ch, s, s))])  # forward
             self.stride = m.stride
             m.bias_init()  # only run once
         else:
@@ -874,7 +880,9 @@ def parse_model(d, ch, verbose=True):  # model_dict, input_channels(3)
             C2,
             C2f,
             RepNCSPELAN4,
+            ELAN1,
             ADown,
+            AConv,
             SPPELAN,
             C2fAttn,
             C3,

{ultralytics-8.2.33 → ultralytics-8.2.35}/ultralytics/utils/callbacks/mlflow.py

@@ -34,11 +34,13 @@ try:
     from pathlib import Path
 
     PREFIX = colorstr("MLflow: ")
-    SANITIZE = lambda x: {k.replace("(", "").replace(")", ""): float(v) for k, v in x.items()}
 
 except (ImportError, AssertionError):
     mlflow = None
 
+def sanitize_dict(x):
+    """Sanitize dictionary keys by removing parentheses and converting values to floats."""
+    return {k.replace("(", "").replace(")", ""): float(v) for k, v in x.items()}
 
 def on_pretrain_routine_end(trainer):
     """
@@ -88,8 +90,8 @@ def on_train_epoch_end(trainer):
     if mlflow:
         mlflow.log_metrics(
             metrics={
-                **SANITIZE(trainer.lr),
-                **SANITIZE(trainer.label_loss_items(trainer.tloss, prefix="train")),
+                **sanitize_dict(trainer.lr),
+                **sanitize_dict(trainer.label_loss_items(trainer.tloss, prefix="train")),
             },
             step=trainer.epoch,
         )
@@ -98,7 +100,7 @@ def on_train_epoch_end(trainer):
 def on_fit_epoch_end(trainer):
     """Log training metrics at the end of each fit epoch to MLflow."""
     if mlflow:
-        mlflow.log_metrics(metrics=SANITIZE(trainer.metrics), step=trainer.epoch)
+        mlflow.log_metrics(metrics=sanitize_dict(trainer.metrics), step=trainer.epoch)
 
 
 def on_train_end(trainer):

{ultralytics-8.2.33 → ultralytics-8.2.35}/ultralytics.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ultralytics
-Version: 8.2.33
+Version: 8.2.35
 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
@@ -44,7 +44,7 @@ Requires-Dist: psutil
 Requires-Dist: py-cpuinfo
 Requires-Dist: pandas>=1.1.4
 Requires-Dist: seaborn>=0.11.0
-Requires-Dist: ultralytics-thop>=0.2.5
+Requires-Dist: ultralytics-thop>=2.0.0
 Provides-Extra: dev
 Requires-Dist: ipython; extra == "dev"
 Requires-Dist: check-manifest; extra == "dev"
@@ -57,7 +57,7 @@ Requires-Dist: mkdocs-material>=9.5.9; extra == "dev"
 Requires-Dist: mkdocstrings[python]; extra == "dev"
 Requires-Dist: mkdocs-jupyter; extra == "dev"
 Requires-Dist: mkdocs-redirects; extra == "dev"
-Requires-Dist: mkdocs-ultralytics-plugin>=0.0.45; extra == "dev"
+Requires-Dist: mkdocs-ultralytics-plugin>=0.0.48; extra == "dev"
 Provides-Extra: export
 Requires-Dist: onnx>=1.12.0; extra == "export"
 Requires-Dist: coremltools>=7.0; (platform_system != "Windows" and python_version <= "3.11") and extra == "export"

{ultralytics-8.2.33 → ultralytics-8.2.35}/ultralytics.egg-info/SOURCES.txt

@@ -86,6 +86,9 @@ ultralytics/cfg/models/v9/yolov9c-seg.yaml
 ultralytics/cfg/models/v9/yolov9c.yaml
 ultralytics/cfg/models/v9/yolov9e-seg.yaml
 ultralytics/cfg/models/v9/yolov9e.yaml
+ultralytics/cfg/models/v9/yolov9m.yaml
+ultralytics/cfg/models/v9/yolov9s.yaml
+ultralytics/cfg/models/v9/yolov9t.yaml
 ultralytics/cfg/trackers/botsort.yaml
 ultralytics/cfg/trackers/bytetrack.yaml
 ultralytics/data/__init__.py

{ultralytics-8.2.33 → ultralytics-8.2.35}/ultralytics.egg-info/requires.txt

@@ -12,7 +12,7 @@ psutil
 py-cpuinfo
 pandas>=1.1.4
 seaborn>=0.11.0
-ultralytics-thop>=0.2.5
+ultralytics-thop>=2.0.0
 
 [dev]
 ipython
@@ -26,7 +26,7 @@ mkdocs-material>=9.5.9
 mkdocstrings[python]
 mkdocs-jupyter
 mkdocs-redirects
-mkdocs-ultralytics-plugin>=0.0.45
+mkdocs-ultralytics-plugin>=0.0.48
 
 [explorer]
 lancedb