ultralytics 8.2.90__tar.gz → 8.2.92__tar.gz

{ultralytics-8.2.90/ultralytics.egg-info → ultralytics-8.2.92}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ultralytics
-Version: 8.2.90
+Version: 8.2.92
 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

{ultralytics-8.2.90 → ultralytics-8.2.92}/ultralytics/__init__.py

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

{ultralytics-8.2.90 → ultralytics-8.2.92}/ultralytics/data/base.py

@@ -91,6 +91,11 @@ class BaseDataset(Dataset):
         self.npy_files = [Path(f).with_suffix(".npy") for f in self.im_files]
         self.cache = cache.lower() if isinstance(cache, str) else "ram" if cache is True else None
         if (self.cache == "ram" and self.check_cache_ram()) or self.cache == "disk":
+            if self.cache == "ram" and hyp.deterministic:
+                LOGGER.warning(
+                    "WARNING ⚠️ cache='ram' may produce non-deterministic training results. "
+                    "Consider cache='disk' as a deterministic alternative if your disk space allows."
+                )
             self.cache_images()
 
         # Transforms

{ultralytics-8.2.90 → ultralytics-8.2.92}/ultralytics/engine/results.py

@@ -522,7 +522,13 @@ class Results(SimpleClass):
                     .contiguous()
                     / 255
                 )
-            idx = pred_boxes.cls if pred_boxes and color_mode == "class" else reversed(range(len(pred_masks)))
+            idx = (
+                pred_boxes.id
+                if pred_boxes.id is not None and color_mode == "instance"
+                else pred_boxes.cls
+                if pred_boxes and color_mode == "class"
+                else reversed(range(len(pred_masks)))
+            )
             annotator.masks(pred_masks.data, colors=[colors(x, True) for x in idx], im_gpu=im_gpu)
 
         # Plot Detect results
@@ -535,7 +541,16 @@ class Results(SimpleClass):
                 annotator.box_label(
                     box,
                     label,
-                    color=colors(i if color_mode == "instance" else c, True),
+                    color=colors(
+                        c
+                        if color_mode == "class"
+                        else id
+                        if id is not None
+                        else i
+                        if color_mode == "instance"
+                        else None,
+                        True,
+                    ),
                     rotated=is_obb,
                 )
 

{ultralytics-8.2.90 → ultralytics-8.2.92}/ultralytics/models/sam/modules/transformer.py

@@ -61,7 +61,6 @@ class TwoWayTransformer(nn.Module):
         Attributes:
             depth (int): Number of layers in the transformer.
             embedding_dim (int): Channel dimension for input embeddings.
-            embedding_dim (int): Channel dimension for input embeddings.
             num_heads (int): Number of heads for multihead attention.
             mlp_dim (int): Internal channel dimension for the MLP block.
             layers (nn.ModuleList): List of TwoWayAttentionBlock layers.

{ultralytics-8.2.90 → ultralytics-8.2.92}/ultralytics/nn/tasks.py

@@ -776,6 +776,7 @@ def torch_safe_load(weight):
             attributes={
                 "ultralytics.nn.modules.block.Silence": "torch.nn.Identity",  # YOLOv9e
                 "ultralytics.nn.tasks.YOLOv10DetectionModel": "ultralytics.nn.tasks.DetectionModel",  # YOLOv10
+                "ultralytics.utils.loss.v10DetectLoss": "ultralytics.utils.loss.E2EDetectLoss",  # YOLOv10
             },
         ):
             ckpt = torch.load(file, map_location="cpu")

{ultralytics-8.2.90 → ultralytics-8.2.92}/ultralytics/solutions/object_counter.py

@@ -60,7 +60,6 @@ class ObjectCounter:
         self.out_counts = 0
         self.count_ids = []
         self.class_wise_count = {}
-        self.count_txt_thickness = 0
 
         # Tracks info
         self.track_history = defaultdict(list)
@@ -136,7 +135,7 @@ class ObjectCounter:
             # Extract tracks
             for box, track_id, cls in zip(boxes, track_ids, clss):
                 # Draw bounding box
-                annotator.box_label(box, label=f"{self.names[cls]}#{track_id}", color=colors(int(track_id), True))
+                annotator.box_label(box, label=self.names[cls], color=colors(int(track_id), True))
 
                 # Store class info
                 if self.names[cls] not in self.class_wise_count:
@@ -182,10 +181,9 @@ class ObjectCounter:
                             self.count_ids.append(track_id)
 
                             # Determine the direction of movement (IN or OUT)
-                            direction = (box[0] - prev_position[0]) * (
-                                self.counting_region.centroid.x - prev_position[0]
-                            )
-                            if direction > 0:
+                            dx = (box[0] - prev_position[0]) * (self.counting_region.centroid.x - prev_position[0])
+                            dy = (box[1] - prev_position[1]) * (self.counting_region.centroid.y - prev_position[1])
+                            if dx > 0 and dy > 0:
                                 self.in_counts += 1
                                 self.class_wise_count[self.names[cls]]["IN"] += 1
                             else:

{ultralytics-8.2.90 → ultralytics-8.2.92/ultralytics.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ultralytics
-Version: 8.2.90
+Version: 8.2.92
 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