dgenerate-ultralytics-headless 8.3.224__tar.gz → 8.3.225__tar.gz

{dgenerate_ultralytics_headless-8.3.224 → dgenerate_ultralytics_headless-8.3.225}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dgenerate-ultralytics-headless
-Version: 8.3.224
+Version: 8.3.225
 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>

{dgenerate_ultralytics_headless-8.3.224 → dgenerate_ultralytics_headless-8.3.225}/dgenerate_ultralytics_headless.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dgenerate-ultralytics-headless
-Version: 8.3.224
+Version: 8.3.225
 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>

{dgenerate_ultralytics_headless-8.3.224 → dgenerate_ultralytics_headless-8.3.225}/dgenerate_ultralytics_headless.egg-info/SOURCES.txt

@@ -57,6 +57,7 @@ ultralytics/cfg/datasets/dog-pose.yaml
 ultralytics/cfg/datasets/dota8-multispectral.yaml
 ultralytics/cfg/datasets/dota8.yaml
 ultralytics/cfg/datasets/hand-keypoints.yaml
+ultralytics/cfg/datasets/kitti.yaml
 ultralytics/cfg/datasets/lvis.yaml
 ultralytics/cfg/datasets/medical-pills.yaml
 ultralytics/cfg/datasets/open-images-v7.yaml

{dgenerate_ultralytics_headless-8.3.224 → dgenerate_ultralytics_headless-8.3.225}/tests/test_cli.py

@@ -8,7 +8,7 @@ from PIL import Image
 
 from tests import CUDA_DEVICE_COUNT, CUDA_IS_AVAILABLE, MODELS, TASK_MODEL_DATA
 from ultralytics.utils import ARM64, ASSETS, LINUX, WEIGHTS_DIR, checks
-from ultralytics.utils.torch_utils import TORCH_1_11, TORCH_2_9, WINDOWS
+from ultralytics.utils.torch_utils import TORCH_1_11
 
 
 def run(cmd: str) -> None:
@@ -129,10 +129,3 @@ def test_train_gpu(task: str, model: str, data: str) -> None:
 def test_solutions(solution: str) -> None:
     """Test yolo solutions command-line modes."""
     run(f"yolo solutions {solution} verbose=False")
-
-
-@pytest.mark.skipif(not checks.IS_PYTHON_MINIMUM_3_10 or not TORCH_2_9, reason="Requires Python>=3.10 and Torch>=2.9.0")
-@pytest.mark.skipif(WINDOWS, reason="Skipping test on Windows")
-def test_export_executorch() -> None:
-    """Test exporting a YOLO model to ExecuTorch format via CLI."""
-    run("yolo export model=yolo11n.pt format=executorch imgsz=32")

{dgenerate_ultralytics_headless-8.3.224 → dgenerate_ultralytics_headless-8.3.225}/ultralytics/__init__.py

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

dgenerate_ultralytics_headless-8.3.225/ultralytics/cfg/datasets/kitti.yaml

@@ -0,0 +1,27 @@
+# Ultralytics 🚀 AGPL-3.0 License - https://ultralytics.com/license
+
+# Kitti dataset by Karlsruhe Institute of Technology and Toyota Technological Institute at Chicago
+# Documentation: https://docs.ultralytics.com/datasets/detect/kitti/
+# Example usage: yolo train data=kitti.yaml
+# parent
+# ├── ultralytics
+# └── datasets
+#     └── kitti ← downloads here (390.5 MB)
+
+# Train/val/test sets as 1) dir: path/to/imgs, 2) file: path/to/imgs.txt, or 3) list: [path/to/imgs1, path/to/imgs2, ..]
+path: kitti # dataset root dir
+train: images/train # train images (relative to 'path') 5985 images
+val: images/val # val images (relative to 'path') 1496 images
+
+names:
+  0: car
+  1: van
+  2: truck
+  3: pedestrian
+  4: person_sitting
+  5: cyclist
+  6: tram
+  7: misc
+
+# Download script/URL (optional)
+download: https://github.com/ultralytics/assets/releases/download/v0.0.0/kitti.zip

{dgenerate_ultralytics_headless-8.3.224 → dgenerate_ultralytics_headless-8.3.225}/ultralytics/data/build.py

@@ -14,7 +14,7 @@ import numpy as np
 import torch
 import torch.distributed as dist
 from PIL import Image
