ultralytics 8.3.62__py3-none-any.whl → 8.3.63__py3-none-any.whl

ultralytics/__init__.py

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

ultralytics/data/build.py

@@ -49,10 +49,11 @@ class InfiniteDataLoader(dataloader.DataLoader):
 
     def __del__(self):
         """Ensure that workers are terminated."""
-        for w in self.iterator._workers:  # force terminate
-            if w.is_alive():
-                w.terminate()
-        self.iterator._shutdown_workers()  # cleanup
+        if hasattr(self.iterator, "_workers"):
+            for w in self.iterator._workers:  # force terminate
+                if w.is_alive():
+                    w.terminate()
+            self.iterator._shutdown_workers()  # cleanup
 
     def reset(self):
         """

ultralytics/data/utils.py

@@ -567,7 +567,7 @@ class HUBDatasetStats:
 
             # Get dataset statistics
             if self.task == "classify":
-                from torchvision.datasets import ImageFolder
+                from torchvision.datasets import ImageFolder  # scope for faster 'import ultralytics'
 
                 dataset = ImageFolder(self.data[split])
 

ultralytics/engine/exporter.py

@@ -91,7 +91,13 @@ from ultralytics.utils import (
     get_default_args,
     yaml_save,
 )
-from ultralytics.utils.checks import check_imgsz, check_is_path_safe, check_requirements, check_version
+from ultralytics.utils.checks import (
+    check_imgsz,
+    check_is_path_safe,
+    check_requirements,
+    check_version,
+    is_sudo_available,
+)
 from ultralytics.utils.downloads import attempt_download_asset, get_github_assets, safe_download
 from ultralytics.utils.files import file_size, spaces_in_path
 from ultralytics.utils.ops import Profile
@@ -1071,7 +1077,6 @@ class Exporter:
         assert LINUX, f"export only supported on Linux. See {help_url}"
         if subprocess.run(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, shell=True).returncode != 0:
             LOGGER.info(f"\n{prefix} export requires Edge TPU compiler. Attempting install from {help_url}")
-            sudo = subprocess.run("sudo --version >/dev/null", shell=True).returncode == 0  # sudo installed on system
             for c in (
                 "curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add -",
                 'echo "deb https://packages.cloud.google.com/apt coral-edgetpu-stable main" | '
@@ -1079,7 +1084,7 @@ class Exporter:
                 "sudo apt-get update",
                 "sudo apt-get install edgetpu-compiler",
             ):
-                subprocess.run(c if sudo else c.replace("sudo ", ""), shell=True, check=True)
+                subprocess.run(c if is_sudo_available() else c.replace("sudo ", ""), shell=True, check=True)
         ver = subprocess.run(cmd, shell=True, capture_output=True, check=True).stdout.decode().split()[-1]
 
         LOGGER.info(f"\n{prefix} starting export with Edge TPU compiler {ver}...")
@@ -1160,7 +1165,10 @@ class Exporter:
             if "openjdk 17" not in str(out.stdout):
                 raise FileNotFoundError
         except FileNotFoundError:
-            subprocess.run(["sudo", "apt", "install", "-y", "openjdk-17-jdk", "openjdk-17-jre"], check=True)
+            c = ["apt", "install", "-y", "openjdk-17-jdk", "openjdk-17-jre"]
+            if is_sudo_available():
+                c.insert(0, "sudo")
+            subprocess.run(c, check=True)
 
         def representative_dataset_gen(dataloader=self.get_int8_calibration_dataloader(prefix)):
             for batch in dataloader:

ultralytics/engine/results.py

@@ -839,7 +839,7 @@ class Results(SimpleClass):
             >>> df_result = results[0].to_df()
             >>> print(df_result)
         """
-        import pandas as pd
+        import pandas as pd  # scope for faster 'import ultralytics'
 
         return pd.DataFrame(self.summary(normalize=normalize, decimals=decimals))
 

ultralytics/engine/trainer.py

@@ -271,6 +271,7 @@ class BaseTrainer:
         )
         if world_size > 1:
             self.model = nn.parallel.DistributedDataParallel(self.model, device_ids=[RANK], find_unused_parameters=True)
