ultralytics 8.1.6__py3-none-any.whl → 8.1.12__py3-none-any.whl

ultralytics/__init__.py

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

ultralytics/cfg/__init__.py

@@ -317,7 +317,7 @@ def merge_equals_args(args: List[str]) -> List[str]:
         args (List[str]): A list of strings where each element is an argument.
 
     Returns:
-        List[str]: A list of strings where the arguments around isolated '=' are merged.
+        (List[str]): A list of strings where the arguments around isolated '=' are merged.
     """
     new_args = []
     for i, arg in enumerate(args):

ultralytics/data/converter.py

@@ -336,6 +336,7 @@ def convert_dota_to_yolo_obb(dota_root_path: str):
 
     Notes:
         The directory structure assumed for the DOTA dataset:
+
             - DOTA
                 ├─ images
                 │   ├─ train
@@ -345,6 +346,7 @@ def convert_dota_to_yolo_obb(dota_root_path: str):
                     └─ val_original
 
         After execution, the function will organize the labels into:
+
             - DOTA
                 └─ labels
                     ├─ train
@@ -489,14 +491,15 @@ def yolo_bbox2segment(im_dir, save_dir=None, sam_model="sam_b.pt"):
 
     Notes:
         The input directory structure assumed for dataset:
+
             - im_dir
                 ├─ 001.jpg
                 ├─ ..
-                ├─ NNN.jpg
+                └─ NNN.jpg
             - labels
                 ├─ 001.txt
                 ├─ ..
-                ├─ NNN.txt
+                └─ NNN.txt
     """
     from ultralytics.data import YOLODataset
     from ultralytics.utils.ops import xywh2xyxy

ultralytics/data/dataset.py

@@ -46,7 +46,8 @@ class YOLODataset(BaseDataset):
         Cache dataset labels, check images and read shapes.
 
         Args:
-            path (Path): path where to save the cache file (default: Path('./labels.cache')).
+            path (Path): Path where to save the cache file. Default is Path('./labels.cache').
+
         Returns:
             (dict): labels.
         """
@@ -178,9 +179,13 @@ class YOLODataset(BaseDataset):
         self.transforms = self.build_transforms(hyp)
 
     def update_labels_info(self, label):
-        """Custom your label format here."""
-        # NOTE: cls is not with bboxes now, classification and semantic segmentation need an independent cls label
-        # We can make it also support classification and semantic segmentation by add or remove some dict keys there.
+        """
+        Custom your label format here.
+
+        Note:
+            cls is not with bboxes now, classification and semantic segmentation need an independent cls label
+            Can also support classification and semantic segmentation by adding or removing dict keys there.
+        """
         bboxes = label.pop("bboxes")
         segments = label.pop("segments", [])
         keypoints = label.pop("keypoints", None)

ultralytics/data/explorer/explorer.py

@@ -16,7 +16,7 @@ from ultralytics.data.augment import Format
 from ultralytics.data.dataset import YOLODataset
 from ultralytics.data.utils import check_det_dataset
 from ultralytics.models.yolo.model import YOLO
-from ultralytics.utils import LOGGER, IterableSimpleNamespace, checks
+from ultralytics.utils import LOGGER, IterableSimpleNamespace, checks, USER_CONFIG_DIR
 from .utils import get_sim_index_schema, get_table_schema, plot_query_result, prompt_sql_query, sanitize_batch
 
 
@@ -54,7 +54,10 @@ class ExplorerDataset(YOLODataset):
 
 class Explorer:
     def __init__(
-        self, data: Union[str, Path] = "coco128.yaml", model: str = "yolov8n.pt", uri: str = "~/ultralytics/explorer"
+        self,
+        data: Union[str, Path] = "coco128.yaml",
+        model: str = "yolov8n.pt",
+        uri: str = USER_CONFIG_DIR / "explorer",
     ) -> None:
         checks.check_requirements(["lancedb>=0.4.3", "duckdb"])
         import lancedb

ultralytics/engine/exporter.py

@@ -227,7 +227,7 @@ class Exporter:
         y = None
         for _ in range(2):
             y = model(im)  # dry runs
-        if self.args.half and (engine or onnx) and self.device.type != "cpu":
+        if self.args.half and onnx and self.device.type != "cpu":
             im, model = im.half(), model.half()  # to FP16
 
         # Filter warnings
@@ -454,7 +454,21 @@ class Exporter:
             if n < 300:
                 LOGGER.warning(f"{prefix} WARNING ⚠️ >300 images recommended for INT8 calibration, found {n} images.")
             quantization_dataset = nncf.Dataset(dataset, transform_fn)
-            ignored_scope = nncf.IgnoredScope(types=["Multiply", "Subtract", "Sigmoid"])  # ignore operation
+            ignored_scope = None
+            if isinstance(self.model.model[-1], (Detect, RTDETRDecoder)):  # Segment and Pose use Detect base class
+                # get detection module name in onnx
+                head_module_name = ".".join(list(self.model.named_modules())[-1][0].split(".")[:2])
+
+                ignored_scope = nncf.IgnoredScope(  # ignore operations
+                    patterns=[
+                        f"/{head_module_name}/Add",
+                        f"/{head_module_name}/Sub",
+                        f"/{head_module_name}/Mul",
+                        f"/{head_module_name}/Div",
+                        f"/{head_module_name}/dfl",
+                    ],
+                    names=[f"/{head_module_name}/Sigmoid"],
+                )
             quantized_ov_model = nncf.quantize(
                 ov_model, quantization_dataset, preset=nncf.QuantizationPreset.MIXED, ignored_scope=ignored_scope
             )
@@ -483,7 +497,7 @@ class Exporter:
         """
         YOLOv8 ncnn export using PNNX https://github.com/pnnx/pnnx.
         """
-        check_requirements("git+https://github.com/Tencent/ncnn.git" if ARM64 else "ncnn")  # requires ncnn
+        check_requirements("ncnn")
         import ncnn  # noqa
 
         LOGGER.info(f"\n{prefix} starting export with ncnn {ncnn.__version__}...")