ultralytics 8.3.85__tar.gz → 8.3.87__tar.gz

{ultralytics-8.3.85/ultralytics.egg-info → ultralytics-8.3.87}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ultralytics
-Version: 8.3.85
+Version: 8.3.87
 Summary: Ultralytics YOLO 🚀 for SOTA object detection, multi-object tracking, instance segmentation, pose estimation and image classification.
 Author-email: Glenn Jocher <glenn.jocher@ultralytics.com>, Jing Qiu <jing.qiu@ultralytics.com>
 Maintainer-email: Ultralytics <hello@ultralytics.com>
@@ -63,7 +63,7 @@ Provides-Extra: export
 Requires-Dist: onnx>=1.12.0; extra == "export"
 Requires-Dist: coremltools>=7.0; (platform_system != "Windows" and python_version <= "3.11") and extra == "export"
 Requires-Dist: scikit-learn>=1.3.2; (platform_system != "Windows" and python_version <= "3.11") and extra == "export"
-Requires-Dist: openvino<2025.0.0,>=2024.0.0; extra == "export"
+Requires-Dist: openvino!=2025.0.0,>=2024.0.0; extra == "export"
 Requires-Dist: tensorflow>=2.0.0; extra == "export"
 Requires-Dist: tensorflowjs>=3.9.0; extra == "export"
 Requires-Dist: tensorstore>=0.1.63; (platform_machine == "aarch64" and python_version >= "3.9") and extra == "export"