+            self.set_model_attributes()  # set again after DDP wrapper
 
         # Check imgsz
         gs = max(int(self.model.stride.max() if hasattr(self.model, "stride") else 32), 32)  # grid size (max stride)

ultralytics/nn/modules/block.py

@@ -1131,7 +1131,7 @@ class TorchVision(nn.Module):
 
     def __init__(self, c1, c2, model, weights="DEFAULT", unwrap=True, truncate=2, split=False):
         """Load the model and weights from torchvision."""
-        import torchvision
+        import torchvision  # scope for faster 'import ultralytics'
 
         super().__init__()
         if hasattr(torchvision.models, "get_model"):

ultralytics/nn/tasks.py

@@ -7,6 +7,7 @@ import types
 from copy import deepcopy
 from pathlib import Path
 
+import thop
 import torch
 import torch.nn as nn
 
@@ -86,11 +87,6 @@ from ultralytics.utils.torch_utils import (
     time_sync,
 )
 
-try:
-    import thop
-except ImportError:
-    thop = None
-
 
 class BaseModel(nn.Module):
     """The BaseModel class serves as a base class for all the models in the Ultralytics YOLO family."""

ultralytics/utils/checks.py

@@ -782,6 +782,18 @@ def cuda_is_available() -> bool:
     return cuda_device_count() > 0
 
 