-from torch.utils.data import dataloader, distributed
+from torch.utils.data import Dataset, dataloader, distributed
 
 from ultralytics.cfg import IterableSimpleNamespace
 from ultralytics.data.dataset import GroundingDataset, YOLODataset, YOLOMultiModalDataset
@@ -125,7 +125,7 @@ class ContiguousDistributedSampler(torch.utils.data.Sampler):
     samples are covered exactly once across all GPUs.
 
     Args:
-        dataset (torch.utils.data.Dataset): Dataset to sample from. Must implement __len__.
+        dataset (Dataset): Dataset to sample from. Must implement __len__.
         num_replicas (int, optional): Number of distributed processes. Defaults to world size.
         batch_size (int, optional): Batch size used by dataloader. Defaults to dataset batch size.
         rank (int, optional): Rank of current process. Defaults to current rank.
@@ -144,7 +144,14 @@ class ContiguousDistributedSampler(torch.utils.data.Sampler):
         ...         ...
     """
 
-    def __init__(self, dataset, num_replicas=None, batch_size=None, rank=None, shuffle=False):
+    def __init__(
+        self,
+        dataset: Dataset,
+        num_replicas: int | None = None,
+        batch_size: int | None = None,
+        rank: int | None = None,
+        shuffle: bool = False,
+    ) -> None:
         """Initialize the sampler with dataset and distributed training parameters."""
         if num_replicas is None:
             num_replicas = dist.get_world_size() if dist.is_initialized() else 1
@@ -153,7 +160,6 @@ class ContiguousDistributedSampler(torch.utils.data.Sampler):
         if batch_size is None:
             batch_size = getattr(dataset, "batch_size", 1)
 
-        self.dataset = dataset
         self.num_replicas = num_replicas
         self.batch_size = batch_size
         self.rank = rank
@@ -162,7 +168,7 @@ class ContiguousDistributedSampler(torch.utils.data.Sampler):
         self.total_size = len(dataset)
         self.num_batches = math.ceil(self.total_size / self.batch_size)
 
-    def _get_rank_indices(self):
+    def _get_rank_indices(self) -> tuple[int, int]:
         """Calculate the start and end sample indices for this rank."""
         # Calculate which batches this rank handles
         batches_per_rank_base = self.num_batches // self.num_replicas
@@ -181,7 +187,7 @@ class ContiguousDistributedSampler(torch.utils.data.Sampler):
 
         return start_idx, end_idx
 
-    def __iter__(self):
+    def __iter__(self) -> Iterator:
         """Generate indices for this rank's contiguous chunk of the dataset."""
         start_idx, end_idx = self._get_rank_indices()
         indices = list(range(start_idx, end_idx))
@@ -193,12 +199,12 @@ class ContiguousDistributedSampler(torch.utils.data.Sampler):
 
         return iter(indices)
 
-    def __len__(self):
+    def __len__(self) -> int:
         """Return the number of samples in this rank's chunk."""
         start_idx, end_idx = self._get_rank_indices()
         return end_idx - start_idx
 
-    def set_epoch(self, epoch):
+    def set_epoch(self, epoch: int) -> None:
         """Set the epoch for this sampler to ensure different shuffling patterns across epochs.
 
         Args:
@@ -207,7 +213,7 @@ class ContiguousDistributedSampler(torch.utils.data.Sampler):
         self.epoch = epoch
 
 
-def seed_worker(worker_id: int):
+def seed_worker(worker_id: int) -> None:
     """Set dataloader worker seed for reproducibility across worker processes."""
     worker_seed = torch.initial_seed() % 2**32
     np.random.seed(worker_seed)
@@ -223,7 +229,7 @@ def build_yolo_dataset(
     rect: bool = False,
     stride: int = 32,
     multi_modal: bool = False,
-):
+) -> Dataset:
     """Build and return a YOLO dataset based on configuration parameters."""
     dataset = YOLOMultiModalDataset if multi_modal else YOLODataset
     return dataset(
@@ -254,7 +260,7 @@ def build_grounding(
     rect: bool = False,
     stride: int = 32,
     max_samples: int = 80,
-):
+) -> Dataset:
     """Build and return a GroundingDataset based on configuration parameters."""
     return GroundingDataset(
         img_path=img_path,
@@ -284,7 +290,7 @@ def build_dataloader(
     rank: int = -1,
     drop_last: bool = False,
     pin_memory: bool = True,
-):
+) -> InfiniteDataLoader:
     """Create and return an InfiniteDataLoader or DataLoader for training or validation.
 
     Args:
