dgenerate-ultralytics-headless 8.3.184__tar.gz → 8.3.186__tar.gz

{dgenerate_ultralytics_headless-8.3.184 → dgenerate_ultralytics_headless-8.3.186}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dgenerate-ultralytics-headless
-Version: 8.3.184
+Version: 8.3.186
 Summary: Automatically built Ultralytics package with python-opencv-headless dependency instead of python-opencv
 Author-email: Glenn Jocher <glenn.jocher@ultralytics.com>, Jing Qiu <jing.qiu@ultralytics.com>
 Maintainer-email: Ultralytics <hello@ultralytics.com>
@@ -42,7 +42,6 @@ Requires-Dist: scipy>=1.4.1
 Requires-Dist: torch>=1.8.0
 Requires-Dist: torch!=2.4.0,>=1.8.0; sys_platform == "win32"
 Requires-Dist: torchvision>=0.9.0
-Requires-Dist: tqdm>=4.64.0
 Requires-Dist: psutil
 Requires-Dist: py-cpuinfo
 Requires-Dist: pandas>=1.1.4
@@ -55,7 +54,7 @@ Requires-Dist: coverage[toml]; extra == "dev"
 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-ultralytics-plugin>=0.1.26; extra == "dev"
+Requires-Dist: mkdocs-ultralytics-plugin>=0.1.28; extra == "dev"
 Requires-Dist: mkdocs-macros-plugin>=1.0.5; extra == "dev"
 Provides-Extra: export
 Requires-Dist: numpy<2.0.0; extra == "export"
@@ -131,7 +130,7 @@ The workflow runs automatically every day at midnight UTC to check for new Ultra
 
 <div>
     <a href="https://github.com/ultralytics/ultralytics/actions/workflows/ci.yml"><img src="https://github.com/ultralytics/ultralytics/actions/workflows/ci.yml/badge.svg" alt="Ultralytics CI"></a>
-    <a href="https://pepy.tech/projects/ultralytics"><img src="https://static.pepy.tech/badge/ultralytics" alt="Ultralytics Downloads"></a>
+    <a href="https://clickpy.clickhouse.com/dashboard/ultralytics"><img src="https://static.pepy.tech/badge/ultralytics" alt="Ultralytics Downloads"></a>
     <a href="https://zenodo.org/badge/latestdoi/264818686"><img src="https://zenodo.org/badge/264818686.svg" alt="Ultralytics YOLO Citation"></a>
     <a href="https://discord.com/invite/ultralytics"><img alt="Ultralytics Discord" src="https://img.shields.io/discord/1089800235347353640?logo=discord&logoColor=white&label=Discord&color=blue"></a>
     <a href="https://community.ultralytics.com/"><img alt="Ultralytics Forums" src="https://img.shields.io/discourse/users?server=https%3A%2F%2Fcommunity.ultralytics.com&logo=discourse&label=Forums&color=blue"></a>