+def is_sudo_available() -> bool:
+    """
+    Check if the sudo command is available in the environment.
+
+    Returns:
+        bool: True if the sudo command is available, False otherwise.
+    """
+    if WINDOWS:
+        return False
+    return subprocess.run(["sudo", "--version"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL).returncode == 0
+
+
 # Run checks and define constants
 check_python("3.8", hard=False, verbose=True)  # check python version
 check_torchvision()  # check torch-torchvision compatibility

ultralytics/utils/torch_utils.py

@@ -12,6 +12,7 @@ from pathlib import Path
 from typing import Union
 
 import numpy as np
+import thop
 import torch
 import torch.distributed as dist
 import torch.nn as nn
@@ -30,11 +31,6 @@ from ultralytics.utils import (
 )
 from ultralytics.utils.checks import check_version
 
-try:
-    import thop
-except ImportError:
-    thop = None
-
 # Version checks (all default to version>=min_version)
 TORCH_1_9 = check_version(torch.__version__, "1.9.0")
 TORCH_1_13 = check_version(torch.__version__, "1.13.0")
@@ -367,9 +363,6 @@ def model_info_for_loggers(trainer):
 
 def get_flops(model, imgsz=640):
     """Return a YOLO model's FLOPs."""
-    if not thop:
-        return 0.0  # if not installed return 0.0 GFLOPs
-
     try:
         model = de_parallel(model)
         p = next(model.parameters())
@@ -674,7 +667,7 @@ def profile(input, ops, n=10, device=None, max_num_obj=0):
             m = m.half() if hasattr(m, "half") and isinstance(x, torch.Tensor) and x.dtype is torch.float16 else m
             tf, tb, t = 0, 0, [0, 0, 0]  # dt forward, backward
             try:
-                flops = thop.profile(m, inputs=[x], verbose=False)[0] / 1e9 * 2 if thop else 0  # GFLOPs
+                flops = thop.profile(m, inputs=[x], verbose=False)[0] / 1e9 * 2  # GFLOPs
             except Exception:
                 flops = 0
 

{ultralytics-8.3.62.dist-info → ultralytics-8.3.63.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ultralytics
-Version: 8.3.62
+Version: 8.3.63
 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.62.dist-info → ultralytics-8.3.63.dist-info}/RECORD

@@ -7,7 +7,7 @@ tests/test_exports.py,sha256=bvi2GgwxiAIpnAEQQ4iImffA7zke65_CDwoXOF7anuE,8797
 tests/test_integrations.py,sha256=p3DMnnPMKsV0Qm82JVJUIY1UZ67xRgF9E8AaL76TEHE,6154
 tests/test_python.py,sha256=tW-EFJC2rjl_DvAa8khXGWYdypseQjrLjGHhe2p9r9A,23238
 tests/test_solutions.py,sha256=aY0G3vNzXGCENG9FD76MfUp7jgzeESPsUvbvQYBUvH0,4205
-ultralytics/__init__.py,sha256=pEv-5OhALZ4K3_-5J8oYJDzOlz0DjKBjMdw_KS3erec,709
+ultralytics/__init__.py,sha256=sEEOEjr5AbRIanmikSj9X77osBrjhBQkbM_yZAUJjFw,709
 ultralytics/assets/bus.jpg,sha256=wCAZxJecGR63Od3ZRERe9Aja1Weayrb9Ug751DS_vGM,137419
 ultralytics/assets/zidane.jpg,sha256=Ftc4aeMmen1O0A3o6GCDO9FlfBslLpTAw0gnetx7bts,50427
 ultralytics/cfg/__init__.py,sha256=9xBYqfr4VxaDx3MkyK0ePIOr8iZ7BfCC2H1VNqfFInQ,39601
@@ -95,18 +95,18 @@ ultralytics/data/__init__.py,sha256=nAXaL1puCc7z_NjzQNlJnhbVhT9Fla2u7Dsqo7q1dAc,
 ultralytics/data/annotator.py,sha256=jbKHB5l5IYOG1YOgCxA6czU_ivb3NPAACrtPe6-bVn4,3145
 ultralytics/data/augment.py,sha256=A9yBpNU0JkHMNTYdsN1gYPwmXFjb2S23i7HU99Bsqlk,120719
 ultralytics/data/base.py,sha256=NTNdn-Emgx3Z2vats8i8oEe-9yosPmHd53v1A0xz0EU,15196
-ultralytics/data/build.py,sha256=QJoGCkIwoRgwUhLBq9db1_ZfYRDEemKVEgQUr3_yU88,7535
+ultralytics/data/build.py,sha256=TsDx_rNzREtSPs07_qtQALNdZ5w7OV9SJ4I1JXY9wcY,7598
 ultralytics/data/converter.py,sha256=89E44LBCpbn5hMF03Kdts6DaTP8Oei5iCra5enFCt5I,24467
 ultralytics/data/dataset.py,sha256=lxtH3JytNu6nsiPAIhe0uGuGGpkZ4ZRqvXM6eJw9rXU,23244
 ultralytics/data/loaders.py,sha256=JOwXbz-dxgG2bx0_cQHp-olz5FleoCX8EzrUvZ77vvg,28534
 ultralytics/data/split_dota.py,sha256=NgnGcEJE2iVfGCoJUIeKUxhu_kGg6dln6UTajUqT-_k,10720
-ultralytics/data/utils.py,sha256=9b9RDQGw-XZFHpFCrNWLQJdgBJg8fQJalYS7r1GNUKU,33801
+ultralytics/data/utils.py,sha256=EoSlxcz5orjChBZbtzgIyddKuO3DFcuKVRBUWvpEk_4,33842
 ultralytics/engine/__init__.py,sha256=lm6MckFYCPTbqIoX7w0s_daxdjNeBeKW6DXppv1-QUM,70
-ultralytics/engine/exporter.py,sha256=uazRrAa65xI5xT2c_Ez3vkEvCDrinhXn-pvYMf085n8,69133
+ultralytics/engine/exporter.py,sha256=tijlUOzhJHs6IUExYLGMLPDdxVpruPb9BmPmTRZ8s24,69155
 ultralytics/engine/model.py,sha256=tgzwnspighsesavuOEpirHS_5VPukQinj9sBAUnXpUE,53110
 ultralytics/engine/predictor.py,sha256=I66hWs-SV6Yu8QTsrr9ZEWqfDblKdQkJaIqyHoFHgeQ,17740
-ultralytics/engine/results.py,sha256=3sU3n2WkGhx4GNSVGLRSrWuSoKn31DEBQ9cV_PMmUzU,75073
-ultralytics/engine/trainer.py,sha256=QizL2LbsHDN6GozL36I0Nw-2dTzvgIcDhGc8dmlgSJ0,37363
+ultralytics/engine/results.py,sha256=sf_JPDTp9lCrcjdloTsZOBbSfzX5oVW9CL6PYf-uW8U,75114
+ultralytics/engine/trainer.py,sha256=1zT-C9YeByROTO8nEq38fzGYMt15sizkAuDHcRYEcu8,37434
 ultralytics/engine/tuner.py,sha256=IQcKuaCaJ-Toe5xA2DUvlFN577PiS2NGDU8YFbWLqO0,11886
 ultralytics/engine/validator.py,sha256=snmE1O0wJIX610bvSOk6pV_jf2pXEQ8IdvKVkX8_agI,14901
 ultralytics/hub/__init__.py,sha256=1ifzSYV0PIT4ZWOm2V7HnpGyY3G3hCz0malw3AXHFlY,5660
@@ -173,10 +173,10 @@ ultralytics/models/yolo/world/train.py,sha256=6PVmQ0G-22OOPPwP_rqSobe2LM6e2b_lC7
 ultralytics/models/yolo/world/train_world.py,sha256=sCtg4Hnq9Y7amYjlQsdvTHXH8cKSooipvcXu_1Iyb2k,4885
 ultralytics/nn/__init__.py,sha256=rjociYD9lo_K-d-1s6TbdWklPLjTcEHk7OIlRDJstIE,615
 ultralytics/nn/autobackend.py,sha256=ONLwYlT8tu6_U0ghXfcNmG6eH9UWH-HDwnBQH2mbYWs,35540
-ultralytics/nn/tasks.py,sha256=WtyNUOMk7tg-Cmw7EyrKrWk2LKqVg53J-Jo_2W6ikLQ,48605
+ultralytics/nn/tasks.py,sha256=KRmrjqWcCPgZEnb3O6Nj8Gutl-LUsWwxY_l-cIotS5o,48559
 ultralytics/nn/modules/__init__.py,sha256=02dPoAMtpPNQdHXHmvJeWZvJ_WG6eqwH8atLdFWgcuY,2713
 ultralytics/nn/modules/activation.py,sha256=oRkhMdqlNpIxQb35pTSUeHV-h0VyLl96GOqvIZ4OvT8,923
-ultralytics/nn/modules/block.py,sha256=_kM3ifWv7COi_18_47bQ_zRPV0Jfe61LiqTcBR8WQWI,43947
+ultralytics/nn/modules/block.py,sha256=HauBQiSIH9JFmT-gnk_8FNJfYfhW2heoY3iU6AdIjv0,43988
 ultralytics/nn/modules/conv.py,sha256=P3R8xTuE7GMJ2DJ_ye7D54Gh56tfh4ykNnIXBG2QcNQ,13140
 ultralytics/nn/modules/head.py,sha256=RYT31wplr64yDSHLpEZy3fyqg9W8HWlXWKrltwpqGiQ,27962
 ultralytics/nn/modules/transformer.py,sha256=fdc4xam82Dk8etahkhlc5RHW6dfY00klKj2od4QpdQo,18097
@@ -207,7 +207,7 @@ ultralytics/trackers/utils/matching.py,sha256=jOGfDMaWUOGHy3e_SF-vn7m0t8nUgLNsiB
 ultralytics/utils/__init__.py,sha256=2bVRKAmCrlTYigV51YI0wXM4U4sHPWXcyjTxiuhBVxw,49330
 ultralytics/utils/autobatch.py,sha256=zc81HlAMArPASEbExty0E_zpITF8PVwin7w-xBFFZ5w,5048
 ultralytics/utils/benchmarks.py,sha256=Njv__APyz_q39wpwVBPC7qTbFBLEWNx_72arkPxo_6U,25671
-ultralytics/utils/checks.py,sha256=FC0r80cUNzDnxJByiohIrvSo-k4iCa197lwwf3IwM4I,30152
+ultralytics/utils/checks.py,sha256=BbOVv3aJLhjFiS2F1Dgq3ztAvc5fcQTCqJ_B1Sb-8xc,30506
 ultralytics/utils/dist.py,sha256=fuiJQEnyyL-SighlI3hUlZPaaSreUl4Q39snF6OhQtI,2386
 ultralytics/utils/downloads.py,sha256=n5htu7rIp6izCeObZLjwaIz8t4RqoivmC2pYEa63KJo,21999
 ultralytics/utils/errors.py,sha256=sXKDEd8ws3L-yIfG_-P_h86axbm37sJNha7kFBJbQMQ,844
@@ -219,7 +219,7 @@ ultralytics/utils/ops.py,sha256=6nERPkmssU1I2RykKF5jKdadiHgCeD7qHXOld6bOfXI,3357
 ultralytics/utils/patches.py,sha256=ARR89dP4YKq7Dd3g2eU-ukbnc2lo3BELukL_1c_d854,3298
 ultralytics/utils/plotting.py,sha256=cl8mctrkBMMTE976yrqDn1I8dH6IPO3ROZl99t5fo9w,62987
 ultralytics/utils/tal.py,sha256=DO-c006HEI62pcrNRpmt4lpqJPC5yu3veRDOvUuExno,18498
-ultralytics/utils/torch_utils.py,sha256=f8B8vXxl36nesoWqm3KnCyojmjriDX71q1jBOS3vEHg,33291
+ultralytics/utils/torch_utils.py,sha256=JQ8HvqIVD-iL640vPBD4e9uOihhVhMuFL2G-BR-AxSM,33155
 ultralytics/utils/triton.py,sha256=2L1_rZ8xCJEjexRVj75g9YU-u4tQln_DJ5N1Yr_0bSs,4071
 ultralytics/utils/tuner.py,sha256=zhYAvVlUO4Bkijoscwlf_IKyE2FSJpFep_esuFLrG0c,6226
 ultralytics/utils/callbacks/__init__.py,sha256=hzL63Rce6VkZhP4Lcim9LKjadixaQG86nKqPhk7IkS0,242
@@ -233,9 +233,9 @@ ultralytics/utils/callbacks/neptune.py,sha256=waZ_bRu0-qBKujTLuqonC2gx2DkgBuVnfq
 ultralytics/utils/callbacks/raytune.py,sha256=TbuZlDb721aIkh-nMozZcP2g_ttUh2cG5LUaXmept6g,728
 ultralytics/utils/callbacks/tensorboard.py,sha256=JHOEVlNQ5dYJPd4Z-EvqbXowuK5uA0p8wPgyyaIUQs0,4194
 ultralytics/utils/callbacks/wb.py,sha256=ayhT2y62AcSOacnawshATU0rWrlSFQ77mrGgBdRl3W4,7086
-ultralytics-8.3.62.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-ultralytics-8.3.62.dist-info/METADATA,sha256=wsCGKfKBKG8oIe0Lt_obELU70mPY67jp9UpNaLuudsM,35284
-ultralytics-8.3.62.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-ultralytics-8.3.62.dist-info/entry_points.txt,sha256=YM_wiKyTe9yRrsEfqvYolNO5ngwfoL4-NwgKzc8_7sI,93
-ultralytics-8.3.62.dist-info/top_level.txt,sha256=XP49TwiMw4QGsvTLSYiJhz1xF_k7ev5mQ8jJXaXi45Q,12
-ultralytics-8.3.62.dist-info/RECORD,,
+ultralytics-8.3.63.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+ultralytics-8.3.63.dist-info/METADATA,sha256=H2F-IYlnZkUf_fpdzSXQS76dTk0Jkld2FdRiVPqgvFo,35284
+ultralytics-8.3.63.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+ultralytics-8.3.63.dist-info/entry_points.txt,sha256=YM_wiKyTe9yRrsEfqvYolNO5ngwfoL4-NwgKzc8_7sI,93
+ultralytics-8.3.63.dist-info/top_level.txt,sha256=XP49TwiMw4QGsvTLSYiJhz1xF_k7ev5mQ8jJXaXi45Q,12
+ultralytics-8.3.63.dist-info/RECORD,,