@@ -248,13 +248,13 @@ See [Segmentation Docs](https://docs.ultralytics.com/tasks/segment/) for usage e
 
 See [Classification Docs](https://docs.ultralytics.com/tasks/classify/) for usage examples with these models trained on [ImageNet](https://docs.ultralytics.com/datasets/classify/imagenet/), which include 1000 pretrained classes.
 
-| Model                                                                                        | size<br><sup>(pixels) | acc<br><sup>top1 | acc<br><sup>top5 | Speed<br><sup>CPU ONNX<br>(ms) | Speed<br><sup>T4 TensorRT10<br>(ms) | params<br><sup>(M) | FLOPs<br><sup>(B) at 640 |
+| Model                                                                                        | size<br><sup>(pixels) | acc<br><sup>top1 | acc<br><sup>top5 | Speed<br><sup>CPU ONNX<br>(ms) | Speed<br><sup>T4 TensorRT10<br>(ms) | params<br><sup>(M) | FLOPs<br><sup>(B) at 224 |
 | -------------------------------------------------------------------------------------------- | --------------------- | ---------------- | ---------------- | ------------------------------ | ----------------------------------- | ------------------ | ------------------------ |
-| [YOLO11n-cls](https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11n-cls.pt) | 224                   | 70.0             | 89.4             | 5.0 ± 0.3                      | 1.1 ± 0.0                           | 1.6                | 3.3                      |
-| [YOLO11s-cls](https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11s-cls.pt) | 224                   | 75.4             | 92.7             | 7.9 ± 0.2                      | 1.3 ± 0.0                           | 5.5                | 12.1                     |
-| [YOLO11m-cls](https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11m-cls.pt) | 224                   | 77.3             | 93.9             | 17.2 ± 0.4                     | 2.0 ± 0.0                           | 10.4               | 39.3                     |
-| [YOLO11l-cls](https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11l-cls.pt) | 224                   | 78.3             | 94.3             | 23.2 ± 0.3                     | 2.8 ± 0.0                           | 12.9               | 49.4                     |
-| [YOLO11x-cls](https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11x-cls.pt) | 224                   | 79.5             | 94.9             | 41.4 ± 0.9                     | 3.8 ± 0.0                           | 28.4               | 110.4                    |
+| [YOLO11n-cls](https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11n-cls.pt) | 224                   | 70.0             | 89.4             | 5.0 ± 0.3                      | 1.1 ± 0.0                           | 1.6                | 0.5                      |
+| [YOLO11s-cls](https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11s-cls.pt) | 224                   | 75.4             | 92.7             | 7.9 ± 0.2                      | 1.3 ± 0.0                           | 5.5                | 1.6                      |
+| [YOLO11m-cls](https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11m-cls.pt) | 224                   | 77.3             | 93.9             | 17.2 ± 0.4                     | 2.0 ± 0.0                           | 10.4               | 5.0                      |
+| [YOLO11l-cls](https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11l-cls.pt) | 224                   | 78.3             | 94.3             | 23.2 ± 0.3                     | 2.8 ± 0.0                           | 12.9               | 6.2                      |
+| [YOLO11x-cls](https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11x-cls.pt) | 224                   | 79.5             | 94.9             | 41.4 ± 0.9                     | 3.8 ± 0.0                           | 28.4               | 13.7                     |
 
 - **acc** values are model accuracies on the [ImageNet](https://www.image-net.org/) dataset validation set. <br>Reproduce by `yolo val classify data=path/to/ImageNet device=0`
 - **Speed** averaged over ImageNet val images using an [Amazon EC2 P4d](https://aws.amazon.com/ec2/instance-types/p4/) instance. <br>Reproduce by `yolo val classify data=path/to/ImageNet batch=1 device=0|cpu`

{ultralytics-8.3.85 → ultralytics-8.3.87}/README.md

@@ -163,13 +163,13 @@ See [Segmentation Docs](https://docs.ultralytics.com/tasks/segment/) for usage e
 
 See [Classification Docs](https://docs.ultralytics.com/tasks/classify/) for usage examples with these models trained on [ImageNet](https://docs.ultralytics.com/datasets/classify/imagenet/), which include 1000 pretrained classes.
 
-| Model                                                                                        | size<br><sup>(pixels) | acc<br><sup>top1 | acc<br><sup>top5 | Speed<br><sup>CPU ONNX<br>(ms) | Speed<br><sup>T4 TensorRT10<br>(ms) | params<br><sup>(M) | FLOPs<br><sup>(B) at 640 |
+| Model                                                                                        | size<br><sup>(pixels) | acc<br><sup>top1 | acc<br><sup>top5 | Speed<br><sup>CPU ONNX<br>(ms) | Speed<br><sup>T4 TensorRT10<br>(ms) | params<br><sup>(M) | FLOPs<br><sup>(B) at 224 |
 | -------------------------------------------------------------------------------------------- | --------------------- | ---------------- | ---------------- | ------------------------------ | ----------------------------------- | ------------------ | ------------------------ |
-| [YOLO11n-cls](https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11n-cls.pt) | 224                   | 70.0             | 89.4             | 5.0 ± 0.3                      | 1.1 ± 0.0                           | 1.6                | 3.3                      |
-| [YOLO11s-cls](https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11s-cls.pt) | 224                   | 75.4             | 92.7             | 7.9 ± 0.2                      | 1.3 ± 0.0                           | 5.5                | 12.1                     |
-| [YOLO11m-cls](https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11m-cls.pt) | 224                   | 77.3             | 93.9             | 17.2 ± 0.4                     | 2.0 ± 0.0                           | 10.4               | 39.3                     |
-| [YOLO11l-cls](https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11l-cls.pt) | 224                   | 78.3             | 94.3             | 23.2 ± 0.3                     | 2.8 ± 0.0                           | 12.9               | 49.4                     |
-| [YOLO11x-cls](https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11x-cls.pt) | 224                   | 79.5             | 94.9             | 41.4 ± 0.9                     | 3.8 ± 0.0                           | 28.4               | 110.4                    |
+| [YOLO11n-cls](https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11n-cls.pt) | 224                   | 70.0             | 89.4             | 5.0 ± 0.3                      | 1.1 ± 0.0                           | 1.6                | 0.5                      |
+| [YOLO11s-cls](https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11s-cls.pt) | 224                   | 75.4             | 92.7             | 7.9 ± 0.2                      | 1.3 ± 0.0                           | 5.5                | 1.6                      |
+| [YOLO11m-cls](https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11m-cls.pt) | 224                   | 77.3             | 93.9             | 17.2 ± 0.4                     | 2.0 ± 0.0                           | 10.4               | 5.0                      |
+| [YOLO11l-cls](https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11l-cls.pt) | 224                   | 78.3             | 94.3             | 23.2 ± 0.3                     | 2.8 ± 0.0                           | 12.9               | 6.2                      |
+| [YOLO11x-cls](https://github.com/ultralytics/assets/releases/download/v8.3.0/yolo11x-cls.pt) | 224                   | 79.5             | 94.9             | 41.4 ± 0.9                     | 3.8 ± 0.0                           | 28.4               | 13.7                     |
 
 - **acc** values are model accuracies on the [ImageNet](https://www.image-net.org/) dataset validation set. <br>Reproduce by `yolo val classify data=path/to/ImageNet device=0`
 - **Speed** averaged over ImageNet val images using an [Amazon EC2 P4d](https://aws.amazon.com/ec2/instance-types/p4/) instance. <br>Reproduce by `yolo val classify data=path/to/ImageNet batch=1 device=0|cpu`

{ultralytics-8.3.85 → ultralytics-8.3.87}/pyproject.toml

@@ -97,7 +97,7 @@ export = [
     "onnx>=1.12.0", # ONNX export
     "coremltools>=7.0; platform_system != 'Windows' and python_version <= '3.11'", # CoreML supported on macOS and Linux
     "scikit-learn>=1.3.2; platform_system != 'Windows' and python_version <= '3.11'", # CoreML k-means quantization
-    "openvino>=2024.0.0,<2025.0.0", # OpenVINO export
+    "openvino>=2024.0.0,!=2025.0.0", # OpenVINO export
     "tensorflow>=2.0.0", # TF bug https://github.com/ultralytics/ultralytics/issues/5161
     "tensorflowjs>=3.9.0", # TF.js export, automatically installs tensorflow
     "tensorstore>=0.1.63; platform_machine == 'aarch64' and python_version >= '3.9'", # for TF Raspberry Pi exports

{ultralytics-8.3.85 → ultralytics-8.3.87}/tests/test_solutions.py

@@ -8,8 +8,11 @@ from ultralytics import YOLO, solutions
 from ultralytics.utils import ASSETS_URL, WEIGHTS_DIR
 from ultralytics.utils.downloads import safe_download
 
-DEMO_VIDEO = "solutions_ci_demo.mp4"
-POSE_VIDEO = "solution_ci_pose_demo.mp4"
+DEMO_VIDEO = "solutions_ci_demo.mp4"  # for all the solutions, except workout and parking
+POSE_VIDEO = "solution_ci_pose_demo.mp4"  # only for workouts monitoring solution
+PARKING_VIDEO = "solution_ci_parking_demo.mp4"  # only for parking management solution
+PARKING_AREAS_JSON = "solution_ci_parking_areas.json"  # only for parking management solution
+PARKING_MODEL = "solutions_ci_parking_model.pt"  # only for parking management solution
 
 
 @pytest.mark.slow
@@ -62,6 +65,22 @@ def test_major_solutions():
         _ = gym.monitor(im0)
     cap.release()
 
+    # Test parking management
+    safe_download(url=f"{ASSETS_URL}/{PARKING_VIDEO}", dir=TMP)
+    safe_download(url=f"{ASSETS_URL}/{PARKING_AREAS_JSON}", dir=TMP)
+    safe_download(url=f"{ASSETS_URL}/{PARKING_MODEL}", dir=TMP)
+    cap = cv2.VideoCapture(str(TMP / PARKING_VIDEO))
+    assert cap.isOpened(), "Error reading video file"
+    parkingmanager = solutions.ParkingManagement(
+        json_file=str(TMP / PARKING_AREAS_JSON), model=str(TMP / PARKING_MODEL), show=False
+    )
+    while cap.isOpened():
+        success, im0 = cap.read()
+        if not success:
+            break
+        _ = parkingmanager.process_data(im0)
+    cap.release()
+
 
 @pytest.mark.slow
 def test_instance_segmentation():

{ultralytics-8.3.85 → ultralytics-8.3.87}/ultralytics/__init__.py

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

{ultralytics-8.3.85 → ultralytics-8.3.87}/ultralytics/cfg/__init__.py

@@ -656,7 +656,7 @@ def handle_yolo_solutions(args: List[str]) -> None:
         - For 'analytics' solution, frame numbers are tracked for generating analytical graphs
         - Video processing can be interrupted by pressing 'q'
         - Processes video frames sequentially and saves output in .avi format
-        - If no source is specified, downloads and uses a default sample video\
+        - If no source is specified, downloads and uses a default sample video
         - The inference solution will be launched using the 'streamlit run' command.
         - The Streamlit app file is located in the Ultralytics package directory.
     """
@@ -677,21 +677,19 @@ def handle_yolo_solutions(args: List[str]) -> None:
     check_dict_alignment(full_args_dict, overrides)  # dict alignment
 
     # Get solution name
-    if args and args[0] in SOLUTION_MAP:
-        if args[0] != "help":
-            s_n = args.pop(0)  # Extract the solution name directly
-        else:
-            LOGGER.info(SOLUTIONS_HELP_MSG)
+    if args[0] == "help":
+        LOGGER.info(SOLUTIONS_HELP_MSG)
+        return  # Early return for 'help' case
+    elif args[0] in SOLUTION_MAP:
+        solution_name = args.pop(0)  # Extract the solution name directly
     else:
         LOGGER.warning(
-            f"⚠️ No valid solution provided. Using default 'count'. Available: {', '.join(SOLUTION_MAP.keys())}"
+            f"❌ '{args[0]}' is not a valid solution. 💡 Defaulting to 'count'.\n"
+            f"🚀 Available solutions: {', '.join(list(SOLUTION_MAP.keys())[:-1])}\n"
         )
-        s_n = "count"  # Default solution if none provided
-
-    if args and args[0] == "help":  # Add check for return if user call `yolo solutions help`
-        return
+        solution_name = "count"  # Default for invalid solution
 
-    if s_n == "inference":
+    if solution_name == "inference":
         checks.check_requirements("streamlit>=1.29.0")
         LOGGER.info("💡 Loading Ultralytics live inference app...")
         subprocess.run(
@@ -705,10 +703,9 @@ def handle_yolo_solutions(args: List[str]) -> None:
             ]
         )
     else:
-        cls, method = SOLUTION_MAP[s_n]  # solution class name, method name and default source
-
-        from ultralytics import solutions  # import ultralytics solutions
+        from ultralytics import solutions
 
+        cls, method = SOLUTION_MAP[solution_name]  # solution class name, method name and default source
         solution = getattr(solutions, cls)(IS_CLI=True, **overrides)  # get solution class i.e ObjectCounter
         process = getattr(
             solution, method
@@ -717,17 +714,12 @@ def handle_yolo_solutions(args: List[str]) -> None:
         cap = cv2.VideoCapture(solution.CFG["source"])  # read the video file
 
         # extract width, height and fps of the video file, create save directory and initialize video writer
-        import os  # for directory creation
-        from pathlib import Path
-
-        from ultralytics.utils.files import increment_path  # for output directory path update
-
         w, h, fps = (int(cap.get(x)) for x in (cv2.CAP_PROP_FRAME_WIDTH, cv2.CAP_PROP_FRAME_HEIGHT, cv2.CAP_PROP_FPS))
-        if s_n == "analytics":  # analytical graphs follow fixed shape for output i.e w=1920, h=1080
+        if solution_name == "analytics":  # analytical graphs follow fixed shape for output i.e w=1920, h=1080
             w, h = 1920, 1080
-        save_dir = increment_path(Path("runs") / "solutions" / "exp", exist_ok=False)
-        save_dir.mkdir(parents=True, exist_ok=True)  # create the output directory
-        vw = cv2.VideoWriter(os.path.join(save_dir, "solution.avi"), cv2.VideoWriter_fourcc(*"mp4v"), fps, (w, h))
+        save_dir = get_save_dir(SimpleNamespace(project="runs/solutions", name="exp", exist_ok=False))
+        save_dir.mkdir(parents=True)  # create the output directory i.e. runs/solutions/exp
+        vw = cv2.VideoWriter(str(save_dir / f"{solution_name}.avi"), cv2.VideoWriter_fourcc(*"mp4v"), fps, (w, h))
 
         try:  # Process video frames
             f_n = 0  # frame number, required for analytical graphs
@@ -735,7 +727,7 @@ def handle_yolo_solutions(args: List[str]) -> None:
                 success, frame = cap.read()
                 if not success:
                     break
-                frame = process(frame, f_n := f_n + 1) if s_n == "analytics" else process(frame)
+                frame = process(frame, f_n := f_n + 1) if solution_name == "analytics" else process(frame)
                 vw.write(frame)
                 if cv2.waitKey(1) & 0xFF == ord("q"):
                     break

{ultralytics-8.3.85 → ultralytics-8.3.87}/ultralytics/cfg/datasets/Argoverse.yaml

@@ -28,26 +28,28 @@ names:
 # Download script/URL (optional) ---------------------------------------------------------------------------------------
 download: |
   import json
+  from pathlib import Path
+
   from tqdm import tqdm
   from ultralytics.utils.downloads import download
-  from pathlib import Path
 
   def argoverse2yolo(set):
+      """Convert Argoverse dataset annotations to YOLO format for object detection tasks."""
       labels = {}
       a = json.load(open(set, "rb"))
-      for annot in tqdm(a['annotations'], desc=f"Converting {set} to YOLOv5 format..."):
-          img_id = annot['image_id']
-          img_name = a['images'][img_id]['name']
-          img_label_name = f'{img_name[:-3]}txt'
+      for annot in tqdm(a["annotations"], desc=f"Converting {set} to YOLOv5 format..."):
+          img_id = annot["image_id"]
+          img_name = a["images"][img_id]["name"]
+          img_label_name = f"{img_name[:-3]}txt"
 
-          cls = annot['category_id']  # instance class id
-          x_center, y_center, width, height = annot['bbox']
+          cls = annot["category_id"]  # instance class id
+          x_center, y_center, width, height = annot["bbox"]
           x_center = (x_center + width / 2) / 1920.0  # offset and scale
           y_center = (y_center + height / 2) / 1200.0  # offset and scale
           width /= 1920.0  # scale
           height /= 1200.0  # scale
 
-          img_dir = set.parents[2] / 'Argoverse-1.1' / 'labels' / a['seq_dirs'][a['images'][annot['image_id']]['sid']]
+          img_dir = set.parents[2] / "Argoverse-1.1" / "labels" / a["seq_dirs"][a["images"][annot["image_id"]]["sid"]]
           if not img_dir.exists():
               img_dir.mkdir(parents=True, exist_ok=True)
 
@@ -57,19 +59,19 @@ download: |
           labels[k].append(f"{cls} {x_center} {y_center} {width} {height}\n")
 
       for k in labels:
-          with open(k, "w") as f:
+          with open(k, "w", encoding="utf-8") as f:
               f.writelines(labels[k])
 
 
   # Download 'https://argoverse-hd.s3.us-east-2.amazonaws.com/Argoverse-HD-Full.zip' (deprecated S3 link)
-  dir = Path(yaml['path'])  # dataset root dir
-  urls = ['https://drive.google.com/file/d/1st9qW3BeIwQsnR0t8mRpvbsSWIo16ACi/view?usp=drive_link']
+  dir = Path(yaml["path"])  # dataset root dir
+  urls = ["https://drive.google.com/file/d/1st9qW3BeIwQsnR0t8mRpvbsSWIo16ACi/view?usp=drive_link"]
   print("\n\nWARNING: Argoverse dataset MUST be downloaded manually, autodownload will NOT work.")
   print(f"WARNING: Manually download Argoverse dataset '{urls[0]}' to '{dir}' and re-run your command.\n\n")
   # download(urls, dir=dir)
 
   # Convert
-  annotations_dir = 'Argoverse-HD/annotations/'
-  (dir / 'Argoverse-1.1' / 'tracking').rename(dir / 'Argoverse-1.1' / 'images')  # rename 'tracking' to 'images'
+  annotations_dir = "Argoverse-HD/annotations/"
+  (dir / "Argoverse-1.1" / "tracking").rename(dir / "Argoverse-1.1" / "images")  # rename 'tracking' to 'images'
   for d in "train.json", "val.json":
       argoverse2yolo(dir / annotations_dir / d)  # convert Argoverse annotations to YOLO labels

{ultralytics-8.3.85 → ultralytics-8.3.87}/ultralytics/cfg/datasets/GlobalWheat2020.yaml

@@ -32,23 +32,37 @@ names:
 
 # Download script/URL (optional) ---------------------------------------------------------------------------------------
 download: |
-  from ultralytics.utils.downloads import download
   from pathlib import Path
 
+  from ultralytics.utils.downloads import download
+
   # Download
-  dir = Path(yaml['path'])  # dataset root dir
-  urls = ['https://zenodo.org/record/4298502/files/global-wheat-codalab-official.zip',
-          'https://github.com/ultralytics/assets/releases/download/v0.0.0/GlobalWheat2020_labels.zip']
+  dir = Path(yaml["path"])  # dataset root dir
+  urls = [
+      "https://zenodo.org/record/4298502/files/global-wheat-codalab-official.zip",
+      "https://github.com/ultralytics/assets/releases/download/v0.0.0/GlobalWheat2020_labels.zip",
+  ]
   download(urls, dir=dir)
 
   # Make Directories
-  for p in 'annotations', 'images', 'labels':
+  for p in "annotations", "images", "labels":
       (dir / p).mkdir(parents=True, exist_ok=True)
 
   # Move
-  for p in 'arvalis_1', 'arvalis_2', 'arvalis_3', 'ethz_1', 'rres_1', 'inrae_1', 'usask_1', \
-           'utokyo_1', 'utokyo_2', 'nau_1', 'uq_1':
-      (dir / 'global-wheat-codalab-official' / p).rename(dir / 'images' / p)  # move to /images
-      f = (dir / 'global-wheat-codalab-official' / p).with_suffix('.json')  # json file
+  for p in (
+      "arvalis_1",
+      "arvalis_2",
+      "arvalis_3",
+      "ethz_1",
+      "rres_1",
+      "inrae_1",
+      "usask_1",
+      "utokyo_1",
+      "utokyo_2",
+      "nau_1",
+      "uq_1",
+  ):
+      (dir / "global-wheat-codalab-official" / p).rename(dir / "images" / p)  # move to /images
+      f = (dir / "global-wheat-codalab-official" / p).with_suffix(".json")  # json file
       if f.exists():
-          f.rename((dir / 'annotations' / p).with_suffix('.json'))  # move to /annotations
+          f.rename((dir / "annotations" / p).with_suffix(".json"))  # move to /annotations

{ultralytics-8.3.85 → ultralytics-8.3.87}/ultralytics/cfg/datasets/ImageNet.yaml

@@ -2022,4 +2022,4 @@ map:
   n15075141: toilet_tissue
 
 # Download script/URL (optional)
-download: yolo/data/scripts/get_imagenet.sh
+download: ultralytics/data/scripts/get_imagenet.sh

{ultralytics-8.3.85 → ultralytics-8.3.87}/ultralytics/cfg/datasets/Objects365.yaml

@@ -384,58 +384,58 @@ names:
 
 # Download script/URL (optional) ---------------------------------------------------------------------------------------
 download: |
+  from pathlib import Path
+
+  import numpy as np
   from tqdm import tqdm
 
   from ultralytics.utils.checks import check_requirements
   from ultralytics.utils.downloads import download
   from ultralytics.utils.ops import xyxy2xywhn
 
-  import numpy as np
-  from pathlib import Path
-
-  check_requirements(('pycocotools>=2.0',))
+  check_requirements(("pycocotools>=2.0",))
   from pycocotools.coco import COCO
 
   # Make Directories
-  dir = Path(yaml['path'])  # dataset root dir
-  for p in 'images', 'labels':
+  dir = Path(yaml["path"])  # dataset root dir
+  for p in "images", "labels":
       (dir / p).mkdir(parents=True, exist_ok=True)
-      for q in 'train', 'val':
+      for q in "train", "val":
           (dir / p / q).mkdir(parents=True, exist_ok=True)
 
   # Train, Val Splits
-  for split, patches in [('train', 50 + 1), ('val', 43 + 1)]:
+  for split, patches in [("train", 50 + 1), ("val", 43 + 1)]:
       print(f"Processing {split} in {patches} patches ...")
-      images, labels = dir / 'images' / split, dir / 'labels' / split
+      images, labels = dir / "images" / split, dir / "labels" / split
 
       # Download
       url = f"https://dorc.ks3-cn-beijing.ksyun.com/data-set/2020Objects365%E6%95%B0%E6%8D%AE%E9%9B%86/{split}/"
-      if split == 'train':
-          download([f'{url}zhiyuan_objv2_{split}.tar.gz'], dir=dir)  # annotations json
-          download([f'{url}patch{i}.tar.gz' for i in range(patches)], dir=images, curl=True, threads=8)
-      elif split == 'val':
-          download([f'{url}zhiyuan_objv2_{split}.json'], dir=dir)  # annotations json
-          download([f'{url}images/v1/patch{i}.tar.gz' for i in range(15 + 1)], dir=images, curl=True, threads=8)
-          download([f'{url}images/v2/patch{i}.tar.gz' for i in range(16, patches)], dir=images, curl=True, threads=8)
+      if split == "train":
+          download([f"{url}zhiyuan_objv2_{split}.tar.gz"], dir=dir)  # annotations json
+          download([f"{url}patch{i}.tar.gz" for i in range(patches)], dir=images, curl=True, threads=8)
+      elif split == "val":
+          download([f"{url}zhiyuan_objv2_{split}.json"], dir=dir)  # annotations json
+          download([f"{url}images/v1/patch{i}.tar.gz" for i in range(15 + 1)], dir=images, curl=True, threads=8)
+          download([f"{url}images/v2/patch{i}.tar.gz" for i in range(16, patches)], dir=images, curl=True, threads=8)
 
       # Move
-      for f in tqdm(images.rglob('*.jpg'), desc=f'Moving {split} images'):
+      for f in tqdm(images.rglob("*.jpg"), desc=f"Moving {split} images"):
           f.rename(images / f.name)  # move to /images/{split}
 
       # Labels
-      coco = COCO(dir / f'zhiyuan_objv2_{split}.json')
+      coco = COCO(dir / f"zhiyuan_objv2_{split}.json")
       names = [x["name"] for x in coco.loadCats(coco.getCatIds())]
       for cid, cat in enumerate(names):
           catIds = coco.getCatIds(catNms=[cat])
           imgIds = coco.getImgIds(catIds=catIds)
-          for im in tqdm(coco.loadImgs(imgIds), desc=f'Class {cid + 1}/{len(names)} {cat}'):
+          for im in tqdm(coco.loadImgs(imgIds), desc=f"Class {cid + 1}/{len(names)} {cat}"):
               width, height = im["width"], im["height"]
               path = Path(im["file_name"])  # image filename
               try:
-                  with open(labels / path.with_suffix('.txt').name, 'a') as file:
+                  with open(labels / path.with_suffix(".txt").name, "a", encoding="utf-8") as file:
                       annIds = coco.getAnnIds(imgIds=im["id"], catIds=catIds, iscrowd=None)
                       for a in coco.loadAnns(annIds):
-                          x, y, w, h = a['bbox']  # bounding box in xywh (xy top-left corner)
+                          x, y, w, h = a["bbox"]  # bounding box in xywh (xy top-left corner)
                           xyxy = np.array([x, y, x + w, y + h])[None]  # pixels(1,4)
                           x, y, w, h = xyxy2xywhn(xyxy, w=width, h=height, clip=True)[0]  # normalized and clipped
                           file.write(f"{cid} {x:.5f} {y:.5f} {w:.5f} {h:.5f}\n")

{ultralytics-8.3.85 → ultralytics-8.3.87}/ultralytics/cfg/datasets/SKU-110K.yaml

@@ -31,27 +31,27 @@ download: |
   from ultralytics.utils.ops import xyxy2xywh
 
   # Download
-  dir = Path(yaml['path'])  # dataset root dir
+  dir = Path(yaml["path"])  # dataset root dir
   parent = Path(dir.parent)  # download dir
-  urls = ['http://trax-geometry.s3.amazonaws.com/cvpr_challenge/SKU110K_fixed.tar.gz']
+  urls = ["http://trax-geometry.s3.amazonaws.com/cvpr_challenge/SKU110K_fixed.tar.gz"]
   download(urls, dir=parent)
 
   # Rename directories
   if dir.exists():
       shutil.rmtree(dir)
-  (parent / 'SKU110K_fixed').rename(dir)  # rename dir
-  (dir / 'labels').mkdir(parents=True, exist_ok=True)  # create labels dir
+  (parent / "SKU110K_fixed").rename(dir)  # rename dir
+  (dir / "labels").mkdir(parents=True, exist_ok=True)  # create labels dir
 
   # Convert labels
-  names = 'image', 'x1', 'y1', 'x2', 'y2', 'class', 'image_width', 'image_height'  # column names
-  for d in 'annotations_train.csv', 'annotations_val.csv', 'annotations_test.csv':
-      x = pd.read_csv(dir / 'annotations' / d, names=names).values  # annotations
+  names = "image", "x1", "y1", "x2", "y2", "class", "image_width", "image_height"  # column names
+  for d in "annotations_train.csv", "annotations_val.csv", "annotations_test.csv":
+      x = pd.read_csv(dir / "annotations" / d, names=names).values  # annotations
       images, unique_images = x[:, 0], np.unique(x[:, 0])
-      with open((dir / d).with_suffix('.txt').__str__().replace('annotations_', ''), 'w') as f:
-          f.writelines(f'./images/{s}\n' for s in unique_images)
-      for im in tqdm(unique_images, desc=f'Converting {dir / d}'):
+      with open((dir / d).with_suffix(".txt").__str__().replace("annotations_", ""), "w", encoding="utf-8") as f:
+          f.writelines(f"./images/{s}\n" for s in unique_images)
+      for im in tqdm(unique_images, desc=f"Converting {dir / d}"):
           cls = 0  # single-class dataset
-          with open((dir / 'labels' / im).with_suffix('.txt'), 'a') as f:
+          with open((dir / "labels" / im).with_suffix(".txt"), "a", encoding="utf-8") as f:
               for r in x[images == im]:
                   w, h = r[6], r[7]  # image width, height
                   xywh = xyxy2xywh(np.array([[r[1] / w, r[2] / h, r[3] / w, r[4] / h]]))[0]  # instance

{ultralytics-8.3.85 → ultralytics-8.3.87}/ultralytics/cfg/datasets/VOC.yaml

@@ -46,55 +46,61 @@ names:
 # Download script/URL (optional) ---------------------------------------------------------------------------------------
 download: |
   import xml.etree.ElementTree as ET
+  from pathlib import Path
 
   from tqdm import tqdm
+
   from ultralytics.utils.downloads import download
-  from pathlib import Path
+
 
   def convert_label(path, lb_path, year, image_id):
+      """Converts XML annotations from VOC format to YOLO format by extracting bounding boxes and class IDs."""
+
       def convert_box(size, box):
-          dw, dh = 1. / size[0], 1. / size[1]
+          dw, dh = 1.0 / size[0], 1.0 / size[1]
           x, y, w, h = (box[0] + box[1]) / 2.0 - 1, (box[2] + box[3]) / 2.0 - 1, box[1] - box[0], box[3] - box[2]
           return x * dw, y * dh, w * dw, h * dh
 
-      in_file = open(path / f'VOC{year}/Annotations/{image_id}.xml')
-      out_file = open(lb_path, 'w')
+      in_file = open(path / f"VOC{year}/Annotations/{image_id}.xml")
+      out_file = open(lb_path, "w")
       tree = ET.parse(in_file)
       root = tree.getroot()
-      size = root.find('size')
-      w = int(size.find('width').text)
-      h = int(size.find('height').text)
+      size = root.find("size")
+      w = int(size.find("width").text)
+      h = int(size.find("height").text)
 
-      names = list(yaml['names'].values())  # names list
-      for obj in root.iter('object'):
-          cls = obj.find('name').text
-          if cls in names and int(obj.find('difficult').text) != 1:
-              xmlbox = obj.find('bndbox')
-              bb = convert_box((w, h), [float(xmlbox.find(x).text) for x in ('xmin', 'xmax', 'ymin', 'ymax')])
+      names = list(yaml["names"].values())  # names list
+      for obj in root.iter("object"):
+          cls = obj.find("name").text
+          if cls in names and int(obj.find("difficult").text) != 1:
+              xmlbox = obj.find("bndbox")
+              bb = convert_box((w, h), [float(xmlbox.find(x).text) for x in ("xmin", "xmax", "ymin", "ymax")])
               cls_id = names.index(cls)  # class id
-              out_file.write(" ".join(str(a) for a in (cls_id, *bb)) + '\n')
+              out_file.write(" ".join(str(a) for a in (cls_id, *bb)) + "\n")
 
 
   # Download
-  dir = Path(yaml['path'])  # dataset root dir
-  url = 'https://github.com/ultralytics/assets/releases/download/v0.0.0/'
-  urls = [f'{url}VOCtrainval_06-Nov-2007.zip',  # 446MB, 5012 images
-          f'{url}VOCtest_06-Nov-2007.zip',  # 438MB, 4953 images
-          f'{url}VOCtrainval_11-May-2012.zip']  # 1.95GB, 17126 images
-  download(urls, dir=dir / 'images', curl=True, threads=3, exist_ok=True)  # download and unzip over existing paths (required)
+  dir = Path(yaml["path"])  # dataset root dir
+  url = "https://github.com/ultralytics/assets/releases/download/v0.0.0/"
+  urls = [
+      f"{url}VOCtrainval_06-Nov-2007.zip",  # 446MB, 5012 images
+      f"{url}VOCtest_06-Nov-2007.zip",  # 438MB, 4953 images
+      f"{url}VOCtrainval_11-May-2012.zip",  # 1.95GB, 17126 images
+  ]
+  download(urls, dir=dir / "images", curl=True, threads=3, exist_ok=True)  # download and unzip over existing (required)
 
   # Convert
-  path = dir / 'images/VOCdevkit'
-  for year, image_set in ('2012', 'train'), ('2012', 'val'), ('2007', 'train'), ('2007', 'val'), ('2007', 'test'):
-      imgs_path = dir / 'images' / f'{image_set}{year}'
-      lbs_path = dir / 'labels' / f'{image_set}{year}'
+  path = dir / "images/VOCdevkit"
+  for year, image_set in ("2012", "train"), ("2012", "val"), ("2007", "train"), ("2007", "val"), ("2007", "test"):
+      imgs_path = dir / "images" / f"{image_set}{year}"
+      lbs_path = dir / "labels" / f"{image_set}{year}"
       imgs_path.mkdir(exist_ok=True, parents=True)
       lbs_path.mkdir(exist_ok=True, parents=True)
 
-      with open(path / f'VOC{year}/ImageSets/Main/{image_set}.txt') as f:
+      with open(path / f"VOC{year}/ImageSets/Main/{image_set}.txt") as f:
           image_ids = f.read().strip().split()
-      for id in tqdm(image_ids, desc=f'{image_set}{year}'):
-          f = path / f'VOC{year}/JPEGImages/{id}.jpg'  # old img path
-          lb_path = (lbs_path / f.name).with_suffix('.txt')  # new label path
+      for id in tqdm(image_ids, desc=f"{image_set}{year}"):
+          f = path / f"VOC{year}/JPEGImages/{id}.jpg"  # old img path
+          lb_path = (lbs_path / f.name).with_suffix(".txt")  # new label path
           f.rename(imgs_path / f.name)  # move image
           convert_label(path, lb_path, year, id)  # convert labels to YOLO format

{ultralytics-8.3.85 → ultralytics-8.3.87}/ultralytics/cfg/datasets/VisDrone.yaml

@@ -34,40 +34,44 @@ download: |
 
   from ultralytics.utils.downloads import download
 
+
   def visdrone2yolo(dir):
+      """Convert VisDrone annotations to YOLO format, creating label files with normalized bounding box coordinates."""
       from PIL import Image
       from tqdm import tqdm
 
       def convert_box(size, box):
           # Convert VisDrone box to YOLO xywh box
-          dw = 1. / size[0]
-          dh = 1. / size[1]
+          dw = 1.0 / size[0]
+          dh = 1.0 / size[1]
           return (box[0] + box[2] / 2) * dw, (box[1] + box[3] / 2) * dh, box[2] * dw, box[3] * dh
 
-      (dir / 'labels').mkdir(parents=True, exist_ok=True)  # make labels directory
-      pbar = tqdm((dir / 'annotations').glob('*.txt'), desc=f'Converting {dir}')
+      (dir / "labels").mkdir(parents=True, exist_ok=True)  # make labels directory
+      pbar = tqdm((dir / "annotations").glob("*.txt"), desc=f"Converting {dir}")
       for f in pbar:
-          img_size = Image.open((dir / 'images' / f.name).with_suffix('.jpg')).size
+          img_size = Image.open((dir / "images" / f.name).with_suffix(".jpg")).size
           lines = []
-          with open(f, 'r') as file:  # read annotation.txt
-              for row in [x.split(',') for x in file.read().strip().splitlines()]:
-                  if row[4] == '0':  # VisDrone 'ignored regions' class 0
+          with open(f, encoding="utf-8") as file:  # read annotation.txt
+              for row in [x.split(",") for x in file.read().strip().splitlines()]:
+                  if row[4] == "0":  # VisDrone 'ignored regions' class 0
                       continue
                   cls = int(row[5]) - 1
                   box = convert_box(img_size, tuple(map(int, row[:4])))
                   lines.append(f"{cls} {' '.join(f'{x:.6f}' for x in box)}\n")
-                  with open(str(f).replace(f'{os.sep}annotations{os.sep}', f'{os.sep}labels{os.sep}'), 'w') as fl:
+                  with open(str(f).replace(f"{os.sep}annotations{os.sep}", f"{os.sep}labels{os.sep}"), "w", encoding="utf-8") as fl:
                       fl.writelines(lines)  # write label.txt
 
 
   # Download
-  dir = Path(yaml['path'])  # dataset root dir
-  urls = ['https://github.com/ultralytics/assets/releases/download/v0.0.0/VisDrone2019-DET-train.zip',
-          'https://github.com/ultralytics/assets/releases/download/v0.0.0/VisDrone2019-DET-val.zip',
-          'https://github.com/ultralytics/assets/releases/download/v0.0.0/VisDrone2019-DET-test-dev.zip',
-          'https://github.com/ultralytics/assets/releases/download/v0.0.0/VisDrone2019-DET-test-challenge.zip']
+  dir = Path(yaml["path"])  # dataset root dir
+  urls = [
+      "https://github.com/ultralytics/assets/releases/download/v0.0.0/VisDrone2019-DET-train.zip",
+      "https://github.com/ultralytics/assets/releases/download/v0.0.0/VisDrone2019-DET-val.zip",
+      "https://github.com/ultralytics/assets/releases/download/v0.0.0/VisDrone2019-DET-test-dev.zip",
+      "https://github.com/ultralytics/assets/releases/download/v0.0.0/VisDrone2019-DET-test-challenge.zip",
+  ]
   download(urls, dir=dir, curl=True, threads=4)
 
   # Convert
-  for d in 'VisDrone2019-DET-train', 'VisDrone2019-DET-val', 'VisDrone2019-DET-test-dev':
+  for d in "VisDrone2019-DET-train", "VisDrone2019-DET-val", "VisDrone2019-DET-test-dev":
       visdrone2yolo(dir / d)  # convert VisDrone annotations to YOLO labels