@@ -180,7 +179,7 @@ See below for quickstart installation and usage examples. For comprehensive guid
 
 Install the `ultralytics` package, including all [requirements](https://github.com/ultralytics/ultralytics/blob/main/pyproject.toml), in a [**Python>=3.8**](https://www.python.org/) environment with [**PyTorch>=1.8**](https://pytorch.org/get-started/locally/).
 
-[![PyPI - Version](https://img.shields.io/pypi/v/ultralytics?logo=pypi&logoColor=white)](https://pypi.org/project/ultralytics/) [![Ultralytics Downloads](https://static.pepy.tech/badge/ultralytics)](https://www.pepy.tech/projects/ultralytics) [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/ultralytics?logo=python&logoColor=gold)](https://pypi.org/project/ultralytics/)
+[![PyPI - Version](https://img.shields.io/pypi/v/ultralytics?logo=pypi&logoColor=white)](https://pypi.org/project/ultralytics/) [![Ultralytics Downloads](https://static.pepy.tech/badge/ultralytics)](https://clickpy.clickhouse.com/dashboard/ultralytics) [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/ultralytics?logo=python&logoColor=gold)](https://pypi.org/project/ultralytics/)
 
 ```bash
 pip install ultralytics

{dgenerate_ultralytics_headless-8.3.184 → dgenerate_ultralytics_headless-8.3.186}/README.md

@@ -39,7 +39,7 @@ The workflow runs automatically every day at midnight UTC to check for new Ultra
 
 <div>
     <a href="https://github.com/ultralytics/ultralytics/actions/workflows/ci.yml"><img src="https://github.com/ultralytics/ultralytics/actions/workflows/ci.yml/badge.svg" alt="Ultralytics CI"></a>
-    <a href="https://pepy.tech/projects/ultralytics"><img src="https://static.pepy.tech/badge/ultralytics" alt="Ultralytics Downloads"></a>
+    <a href="https://clickpy.clickhouse.com/dashboard/ultralytics"><img src="https://static.pepy.tech/badge/ultralytics" alt="Ultralytics Downloads"></a>
     <a href="https://zenodo.org/badge/latestdoi/264818686"><img src="https://zenodo.org/badge/264818686.svg" alt="Ultralytics YOLO Citation"></a>
     <a href="https://discord.com/invite/ultralytics"><img alt="Ultralytics Discord" src="https://img.shields.io/discord/1089800235347353640?logo=discord&logoColor=white&label=Discord&color=blue"></a>
     <a href="https://community.ultralytics.com/"><img alt="Ultralytics Forums" src="https://img.shields.io/discourse/users?server=https%3A%2F%2Fcommunity.ultralytics.com&logo=discourse&label=Forums&color=blue"></a>
@@ -88,7 +88,7 @@ See below for quickstart installation and usage examples. For comprehensive guid
 
 Install the `ultralytics` package, including all [requirements](https://github.com/ultralytics/ultralytics/blob/main/pyproject.toml), in a [**Python>=3.8**](https://www.python.org/) environment with [**PyTorch>=1.8**](https://pytorch.org/get-started/locally/).
 
-[![PyPI - Version](https://img.shields.io/pypi/v/ultralytics?logo=pypi&logoColor=white)](https://pypi.org/project/ultralytics/) [![Ultralytics Downloads](https://static.pepy.tech/badge/ultralytics)](https://www.pepy.tech/projects/ultralytics) [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/ultralytics?logo=python&logoColor=gold)](https://pypi.org/project/ultralytics/)
+[![PyPI - Version](https://img.shields.io/pypi/v/ultralytics?logo=pypi&logoColor=white)](https://pypi.org/project/ultralytics/) [![Ultralytics Downloads](https://static.pepy.tech/badge/ultralytics)](https://clickpy.clickhouse.com/dashboard/ultralytics) [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/ultralytics?logo=python&logoColor=gold)](https://pypi.org/project/ultralytics/)
 
 ```bash
 pip install ultralytics

{dgenerate_ultralytics_headless-8.3.184 → dgenerate_ultralytics_headless-8.3.186}/dgenerate_ultralytics_headless.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dgenerate-ultralytics-headless
-Version: 8.3.184
+Version: 8.3.186
 Summary: Automatically built Ultralytics package with python-opencv-headless dependency instead of python-opencv
 Author-email: Glenn Jocher <glenn.jocher@ultralytics.com>, Jing Qiu <jing.qiu@ultralytics.com>
 Maintainer-email: Ultralytics <hello@ultralytics.com>
@@ -42,7 +42,6 @@ Requires-Dist: scipy>=1.4.1
 Requires-Dist: torch>=1.8.0
 Requires-Dist: torch!=2.4.0,>=1.8.0; sys_platform == "win32"
 Requires-Dist: torchvision>=0.9.0
-Requires-Dist: tqdm>=4.64.0
 Requires-Dist: psutil
 Requires-Dist: py-cpuinfo
 Requires-Dist: pandas>=1.1.4
@@ -55,7 +54,7 @@ Requires-Dist: coverage[toml]; extra == "dev"
 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-ultralytics-plugin>=0.1.26; extra == "dev"
+Requires-Dist: mkdocs-ultralytics-plugin>=0.1.28; extra == "dev"
 Requires-Dist: mkdocs-macros-plugin>=1.0.5; extra == "dev"
 Provides-Extra: export
 Requires-Dist: numpy<2.0.0; extra == "export"
@@ -131,7 +130,7 @@ The workflow runs automatically every day at midnight UTC to check for new Ultra
 
 <div>
     <a href="https://github.com/ultralytics/ultralytics/actions/workflows/ci.yml"><img src="https://github.com/ultralytics/ultralytics/actions/workflows/ci.yml/badge.svg" alt="Ultralytics CI"></a>
-    <a href="https://pepy.tech/projects/ultralytics"><img src="https://static.pepy.tech/badge/ultralytics" alt="Ultralytics Downloads"></a>
+    <a href="https://clickpy.clickhouse.com/dashboard/ultralytics"><img src="https://static.pepy.tech/badge/ultralytics" alt="Ultralytics Downloads"></a>
     <a href="https://zenodo.org/badge/latestdoi/264818686"><img src="https://zenodo.org/badge/264818686.svg" alt="Ultralytics YOLO Citation"></a>
     <a href="https://discord.com/invite/ultralytics"><img alt="Ultralytics Discord" src="https://img.shields.io/discord/1089800235347353640?logo=discord&logoColor=white&label=Discord&color=blue"></a>
     <a href="https://community.ultralytics.com/"><img alt="Ultralytics Forums" src="https://img.shields.io/discourse/users?server=https%3A%2F%2Fcommunity.ultralytics.com&logo=discourse&label=Forums&color=blue"></a>
@@ -180,7 +179,7 @@ See below for quickstart installation and usage examples. For comprehensive guid
 
 Install the `ultralytics` package, including all [requirements](https://github.com/ultralytics/ultralytics/blob/main/pyproject.toml), in a [**Python>=3.8**](https://www.python.org/) environment with [**PyTorch>=1.8**](https://pytorch.org/get-started/locally/).
 
-[![PyPI - Version](https://img.shields.io/pypi/v/ultralytics?logo=pypi&logoColor=white)](https://pypi.org/project/ultralytics/) [![Ultralytics Downloads](https://static.pepy.tech/badge/ultralytics)](https://www.pepy.tech/projects/ultralytics) [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/ultralytics?logo=python&logoColor=gold)](https://pypi.org/project/ultralytics/)
+[![PyPI - Version](https://img.shields.io/pypi/v/ultralytics?logo=pypi&logoColor=white)](https://pypi.org/project/ultralytics/) [![Ultralytics Downloads](https://static.pepy.tech/badge/ultralytics)](https://clickpy.clickhouse.com/dashboard/ultralytics) [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/ultralytics?logo=python&logoColor=gold)](https://pypi.org/project/ultralytics/)
 
 ```bash
 pip install ultralytics

{dgenerate_ultralytics_headless-8.3.184 → dgenerate_ultralytics_headless-8.3.186}/dgenerate_ultralytics_headless.egg-info/SOURCES.txt

@@ -270,6 +270,7 @@ ultralytics/utils/patches.py
 ultralytics/utils/plotting.py
 ultralytics/utils/tal.py
 ultralytics/utils/torch_utils.py
+ultralytics/utils/tqdm.py
 ultralytics/utils/triton.py
 ultralytics/utils/tuner.py
 ultralytics/utils/callbacks/__init__.py

{dgenerate_ultralytics_headless-8.3.184 → dgenerate_ultralytics_headless-8.3.186}/dgenerate_ultralytics_headless.egg-info/requires.txt

@@ -7,7 +7,6 @@ requests>=2.23.0
 scipy>=1.4.1
 torch>=1.8.0
 torchvision>=0.9.0
-tqdm>=4.64.0
 psutil
 py-cpuinfo
 pandas>=1.1.4
@@ -24,7 +23,7 @@ coverage[toml]
 mkdocs>=1.6.0
 mkdocs-material>=9.5.9
 mkdocstrings[python]
-mkdocs-ultralytics-plugin>=0.1.26
+mkdocs-ultralytics-plugin>=0.1.28
 mkdocs-macros-plugin>=1.0.5
 
 [export]

{dgenerate_ultralytics_headless-8.3.184 → dgenerate_ultralytics_headless-8.3.186}/pyproject.toml

@@ -71,7 +71,6 @@ dependencies = [
     "torch>=1.8.0",
     "torch>=1.8.0,!=2.4.0; sys_platform == 'win32'", # Windows CPU errors w/ 2.4.0 https://github.com/ultralytics/ultralytics/issues/15049
     "torchvision>=0.9.0",
-    "tqdm>=4.64.0", # progress bars
     "psutil", # system utilization
     "py-cpuinfo", # display CPU info
     "pandas>=1.1.4",
@@ -88,7 +87,7 @@ dev = [
     "mkdocs>=1.6.0",
     "mkdocs-material>=9.5.9",
     "mkdocstrings[python]",
-    "mkdocs-ultralytics-plugin>=0.1.26", # for meta descriptions and images, dates and authors
+    "mkdocs-ultralytics-plugin>=0.1.28", # for meta descriptions and images, dates and authors
     "mkdocs-macros-plugin>=1.0.5", # duplicating content (i.e. export tables) in multiple places
 ]
 export = [

{dgenerate_ultralytics_headless-8.3.184 → dgenerate_ultralytics_headless-8.3.186}/ultralytics/__init__.py

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

{dgenerate_ultralytics_headless-8.3.184 → dgenerate_ultralytics_headless-8.3.186}/ultralytics/cfg/datasets/Argoverse.yaml

@@ -30,14 +30,14 @@ download: |
   import json
   from pathlib import Path
 
-  from tqdm import tqdm
+  from ultralytics.utils import TQDM
   from ultralytics.utils.downloads import download
 
   def argoverse2yolo(set):
       """Convert Argoverse dataset annotations to YOLO format for object detection tasks."""
       labels = {}
       a = json.load(open(set, "rb"))
-      for annot in tqdm(a["annotations"], desc=f"Converting {set} to YOLOv5 format..."):
+      for annot in TQDM(a["annotations"], desc=f"Converting {set} to YOLOv5 format..."):
           img_id = annot["image_id"]
           img_name = a["images"][img_id]["name"]
           img_label_name = f"{img_name[:-3]}txt"

{dgenerate_ultralytics_headless-8.3.184 → dgenerate_ultralytics_headless-8.3.186}/ultralytics/cfg/datasets/Objects365.yaml

@@ -387,8 +387,8 @@ download: |
   from pathlib import Path
 
   import numpy as np
-  from tqdm import tqdm
 
+  from ultralytics.utils import TQDM
   from ultralytics.utils.checks import check_requirements
   from ultralytics.utils.downloads import download
   from ultralytics.utils.ops import xyxy2xywhn
@@ -419,7 +419,7 @@ download: |
           download([f"{url}images/v2/patch{i}.tar.gz" for i in range(16, patches)], dir=images, curl=True, threads=8)
 
       # Move
-      for f in tqdm(images.rglob("*.jpg"), desc=f"Moving {split} images"):
+      for f in TQDM(images.rglob("*.jpg"), desc=f"Moving {split} images"):
           f.rename(images / f.name)  # move to /images/{split}
 
       # Labels
@@ -428,7 +428,7 @@ download: |
       for cid, cat in enumerate(names):
           catIds = coco.getCatIds(catNms=[cat])
           imgIds = coco.getImgIds(catIds=catIds)
-          for im in tqdm(coco.loadImgs(imgIds), desc=f"Class {cid + 1}/{len(names)} {cat}"):
+          for im in TQDM(coco.loadImgs(imgIds), desc=f"Class {cid + 1}/{len(names)} {cat}"):
               width, height = im["width"], im["height"]
               path = Path(im["file_name"])  # image filename
               try:

{dgenerate_ultralytics_headless-8.3.184 → dgenerate_ultralytics_headless-8.3.186}/ultralytics/cfg/datasets/SKU-110K.yaml

@@ -25,8 +25,8 @@ download: |
 
   import numpy as np
   import pandas as pd
-  from tqdm import tqdm
 
+  from ultralytics.utils import TQDM
   from ultralytics.utils.downloads import download
   from ultralytics.utils.ops import xyxy2xywh
 
@@ -49,7 +49,7 @@ download: |
       images, unique_images = x[:, 0], np.unique(x[:, 0])
       with open((dir / d).with_suffix(".txt").__str__().replace("annotations_", ""), "w", encoding="utf-8") as f:
           f.writelines(f"./images/{s}\n" for s in unique_images)
-      for im in tqdm(unique_images, desc=f"Converting {dir / d}"):
+      for im in TQDM(unique_images, desc=f"Converting {dir / d}"):
           cls = 0  # single-class dataset
           with open((dir / "labels" / im).with_suffix(".txt"), "a", encoding="utf-8") as f:
               for r in x[images == im]:

{dgenerate_ultralytics_headless-8.3.184 → dgenerate_ultralytics_headless-8.3.186}/ultralytics/cfg/datasets/VOC.yaml

@@ -48,10 +48,8 @@ download: |
   import xml.etree.ElementTree as ET
   from pathlib import Path
 
-  from tqdm import tqdm
-
   from ultralytics.utils.downloads import download
-
+  from ultralytics.utils import TQDM
 
   def convert_label(path, lb_path, year, image_id):
       """Converts XML annotations from VOC format to YOLO format by extracting bounding boxes and class IDs."""
@@ -99,7 +97,7 @@ download: |
 
       with open(path / f"VOC{year}/ImageSets/Main/{image_set}.txt") as f:
           image_ids = f.read().strip().split()
-      for id in tqdm(image_ids, desc=f"{image_set}{year}"):
+      for id in TQDM(image_ids, desc=f"{image_set}{year}"):
           f = path / f"VOC{year}/JPEGImages/{id}.jpg"  # old img path
           lb_path = (lbs_path / f.name).with_suffix(".txt")  # new label path
           f.rename(imgs_path / f.name)  # move image

{dgenerate_ultralytics_headless-8.3.184 → dgenerate_ultralytics_headless-8.3.186}/ultralytics/cfg/datasets/VisDrone.yaml

@@ -34,12 +34,12 @@ download: |
   import shutil
 
   from ultralytics.utils.downloads import download
+  from ultralytics.utils import TQDM
 
 
   def visdrone2yolo(dir, split, source_name=None):
       """Convert VisDrone annotations to YOLO format with images/{split} and labels/{split} structure."""
       from PIL import Image
-      from tqdm import tqdm
 
       source_dir = dir / (source_name or f"VisDrone2019-DET-{split}")
       images_dir = dir / "images" / split
@@ -52,7 +52,7 @@ download: |
           for img in source_images_dir.glob("*.jpg"):
               img.rename(images_dir / img.name)
       
-      for f in tqdm((source_dir / "annotations").glob("*.txt"), desc=f"Converting {split}"):
+      for f in TQDM((source_dir / "annotations").glob("*.txt"), desc=f"Converting {split}"):
           img_size = Image.open(images_dir / f.with_suffix(".jpg").name).size
           dw, dh = 1.0 / img_size[0], 1.0 / img_size[1]
           lines = []

{dgenerate_ultralytics_headless-8.3.184 → dgenerate_ultralytics_headless-8.3.186}/ultralytics/cfg/datasets/xView.yaml

@@ -85,8 +85,8 @@ download: |
 
   import numpy as np
   from PIL import Image
-  from tqdm import tqdm
 
+  from ultralytics.utils import TQDM
   from ultralytics.data.utils import autosplit
   from ultralytics.utils.ops import xyxy2xywhn
 
@@ -110,7 +110,7 @@ download: |
                            47, 48, 49, -1, 50, 51, -1, 52, -1, -1, -1, 53, 54, -1, 55, -1, -1, 56, -1, 57, -1, 58, 59]
 
       shapes = {}
-      for feature in tqdm(data["features"], desc=f"Converting {fname}"):
+      for feature in TQDM(data["features"], desc=f"Converting {fname}"):
           p = feature["properties"]
           if p["bounds_imcoords"]:
               id = p["image_id"]

{dgenerate_ultralytics_headless-8.3.184 → dgenerate_ultralytics_headless-8.3.186}/ultralytics/data/build.py

@@ -22,7 +22,7 @@ from ultralytics.data.loaders import (
     SourceTypes,
     autocast_list,
 )
-from ultralytics.data.utils import IMG_FORMATS, PIN_MEMORY, VID_FORMATS
+from ultralytics.data.utils import IMG_FORMATS, VID_FORMATS
 from ultralytics.utils import RANK, colorstr
 from ultralytics.utils.checks import check_file
 
@@ -206,7 +206,7 @@ def build_dataloader(dataset, batch: int, workers: int, shuffle: bool = True, ra
         shuffle=shuffle and sampler is None,
         num_workers=nw,
         sampler=sampler,
-        pin_memory=PIN_MEMORY,
+        pin_memory=nd > 0,
         collate_fn=getattr(dataset, "collate_fn", None),
         worker_init_fn=seed_worker,
         generator=generator,

{dgenerate_ultralytics_headless-8.3.184 → dgenerate_ultralytics_headless-8.3.186}/ultralytics/data/converter.py

@@ -613,7 +613,7 @@ def yolo_bbox2segment(
     from ultralytics.utils.ops import xywh2xyxy
 
     # NOTE: add placeholder to pass class index check
-    dataset = YOLODataset(im_dir, data=dict(names=list(range(1000))))
+    dataset = YOLODataset(im_dir, data=dict(names=list(range(1000)), channels=3))
     if len(dataset.labels[0]["segments"]) > 0:  # if it's segment data
         LOGGER.info("Segmentation labels detected, no need to generate new ones!")
         return

{dgenerate_ultralytics_headless-8.3.184 → dgenerate_ultralytics_headless-8.3.186}/ultralytics/data/dataset.py

@@ -85,7 +85,7 @@ class YOLODataset(BaseDataset):
         self.use_obb = task == "obb"
         self.data = data
         assert not (self.use_segments and self.use_keypoints), "Can not use both segments and keypoints."
-        super().__init__(*args, channels=self.data["channels"], **kwargs)
+        super().__init__(*args, channels=self.data.get("channels", 3), **kwargs)
 
     def cache_labels(self, path: Path = Path("./labels.cache")) -> Dict:
         """

{dgenerate_ultralytics_headless-8.3.184 → dgenerate_ultralytics_headless-8.3.186}/ultralytics/data/utils.py

@@ -19,7 +19,6 @@ from ultralytics.nn.autobackend import check_class_names
 from ultralytics.utils import (
     DATASETS_DIR,
     LOGGER,
-    MACOS,
     NUM_THREADS,
     ROOT,
     SETTINGS_FILE,
@@ -37,7 +36,6 @@ from ultralytics.utils.ops import segments2boxes
 HELP_URL = "See https://docs.ultralytics.com/datasets for dataset formatting guidance."
 IMG_FORMATS = {"bmp", "dng", "jpeg", "jpg", "mpo", "png", "tif", "tiff", "webp", "pfm", "heic"}  # image suffixes
 VID_FORMATS = {"asf", "avi", "gif", "m4v", "mkv", "mov", "mp4", "mpeg", "mpg", "ts", "wmv", "webm"}  # video suffixes
-PIN_MEMORY = str(os.getenv("PIN_MEMORY", not MACOS)).lower() == "true"  # global pin_memory for dataloaders
 FORMATS_HELP_MSG = f"Supported formats are:\nimages: {IMG_FORMATS}\nvideos: {VID_FORMATS}"
 
 

{dgenerate_ultralytics_headless-8.3.184 → dgenerate_ultralytics_headless-8.3.186}/ultralytics/engine/exporter.py

@@ -1479,7 +1479,10 @@ class IOSDetectModel(torch.nn.Module):
         if w == h:
             self.normalize = 1.0 / w  # scalar
         else:
-            self.normalize = torch.tensor([1.0 / w, 1.0 / h, 1.0 / w, 1.0 / h])  # broadcast (slower, smaller)
+            self.normalize = torch.tensor(
+                [1.0 / w, 1.0 / h, 1.0 / w, 1.0 / h],  # broadcast (slower, smaller)
+                device=next(model.parameters()).device,
+            )
 
     def forward(self, x):
         """Normalize predictions of object detection model with input size-dependent factors."""

{dgenerate_ultralytics_headless-8.3.184 → dgenerate_ultralytics_headless-8.3.186}/ultralytics/solutions/region_counter.py

@@ -115,8 +115,9 @@ class RegionCounter(BaseSolution):
 
         # Display region counts
         for region in self.counting_regions:
-            x1, y1, x2, y2 = map(int, region["polygon"].bounds)
-            pts = [(x1, y1), (x2, y1), (x2, y2), (x1, y2)]
+            poly = region["polygon"]
+            pts = list(map(tuple, np.array(poly.exterior.coords, dtype=np.int32)))
+            (x1, y1), (x2, y2) = [(int(poly.centroid.x), int(poly.centroid.y))] * 2
             annotator.draw_region(pts, region["region_color"], self.line_width * 2)
             annotator.adaptive_label(
                 [x1, y1, x2, y2],

{dgenerate_ultralytics_headless-8.3.184 → dgenerate_ultralytics_headless-8.3.186}/ultralytics/utils/__init__.py

@@ -12,7 +12,6 @@ import subprocess
 import sys
 import threading
 import time
-import warnings
 from pathlib import Path
 from threading import Lock
 from types import SimpleNamespace
@@ -22,10 +21,10 @@ from urllib.parse import unquote
 import cv2
 import numpy as np
 import torch
-import tqdm
 
 from ultralytics import __version__
 from ultralytics.utils.patches import imread, imshow, imwrite, torch_save  # for patches
+from ultralytics.utils.tqdm import TQDM  # noqa
 
 # PyTorch Multi-GPU DDP Constants
 RANK = int(os.getenv("RANK", -1))
@@ -41,7 +40,6 @@ DEFAULT_CFG_PATH = ROOT / "cfg/default.yaml"
 NUM_THREADS = min(8, max(1, os.cpu_count() - 1))  # number of YOLO multiprocessing threads
 AUTOINSTALL = str(os.getenv("YOLO_AUTOINSTALL", True)).lower() == "true"  # global auto-install mode
 VERBOSE = str(os.getenv("YOLO_VERBOSE", True)).lower() == "true"  # global verbose mode
-TQDM_BAR_FORMAT = "{l_bar}{bar:10}{r_bar}" if VERBOSE else None  # tqdm bar format
 LOGGING_NAME = "ultralytics"
 MACOS, LINUX, WINDOWS = (platform.system() == x for x in ["Darwin", "Linux", "Windows"])  # environment booleans
 MACOS_VERSION = platform.mac_ver()[0] if MACOS else None
@@ -130,65 +128,6 @@ os.environ["TF_CPP_MIN_LOG_LEVEL"] = "3"  # suppress verbose TF compiler warning
 os.environ["TORCH_CPP_LOG_LEVEL"] = "ERROR"  # suppress "NNPACK.cpp could not initialize NNPACK" warnings
 os.environ["KINETO_LOG_LEVEL"] = "5"  # suppress verbose PyTorch profiler output when computing FLOPs
 
-if TQDM_RICH := str(os.getenv("YOLO_TQDM_RICH", False)).lower() == "true":
-    from tqdm import rich
-
-
-class TQDM(rich.tqdm if TQDM_RICH else tqdm.tqdm):
-    """
-    A custom TQDM progress bar class that extends the original tqdm functionality.
-
-    This class modifies the behavior of the original tqdm progress bar based on global settings and provides
-    additional customization options for Ultralytics projects. The progress bar is automatically disabled when
-    VERBOSE is False or when explicitly disabled.
-
-    Attributes:
-        disable (bool): Whether to disable the progress bar. Determined by the global VERBOSE setting and
-            any passed 'disable' argument.
-        bar_format (str): The format string for the progress bar. Uses the global TQDM_BAR_FORMAT if not
-            explicitly set.
-
-    Methods:
-        __init__: Initialize the TQDM object with custom settings.
-        __iter__: Return self as iterator to satisfy Iterable interface.
-
-    Examples:
-        >>> from ultralytics.utils import TQDM
-        >>> for i in TQDM(range(100)):
-        ...     # Your processing code here
-        ...     pass
-    """
-
-    def __init__(self, *args, **kwargs):
-        """
-        Initialize a custom TQDM progress bar with Ultralytics-specific settings.
-
-        Args:
-            *args (Any): Variable length argument list to be passed to the original tqdm constructor.
-            **kwargs (Any): Arbitrary keyword arguments to be passed to the original tqdm constructor.
-
-        Notes:
-            - The progress bar is disabled if VERBOSE is False or if 'disable' is explicitly set to True in kwargs.
-            - The default bar format is set to TQDM_BAR_FORMAT unless overridden in kwargs.
-            - In GitHub Actions, progress bars only update at completion to keep CI logs clean.
-
-        Examples:
-            >>> from ultralytics.utils import TQDM
-            >>> for i in TQDM(range(100)):
-            ...     # Your code here
-            ...     pass
-        """
-        warnings.filterwarnings("ignore", category=tqdm.TqdmExperimentalWarning)  # suppress tqdm.rich warning
-        if is_github_action_running():
-            kwargs["mininterval"] = 60  # only update every 60 seconds
-        kwargs["disable"] = not VERBOSE or kwargs.get("disable", False) or LOGGER.getEffectiveLevel() > 20
-        kwargs.setdefault("bar_format", TQDM_BAR_FORMAT)  # override default value if passed
-        super().__init__(*args, **kwargs)
-
-    def __iter__(self):
-        """Return self as iterator to satisfy Iterable interface."""
-        return super().__iter__()
-
 
 class DataExportMixin:
     """

{dgenerate_ultralytics_headless-8.3.184 → dgenerate_ultralytics_headless-8.3.186}/ultralytics/utils/autodevice.py

@@ -49,7 +49,7 @@ class GPUInfo:
         self.gpu_stats: List[Dict[str, Any]] = []
 
         try:
-            check_requirements("pynvml>=12.0.0")
+            check_requirements("nvidia-ml-py>=12.0.0")
             self.pynvml = __import__("pynvml")
             self.pynvml.nvmlInit()
             self.nvml_available = True

{dgenerate_ultralytics_headless-8.3.184 → dgenerate_ultralytics_headless-8.3.186}/ultralytics/utils/downloads.py

@@ -118,11 +118,11 @@ def zip_directory(directory, compress: bool = True, exclude=(".DS_Store", "__MAC
         raise FileNotFoundError(f"Directory '{directory}' does not exist.")
 
     # Zip with progress bar
-    files_to_zip = [f for f in directory.rglob("*") if f.is_file() and all(x not in f.name for x in exclude)]
+    files = [f for f in directory.rglob("*") if f.is_file() and all(x not in f.name for x in exclude)]  # files to zip
     zip_file = directory.with_suffix(".zip")
     compression = ZIP_DEFLATED if compress else ZIP_STORED
     with ZipFile(zip_file, "w", compression) as f:
-        for file in TQDM(files_to_zip, desc=f"Zipping {directory} to {zip_file}...", unit="file", disable=not progress):
+        for file in TQDM(files, desc=f"Zipping {directory} to {zip_file}...", unit="files", disable=not progress):
             f.write(file, file.relative_to(directory))
 
     return zip_file  # return path to zip file
@@ -187,7 +187,7 @@ def unzip_file(
             LOGGER.warning(f"Skipping {file} unzip as destination directory {path} is not empty.")
             return path
 
-        for f in TQDM(files, desc=f"Unzipping {file} to {Path(path).resolve()}...", unit="file", disable=not progress):
+        for f in TQDM(files, desc=f"Unzipping {file} to {Path(path).resolve()}...", unit="files", disable=not progress):
             # Ensure the file is within the extract_path to avoid path traversal security vulnerability
             if ".." in Path(f).parts:
                 LOGGER.warning(f"Potentially insecure file path: {f}, skipping extraction.")
@@ -295,7 +295,8 @@ def safe_download(
     progress: bool = True,
 ):
     """
-    Download files from a URL with options for retrying, unzipping, and deleting the downloaded file.
+    Download files from a URL with options for retrying, unzipping, and deleting the downloaded file. Enhanced with
+    robust partial download detection using Content-Length validation.
 
     Args:
         url (str): The URL of the file to be downloaded.
@@ -342,24 +343,33 @@ def safe_download(
                     s = "sS" * (not progress)  # silent
                     r = subprocess.run(["curl", "-#", f"-{s}L", url, "-o", f, "--retry", "3", "-C", "-"]).returncode
                     assert r == 0, f"Curl return value {r}"
+                    expected_size = None  # Can't get size with curl
                 else:  # urllib download
-                    # torch.hub.download_url_to_file(url, f, progress=progress)  # do not use as progress tqdm differs
-                    with request.urlopen(url) as response, TQDM(
-                        total=int(response.getheader("Content-Length", 0)),
-                        desc=desc,
-                        disable=not progress,
-                        unit="B",
-                        unit_scale=True,
-                        unit_divisor=1024,
-                    ) as pbar:
-                        with open(f, "wb") as f_opened:
-                            for data in response:
-                                f_opened.write(data)
-                                pbar.update(len(data))
+                    with request.urlopen(url) as response:
+                        expected_size = int(response.getheader("Content-Length", 0))
+                        with TQDM(
+                            total=expected_size,
+                            desc=desc,
+                            disable=not progress,
+                            unit="B",
+                            unit_scale=True,
+                            unit_divisor=1024,
+                        ) as pbar:
+                            with open(f, "wb") as f_opened:
+                                for data in response:
+                                    f_opened.write(data)
+                                    pbar.update(len(data))
 
                 if f.exists():
-                    if f.stat().st_size > min_bytes:
-                        break  # success
+                    file_size = f.stat().st_size
+                    if file_size > min_bytes:
+                        # Check if download is complete (only if we have expected_size)
+                        if expected_size and file_size != expected_size:
+                            LOGGER.warning(
+                                f"Partial download: {file_size}/{expected_size} bytes ({file_size / expected_size * 100:.1f}%)"
+                            )
+                        else:
+                            break  # success
                     f.unlink()  # remove partial downloads
             except Exception as e:
                 if i == 0 and not is_online():