dgenerate-ultralytics-headless 8.3.173__tar.gz → 8.3.175__tar.gz

{dgenerate_ultralytics_headless-8.3.173 → dgenerate_ultralytics_headless-8.3.175}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dgenerate-ultralytics-headless
-Version: 8.3.173
+Version: 8.3.175
 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.173 → dgenerate_ultralytics_headless-8.3.175}/dgenerate_ultralytics_headless.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dgenerate-ultralytics-headless
-Version: 8.3.173
+Version: 8.3.175
 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.173 → dgenerate_ultralytics_headless-8.3.175}/tests/test_exports.py

@@ -222,6 +222,20 @@ def test_export_ncnn():
     YOLO(file)(SOURCE, imgsz=32)  # exported model inference
 
 
+@pytest.mark.slow
+@pytest.mark.parametrize(
+    "task, half, batch",
+    [  # generate all combinations except for exclusion cases
+        (task, half, batch) for task, half, batch in product(TASKS, [True, False], [1])
+    ],
+)
+def test_export_ncnn_matrix(task, half, batch):
+    """Test YOLO export to NCNN format considering various export configurations."""
+    file = YOLO(TASK2MODEL[task]).export(format="ncnn", imgsz=32, half=half, batch=batch)
+    YOLO(file)([SOURCE] * batch, imgsz=32)  # exported model inference
+    shutil.rmtree(file, ignore_errors=True)  # retry in case of potential lingering multi-threaded file usage errors
+
+
 @pytest.mark.skipif(True, reason="Test disabled as keras and tensorflow version conflicts with TFlite export.")
 @pytest.mark.skipif(not LINUX or MACOS, reason="Skipping test on Windows and Macos")
 def test_export_imx():

{dgenerate_ultralytics_headless-8.3.173 → dgenerate_ultralytics_headless-8.3.175}/ultralytics/__init__.py

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

{dgenerate_ultralytics_headless-8.3.173 → dgenerate_ultralytics_headless-8.3.175}/ultralytics/engine/validator.py

@@ -163,11 +163,9 @@ class BaseValidator:
             )
             self.device = model.device  # update device
             self.args.half = model.fp16  # update half
-            stride, pt, jit, engine = model.stride, model.pt, model.jit, model.engine
+            stride, pt, jit = model.stride, model.pt, model.jit
             imgsz = check_imgsz(self.args.imgsz, stride=stride)
-            if engine:
-                self.args.batch = model.batch_size
-            elif not (pt or jit or getattr(model, "dynamic", False)):
+            if not (pt or jit or getattr(model, "dynamic", False)):
                 self.args.batch = model.metadata.get("batch", 1)  # export.py models default to batch-size 1
                 LOGGER.info(f"Setting batch={self.args.batch} input of shape ({self.args.batch}, 3, {imgsz}, {imgsz})")
 

{dgenerate_ultralytics_headless-8.3.173 → dgenerate_ultralytics_headless-8.3.175}/ultralytics/models/yolo/model.py

@@ -324,6 +324,7 @@ class YOLOE(Model):
             embeddings (torch.Tensor): Embeddings corresponding to the classes.
         """
         assert isinstance(self.model, YOLOEModel)
+        assert not self.is_fused(), "Model was fused during inference. set_classes() can no longer be used."
         self.model.set_classes(classes, embeddings)
         # Verify no background class is present
         assert " " not in classes

{dgenerate_ultralytics_headless-8.3.173 → dgenerate_ultralytics_headless-8.3.175}/ultralytics/solutions/object_cropper.py

@@ -78,6 +78,7 @@ class ObjectCropper(BaseSolution):
                 device=self.CFG["device"],
                 verbose=False,
             )[0]
+            self.clss = results.boxes.cls.tolist()  # required for logging only.
 
         for box in results.boxes:
             self.crop_idx += 1

{dgenerate_ultralytics_headless-8.3.173 → dgenerate_ultralytics_headless-8.3.175}/ultralytics/solutions/solutions.py

@@ -1,7 +1,7 @@
 # Ultralytics 🚀 AGPL-3.0 License - https://ultralytics.com/license
 
 import math
-from collections import defaultdict
+from collections import Counter, defaultdict
 from functools import lru_cache
 from typing import Any, Dict, List, Optional, Tuple
 
@@ -250,8 +250,10 @@ class BaseSolution:
         result.speed = {track_or_predict: track_or_predict_speed, "solution": solution_speed}
         if self.CFG["verbose"]:
             self.frame_no += 1
+            counts = Counter(self.clss)  # Only for logging.
             LOGGER.info(
-                f"{self.frame_no}: {result.plot_im.shape[0]}x{result.plot_im.shape[1]} {solution_speed:.1f}ms\n"
+                f"{self.frame_no}: {result.plot_im.shape[0]}x{result.plot_im.shape[1]} {solution_speed:.1f}ms,"
+                f" {', '.join([f'{v} {self.names[k]}' for k, v in counts.items()])}\n"
                 f"Speed: {track_or_predict_speed:.1f}ms {track_or_predict}, "
                 f"{solution_speed:.1f}ms solution per image at shape "
                 f"(1, {getattr(self.model, 'ch', 3)}, {result.plot_im.shape[0]}, {result.plot_im.shape[1]})\n"

{dgenerate_ultralytics_headless-8.3.173 → dgenerate_ultralytics_headless-8.3.175}/ultralytics/utils/__init__.py

@@ -1036,7 +1036,7 @@ def get_user_config_dir(sub_dir="Ultralytics"):
     # GCP and AWS lambda fix, only /tmp is writeable
     if not is_dir_writeable(path.parent):
         LOGGER.warning(
-            f"user config directory '{path}' is not writeable, defaulting to '/tmp' or CWD."
+            f"user config directory '{path}' is not writeable, defaulting to '/tmp' or CWD. "
             "Alternatively you can define a YOLO_CONFIG_DIR environment variable for this path."
         )
         path = Path("/tmp") / sub_dir if is_dir_writeable("/tmp") else Path().cwd() / sub_dir