ultralytics 8.3.105__tar.gz → 8.3.106__tar.gz

{ultralytics-8.3.105/ultralytics.egg-info → ultralytics-8.3.106}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ultralytics
-Version: 8.3.105
+Version: 8.3.106
 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>

{ultralytics-8.3.105 → ultralytics-8.3.106}/pyproject.toml

@@ -134,7 +134,7 @@ ultralytics = "ultralytics.cfg:entrypoint"
 # Tools settings -------------------------------------------------------------------------------------------------------
 [tool.setuptools]  # configuration specific to the `setuptools` build backend.
 packages = { find = { where = ["."], include = ["ultralytics", "ultralytics.*"] } }
-package-data = { "ultralytics" = ["**/*.yaml", "../tests/*.py"], "ultralytics.assets" = ["*.jpg"] }
+package-data = { "ultralytics" = ["**/*.yaml"], "ultralytics.assets" = ["*.jpg"] }
 
 [tool.setuptools.dynamic]
 version = { attr = "ultralytics.__version__" }

{ultralytics-8.3.105 → ultralytics-8.3.106}/ultralytics/__init__.py

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

{ultralytics-8.3.105 → ultralytics-8.3.106}/ultralytics/engine/exporter.py

@@ -86,7 +86,6 @@ from ultralytics.utils import (
     LINUX,
     LOGGER,
     MACOS,
-    PYTHON_VERSION,
     RKNN_CHIPS,
     ROOT,
     WINDOWS,
@@ -795,7 +794,7 @@ class Exporter:
     def export_coreml(self, prefix=colorstr("CoreML:")):
         """YOLO CoreML export."""
         mlmodel = self.args.format.lower() == "mlmodel"  # legacy *.mlmodel export format requested
-        check_requirements("coremltools>=6.0,<=6.2" if mlmodel else "coremltools>=8.0")
+        check_requirements("coremltools>=8.0")
         import coremltools as ct  # noqa
 
         LOGGER.info(f"\n{prefix} starting export with coremltools {ct.__version__}...")
@@ -819,11 +818,15 @@ class Exporter:
                 # TODO CoreML Segment and Pose model pipelining
             model = self.model
         ts = torch.jit.trace(model.eval(), self.im, strict=False)  # TorchScript model
+
+        # Based on apple's documentation it is better to leave out the minimum_deployment target and let that get set
+        # Internally based on the model conversion and output type.
+        # Setting minimum_depoloyment_target >= iOS16 will require setting compute_precision=ct.precision.FLOAT32.
+        # iOS16 adds in better support for FP16, but none of the CoreML NMS specifications handle FP16 as input.
         ct_model = ct.convert(
             ts,
             inputs=[ct.ImageType("image", shape=self.im.shape, scale=scale, bias=bias)],  # expects ct.TensorType
             classifier_config=classifier_config,
-            minimum_deployment_target=ct.target.iOS15,  # warning: >=16 causes pipeline errors
             convert_to="neuralnetwork" if mlmodel else "mlprogram",
         )
         bits, mode = (8, "kmeans") if self.args.int8 else (16, "linear") if self.args.half else (32, None)
@@ -840,8 +843,6 @@ class Exporter:
                 ct_model = cto.palettize_weights(ct_model, config=config)
         if self.args.nms and self.model.task == "detect":
             if mlmodel:
-                # coremltools<=6.2 NMS export requires Python<3.11
-                check_version(PYTHON_VERSION, "<3.11", name="Python ", hard=True)
                 weights_dir = None
             else:
                 ct_model.save(str(f))  # save otherwise weights_dir does not exist
@@ -1469,7 +1470,7 @@ class Exporter:
 
         # 3. Create NMS protobuf
         nms_spec = ct.proto.Model_pb2.Model()
-        nms_spec.specificationVersion = 9
+        nms_spec.specificationVersion = spec.specificationVersion
         for i in range(2):
             decoder_output = model._spec.description.output[i].SerializeToString()
             nms_spec.description.input.add()
@@ -1522,7 +1523,7 @@ class Exporter:
         pipeline.spec.description.output[1].ParseFromString(nms_model._spec.description.output[1].SerializeToString())
 
         # Update metadata
-        pipeline.spec.specificationVersion = 9
+        pipeline.spec.specificationVersion = spec.specificationVersion
         pipeline.spec.description.metadata.userDefined.update(
             {"IoU threshold": str(nms.iouThreshold), "Confidence threshold": str(nms.confidenceThreshold)}
         )

{ultralytics-8.3.105 → ultralytics-8.3.106/ultralytics.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ultralytics
-Version: 8.3.105
+Version: 8.3.106
 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>

{ultralytics-8.3.105 → ultralytics-8.3.106}/ultralytics.egg-info/SOURCES.txt

@@ -15,15 +15,6 @@ ultralytics.egg-info/dependency_links.txt
 ultralytics.egg-info/entry_points.txt
 ultralytics.egg-info/requires.txt
 ultralytics.egg-info/top_level.txt
-ultralytics/../tests/__init__.py
-ultralytics/../tests/conftest.py
-ultralytics/../tests/test_cli.py
-ultralytics/../tests/test_cuda.py
-ultralytics/../tests/test_engine.py
-ultralytics/../tests/test_exports.py
-ultralytics/../tests/test_integrations.py
-ultralytics/../tests/test_python.py
-ultralytics/../tests/test_solutions.py
 ultralytics/assets/bus.jpg
 ultralytics/assets/zidane.jpg
 ultralytics/cfg/__init__.py

ultralytics-8.3.105/tests/__init__.py

@@ -1,22 +0,0 @@
-# Ultralytics 🚀 AGPL-3.0 License - https://ultralytics.com/license
-
-from ultralytics.utils import ASSETS, ROOT, WEIGHTS_DIR, checks
-
-# Constants used in tests
-MODEL = WEIGHTS_DIR / "path with spaces" / "yolo11n.pt"  # test spaces in path
-CFG = "yolo11n.yaml"
-SOURCE = ASSETS / "bus.jpg"
-SOURCES_LIST = [ASSETS / "bus.jpg", ASSETS, ASSETS / "*", ASSETS / "**/*.jpg"]
-TMP = (ROOT / "../tests/tmp").resolve()  # temp directory for test files
-CUDA_IS_AVAILABLE = checks.cuda_is_available()
-CUDA_DEVICE_COUNT = checks.cuda_device_count()
-
-__all__ = (
-    "MODEL",
-    "CFG",
-    "SOURCE",
-    "SOURCES_LIST",
-    "TMP",
-    "CUDA_IS_AVAILABLE",
-    "CUDA_DEVICE_COUNT",
-)

ultralytics-8.3.105/tests/conftest.py

@@ -1,83 +0,0 @@
-# Ultralytics 🚀 AGPL-3.0 License - https://ultralytics.com/license
-
-import shutil
-from pathlib import Path
-
-from tests import TMP
-
-
-def pytest_addoption(parser):
-    """
-    Add custom command-line options to pytest.
-
-    Args:
-        parser (pytest.config.Parser): The pytest parser object for adding custom command-line options.
-
-    Returns:
-        (None)
-    """
-    parser.addoption("--slow", action="store_true", default=False, help="Run slow tests")
-
-
-def pytest_collection_modifyitems(config, items):
-    """
-    Modify the list of test items to exclude tests marked as slow if the --slow option is not specified.
-
-    Args:
-        config (pytest.config.Config): The pytest configuration object that provides access to command-line options.
-        items (list): The list of collected pytest item objects to be modified based on the presence of --slow option.
-
-    Returns:
-        (None): The function modifies the 'items' list in place.
-    """
-    if not config.getoption("--slow"):
-        # Remove the item entirely from the list of test items if it's marked as 'slow'
-        items[:] = [item for item in items if "slow" not in item.keywords]
-
-
-def pytest_sessionstart(session):
-    """
-    Initialize session configurations for pytest.
-
-    This function is automatically called by pytest after the 'Session' object has been created but before performing
-    test collection. It sets the initial seeds and prepares the temporary directory for the test session.
-
-    Args:
-        session (pytest.Session): The pytest session object.
-
-    Returns:
-        (None)
-    """
-    from ultralytics.utils.torch_utils import init_seeds
-
-    init_seeds()
-    shutil.rmtree(TMP, ignore_errors=True)  # delete any existing tests/tmp directory
-    TMP.mkdir(parents=True, exist_ok=True)  # create a new empty directory
-
-
-def pytest_terminal_summary(terminalreporter, exitstatus, config):
-    """
-    Cleanup operations after pytest session.
-
-    This function is automatically called by pytest at the end of the entire test session. It removes certain files
-    and directories used during testing.
-
-    Args:
-        terminalreporter (pytest.terminal.TerminalReporter): The terminal reporter object used for terminal output.
-        exitstatus (int): The exit status of the test run.
-        config (pytest.config.Config): The pytest config object.
-
-    Returns:
-        (None)
-    """
-    from ultralytics.utils import WEIGHTS_DIR
-
-    # Remove files
-    models = [path for x in ["*.onnx", "*.torchscript"] for path in WEIGHTS_DIR.rglob(x)]
-    for file in ["decelera_portrait_min.mov", "bus.jpg", "yolo11n.onnx", "yolo11n.torchscript"] + models:
-        Path(file).unlink(missing_ok=True)
-
-    # Remove directories
-    models = [path for x in ["*.mlpackage", "*_openvino_model"] for path in WEIGHTS_DIR.rglob(x)]
-    for directory in [WEIGHTS_DIR / "path with spaces", TMP.parents[1] / ".pytest_cache", TMP] + models:
-        shutil.rmtree(directory, ignore_errors=True)