@@ -331,7 +337,9 @@ def build_dataloader(
     )
 
 
-def check_source(source):
+def check_source(
+    source: str | int | Path | list | tuple | np.ndarray | Image.Image | torch.Tensor,
+) -> tuple[Any, bool, bool, bool, bool, bool]:
     """Check the type of input source and return corresponding flag values.
 
     Args:
@@ -379,11 +387,17 @@ def check_source(source):
     return source, webcam, screenshot, from_img, in_memory, tensor
 
 
-def load_inference_source(source=None, batch: int = 1, vid_stride: int = 1, buffer: bool = False, channels: int = 3):
+def load_inference_source(
+    source: str | int | Path | list | tuple | np.ndarray | Image.Image | torch.Tensor,
+    batch: int = 1,
+    vid_stride: int = 1,
+    buffer: bool = False,
+    channels: int = 3,
+):
     """Load an inference source for object detection and apply necessary transformations.
 
     Args:
-        source (str | Path | torch.Tensor | PIL.Image | np.ndarray, optional): The input source for inference.
+        source (str | Path | list | tuple | torch.Tensor | PIL.Image | np.ndarray): The input source for inference.
         batch (int, optional): Batch size for dataloaders.
         vid_stride (int, optional): The frame interval for video sources.
         buffer (bool, optional): Whether stream frames will be buffered.

{dgenerate_ultralytics_headless-8.3.224 → dgenerate_ultralytics_headless-8.3.225}/ultralytics/models/sam/build.py

@@ -11,7 +11,7 @@ from functools import partial
 import torch
 
 from ultralytics.utils.downloads import attempt_download_asset
-from ultralytics.utils.torch_utils import TORCH_1_13
+from ultralytics.utils.patches import torch_load
 
 from .modules.decoders import MaskDecoder
 from .modules.encoders import FpnNeck, Hiera, ImageEncoder, ImageEncoderViT, MemoryEncoder, PromptEncoder
@@ -207,7 +207,7 @@ def _build_sam(
     if checkpoint is not None:
         checkpoint = attempt_download_asset(checkpoint)
         with open(checkpoint, "rb") as f:
-            state_dict = torch.load(f, weights_only=False) if TORCH_1_13 else torch.load(f)
+            state_dict = torch_load(f)
         sam.load_state_dict(state_dict)
     sam.eval()
     return sam
@@ -301,7 +301,7 @@ def _build_sam2(
     if checkpoint is not None:
         checkpoint = attempt_download_asset(checkpoint)
         with open(checkpoint, "rb") as f:
-            state_dict = (torch.load(f, weights_only=False) if TORCH_1_13 else torch.load(f))["model"]
+            state_dict = torch_load(f)["model"]
         sam2.load_state_dict(state_dict)
     sam2.eval()
     return sam2

{dgenerate_ultralytics_headless-8.3.224 → dgenerate_ultralytics_headless-8.3.225}/ultralytics/models/sam/predict.py

@@ -1727,12 +1727,8 @@ class SAM2DynamicInteractivePredictor(SAM2Predictor):
 
         # Initialize the object index set and mappings
         self.obj_idx_set = set()
-        self.obj_id_to_idx = OrderedDict()
-        self.obj_idx_to_id = OrderedDict()
+        self.obj_id_to_idx = self.obj_idx_to_id = OrderedDict(enumerate(range(max_obj_num)))
         self._max_obj_num = max_obj_num
-        for i in range(self._max_obj_num):
-            self.obj_id_to_idx[i + 1] = i
-            self.obj_idx_to_id[i] = i + 1
 
     @smart_inference_mode()
     def inference(

{dgenerate_ultralytics_headless-8.3.224 → dgenerate_ultralytics_headless-8.3.225}/ultralytics/utils/export/tensorflow.py

@@ -123,7 +123,7 @@ def keras2pb(keras_model, file: Path, prefix=""):
     """Convert a Keras model to TensorFlow GraphDef (.pb) format.
 
     Args:
-        keras_model(tf_keras): Keras model to convert to frozen graph format.
+        keras_model (keras.Model): Keras model to convert to frozen graph format.
         file (Path): Output file path (suffix will be changed to .pb).
         prefix (str, optional): Logging prefix. Defaults to "".