ultralytics 8.1.1 Docs, Solutions and Export updates (#7545)

Co-authored-by: Sergiu Waxmann <47978446+sergiuwaxmann@users.noreply.github.com>
Co-authored-by: Vivek Malvi <malvivivek8198@gmail.com>
Co-authored-by: UltralyticsAssistant <web@ultralytics.com>
Co-authored-by: psaxton <psaxton+github.com@gmail.com>

ultralytics/__init__.py

@@ -1,6 +1,6 @@
 # Ultralytics YOLO 🚀, AGPL-3.0 license
 
-__version__ = "8.1.0"
+__version__ = "8.1.1"
 
 from ultralytics.data.explorer.explorer import Explorer
 from ultralytics.models import RTDETR, SAM, YOLO

ultralytics/engine/exporter.py

@@ -555,6 +555,7 @@ class Exporter:
         import coremltools as ct  # noqa
 
         LOGGER.info(f"\n{prefix} starting export with coremltools {ct.__version__}...")
+        assert not WINDOWS, "CoreML export is not supported on Windows, please run on macOS or Linux."
         f = self.file.with_suffix(".mlmodel" if mlmodel else ".mlpackage")
         if f.is_dir():
             shutil.rmtree(f)

ultralytics/solutions/object_counter.py

@@ -182,25 +182,29 @@ class ObjectCounter:
                     track_line, color=self.track_color, track_thickness=self.track_thickness
                 )
 
+            prev_position = self.track_history[track_id][-2] if len(self.track_history[track_id]) > 1 else None
+
             # Count objects
             if len(self.reg_pts) == 4:
-                if self.counting_region.contains(Point(track_line[-1])):
-                    if track_id not in self.counting_list:
-                        self.counting_list.append(track_id)
-                        if box[0] < self.counting_region.centroid.x:
-                            self.out_counts += 1
-                        else:
-                            self.in_counts += 1
+                if prev_position is not None:
+                    if self.counting_region.contains(Point(track_line[-1])):
+                        if track_id not in self.counting_list:
+                            self.counting_list.append(track_id)
+                            if (box[0] - prev_position[0]) * (self.counting_region.centroid.x - prev_position[0]) > 0:
+                                self.in_counts += 1
+                            else:
+                                self.out_counts += 1
 
             elif len(self.reg_pts) == 2:
-                distance = Point(track_line[-1]).distance(self.counting_region)
-                if distance < self.line_dist_thresh:
-                    if track_id not in self.counting_list:
-                        self.counting_list.append(track_id)
-                        if box[0] < self.counting_region.centroid.x:
-                            self.out_counts += 1
-                        else:
-                            self.in_counts += 1
+                if prev_position is not None:
+                    distance = Point(track_line[-1]).distance(self.counting_region)
+                    if distance < self.line_dist_thresh:
+                        if track_id not in self.counting_list:
+                            self.counting_list.append(track_id)
+                            if (box[0] - prev_position[0]) * (self.counting_region.centroid.x - prev_position[0]) > 0:
+                                self.in_counts += 1
+                            else:
+                                self.out_counts += 1
 
         incount_label = "In Count : " + f"{self.in_counts}"
         outcount_label = "OutCount : " + f"{self.out_counts}"

ultralytics/utils/benchmarks.py

@@ -85,10 +85,12 @@ def benchmark(
         emoji, filename = "❌", None  # export defaults
         try:
             assert i != 9 or LINUX, "Edge TPU export only supported on Linux"
-            if i == 10:
+            if i == 5:
+                assert MACOS or LINUX, "CoreML export only supported on macOS and Linux"
+            elif i == 10:
                 assert MACOS or LINUX, "TF.js export only supported on macOS and Linux"
-            elif i == 11:
-                assert sys.version_info < (3, 11), "PaddlePaddle export only supported on Python<=3.10"
+            # elif i == 11:
+            #     assert sys.version_info < (3, 11), "PaddlePaddle export only supported on Python<=3.10"
             if "cpu" in device.type:
                 assert cpu, "inference not supported on CPU"
             if "cuda" in device.type:

ultralytics/utils/patches.py

@@ -1,6 +1,7 @@
 # Ultralytics YOLO 🚀, AGPL-3.0 license
 """Monkey patches to update/extend functionality of existing functions."""
 
+import time
 from pathlib import Path
 
 import cv2
@@ -61,7 +62,8 @@ _torch_save = torch.save  # copy to avoid recursion errors
 
 def torch_save(*args, **kwargs):
     """
-    Use dill (if exists) to serialize the lambda functions where pickle does not do this.
+    Use dill (if exists) to serialize the lambda functions where pickle does not do this. Also adds 3 retries with
+    exponential standoff in case of save failure to improve robustness to transient issues.
 
     Args:
         *args (tuple): Positional arguments to pass to torch.save.
@@ -74,4 +76,11 @@ def torch_save(*args, **kwargs):
 
     if "pickle_module" not in kwargs:
         kwargs["pickle_module"] = pickle  # noqa
-    return _torch_save(*args, **kwargs)
+
+    for i in range(4):  # 3 retries
+        try:
+            return _torch_save(*args, **kwargs)
+        except RuntimeError:  # unable to save, possibly waiting for device to flush or anti-virus to finish scanning
+            if i == 3:
+                raise
+            time.sleep((2**i) / 2)  # exponential standoff 0.5s, 1.0s, 2.0s