ultralytics 8.3.96__py3-none-any.whl → 8.3.97__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- tests/test_solutions.py +1 -0
- ultralytics/__init__.py +1 -1
- ultralytics/data/annotator.py +12 -11
- ultralytics/engine/exporter.py +4 -4
- ultralytics/nn/autobackend.py +3 -3
- ultralytics/utils/__init__.py +1 -1
- ultralytics/utils/callbacks/comet.py +1 -0
- {ultralytics-8.3.96.dist-info → ultralytics-8.3.97.dist-info}/METADATA +1 -1
- {ultralytics-8.3.96.dist-info → ultralytics-8.3.97.dist-info}/RECORD +13 -13
- {ultralytics-8.3.96.dist-info → ultralytics-8.3.97.dist-info}/WHEEL +1 -1
- {ultralytics-8.3.96.dist-info → ultralytics-8.3.97.dist-info}/entry_points.txt +0 -0
- {ultralytics-8.3.96.dist-info → ultralytics-8.3.97.dist-info}/licenses/LICENSE +0 -0
- {ultralytics-8.3.96.dist-info → ultralytics-8.3.97.dist-info}/top_level.txt +0 -0
tests/test_solutions.py
CHANGED
ultralytics/__init__.py
CHANGED
ultralytics/data/annotator.py
CHANGED
@@ -1,22 +1,23 @@
|
|
1
1
|
# Ultralytics 🚀 AGPL-3.0 License - https://ultralytics.com/license
|
2
2
|
|
3
3
|
from pathlib import Path
|
4
|
+
from typing import List, Optional, Union
|
4
5
|
|
5
6
|
from ultralytics import SAM, YOLO
|
6
7
|
|
7
8
|
|
8
9
|
def auto_annotate(
|
9
|
-
data,
|
10
|
-
det_model="yolo11x.pt",
|
11
|
-
sam_model="sam_b.pt",
|
12
|
-
device="",
|
13
|
-
conf=0.25,
|
14
|
-
iou=0.45,
|
15
|
-
imgsz=640,
|
16
|
-
max_det=300,
|
17
|
-
classes=None,
|
18
|
-
output_dir=None,
|
19
|
-
):
|
10
|
+
data: Union[str, Path],
|
11
|
+
det_model: str = "yolo11x.pt",
|
12
|
+
sam_model: str = "sam_b.pt",
|
13
|
+
device: str = "",
|
14
|
+
conf: float = 0.25,
|
15
|
+
iou: float = 0.45,
|
16
|
+
imgsz: int = 640,
|
17
|
+
max_det: int = 300,
|
18
|
+
classes: Optional[List[int]] = None,
|
19
|
+
output_dir: Optional[Union[str, Path]] = None,
|
20
|
+
) -> None:
|
20
21
|
"""
|
21
22
|
Automatically annotate images using a YOLO object detection model and a SAM segmentation model.
|
22
23
|
|
ultralytics/engine/exporter.py
CHANGED
@@ -665,7 +665,7 @@ class Exporter:
|
|
665
665
|
@try_export
|
666
666
|
def export_paddle(self, prefix=colorstr("PaddlePaddle:")):
|
667
667
|
"""YOLO Paddle export."""
|
668
|
-
check_requirements(("paddlepaddle-gpu" if torch.cuda.is_available() else "paddlepaddle", "x2paddle"))
|
668
|
+
check_requirements(("paddlepaddle-gpu" if torch.cuda.is_available() else "paddlepaddle<3.0.0", "x2paddle"))
|
669
669
|
import x2paddle # noqa
|
670
670
|
from x2paddle.convert import pytorch2paddle # noqa
|
671
671
|
|
@@ -1222,12 +1222,12 @@ class Exporter:
|
|
1222
1222
|
raise ValueError("IMX export is not supported for end2end models.")
|
1223
1223
|
if "C2f" not in self.model.__str__():
|
1224
1224
|
raise ValueError("IMX export is only supported for YOLOv8n detection models")
|
1225
|
-
check_requirements(("model-compression-toolkit
|
1226
|
-
check_requirements("imx500-converter[pt]
|
1225
|
+
check_requirements(("model-compression-toolkit>=2.3.0", "sony-custom-layers>=0.3.0"))
|
1226
|
+
check_requirements("imx500-converter[pt]>=3.16.1") # Separate requirements for imx500-converter
|
1227
1227
|
|
1228
1228
|
import model_compression_toolkit as mct
|
1229
1229
|
import onnx
|
1230
|
-
from sony_custom_layers.pytorch.
|
1230
|
+
from sony_custom_layers.pytorch.nms import multiclass_nms
|
1231
1231
|
|
1232
1232
|
LOGGER.info(f"\n{prefix} starting export with model_compression_toolkit {mct.__version__}...")
|
1233
1233
|
|
ultralytics/nn/autobackend.py
CHANGED
@@ -222,12 +222,12 @@ class AutoBackend(nn.Module):
|
|
222
222
|
session = onnxruntime.InferenceSession(w, providers=providers)
|
223
223
|
else:
|
224
224
|
check_requirements(
|
225
|
-
["model-compression-toolkit
|
225
|
+
["model-compression-toolkit>=2.3.0", "sony-custom-layers[torch]>=0.3.0", "onnxruntime-extensions"]
|
226
226
|
)
|
227
227
|
w = next(Path(w).glob("*.onnx"))
|
228
228
|
LOGGER.info(f"Loading {w} for ONNX IMX inference...")
|
229
229
|
import mct_quantizers as mctq
|
230
|
-
from sony_custom_layers.pytorch.
|
230
|
+
from sony_custom_layers.pytorch.nms import nms_ort # noqa
|
231
231
|
|
232
232
|
session = onnxruntime.InferenceSession(
|
233
233
|
w, mctq.get_ort_session_options(), providers=["CPUExecutionProvider"]
|
@@ -435,7 +435,7 @@ class AutoBackend(nn.Module):
|
|
435
435
|
# PaddlePaddle
|
436
436
|
elif paddle:
|
437
437
|
LOGGER.info(f"Loading {w} for PaddlePaddle inference...")
|
438
|
-
check_requirements("paddlepaddle-gpu" if cuda else "paddlepaddle")
|
438
|
+
check_requirements("paddlepaddle-gpu" if cuda else "paddlepaddle<3.0.0")
|
439
439
|
import paddle.inference as pdi # noqa
|
440
440
|
|
441
441
|
w = Path(w)
|
ultralytics/utils/__init__.py
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
Metadata-Version: 2.4
|
2
2
|
Name: ultralytics
|
3
|
-
Version: 8.3.
|
3
|
+
Version: 8.3.97
|
4
4
|
Summary: Ultralytics YOLO 🚀 for SOTA object detection, multi-object tracking, instance segmentation, pose estimation and image classification.
|
5
5
|
Author-email: Glenn Jocher <glenn.jocher@ultralytics.com>, Jing Qiu <jing.qiu@ultralytics.com>
|
6
6
|
Maintainer-email: Ultralytics <hello@ultralytics.com>
|
@@ -6,8 +6,8 @@ tests/test_engine.py,sha256=aGqZ8P7QO5C_nOa1b4FOyk92Ysdk5WiP-ST310Vyxys,4962
|
|
6
6
|
tests/test_exports.py,sha256=ONs5zF9gVOl_sabzLmFyhp5zQ2sv3uSWzXUjoTgJPME,9242
|
7
7
|
tests/test_integrations.py,sha256=ZgpddWHEVqiP4bGhVw8fLc2wdz0rCxuxr0FQ2dTgnIE,6067
|
8
8
|
tests/test_python.py,sha256=qfAjIhZ8R-g6QLtAo_bSf77U_7LexVKwstZlmoze5WI,23075
|
9
|
-
tests/test_solutions.py,sha256=
|
10
|
-
ultralytics/__init__.py,sha256=
|
9
|
+
tests/test_solutions.py,sha256=4TNQZ9aH1doWujQmh4pgxqHHCU2Umk-IBXjAZg7HIqk,5135
|
10
|
+
ultralytics/__init__.py,sha256=A0RaRFJE6FlvDnHuYetYfnpG5P7A_d64R0u28DxQ6MA,709
|
11
11
|
ultralytics/assets/bus.jpg,sha256=wCAZxJecGR63Od3ZRERe9Aja1Weayrb9Ug751DS_vGM,137419
|
12
12
|
ultralytics/assets/zidane.jpg,sha256=Ftc4aeMmen1O0A3o6GCDO9FlfBslLpTAw0gnetx7bts,50427
|
13
13
|
ultralytics/cfg/__init__.py,sha256=h-VYq22NA05gVibxa5eVO-pMk9OqlcaUMx2NbgklnXM,39894
|
@@ -97,7 +97,7 @@ ultralytics/cfg/solutions/default.yaml,sha256=c-9thwI7y7VmIoIM6AW70Z0r825SToH2h7
|
|
97
97
|
ultralytics/cfg/trackers/botsort.yaml,sha256=D9doE5GQUe6HrAFzr7OfQFIGPFk0M_vJ0B_n7VjxH6Q,1080
|
98
98
|
ultralytics/cfg/trackers/bytetrack.yaml,sha256=6u-tiZlk16EqEwkNXaMrza6PAQmWj_ypgv26LGCtPDg,886
|
99
99
|
ultralytics/data/__init__.py,sha256=nAXaL1puCc7z_NjzQNlJnhbVhT9Fla2u7Dsqo7q1dAc,644
|
100
|
-
ultralytics/data/annotator.py,sha256=
|
100
|
+
ultralytics/data/annotator.py,sha256=VEwb11FsEZm75qlEp8XDHFGKW0_rGsEaFDaBVd771Kw,2902
|
101
101
|
ultralytics/data/augment.py,sha256=kvXsDZB-ibPu--N9CuA5RXQcGmUEyxvo6HPsYSmevvU,120963
|
102
102
|
ultralytics/data/base.py,sha256=6-8ZIp5guIlIQa4wafrpBQl6lHSSneJnQY3KpgX6y6o,18449
|
103
103
|
ultralytics/data/build.py,sha256=56pavLie6PDFEVYChMxnGQGtGsxozYZRpFqC70DRGls,9650
|
@@ -107,7 +107,7 @@ ultralytics/data/loaders.py,sha256=_Gyp_BfGTZwsFdn4UnolXxdU_sAYZLIrv0L2TRI9R5g,2
|
|
107
107
|
ultralytics/data/split_dota.py,sha256=p8eVGht9tABSVbf9vwvxA_AQYEva3IGHePKlMeNrn64,11872
|
108
108
|
ultralytics/data/utils.py,sha256=aRPwIoLrCML_Kcd0dI9B6c5Ct4dvhdF36rDHtuf7Ww4,33217
|
109
109
|
ultralytics/engine/__init__.py,sha256=lm6MckFYCPTbqIoX7w0s_daxdjNeBeKW6DXppv1-QUM,70
|
110
|
-
ultralytics/engine/exporter.py,sha256=
|
110
|
+
ultralytics/engine/exporter.py,sha256=ZzXNyD0dS6cJKMnce4BO4QZiKUDXUZZRFXDnSm8GILM,77533
|
111
111
|
ultralytics/engine/model.py,sha256=uAqzcgn9EjmKG1lO7rwcW5sIMIwJTHHC-popARr2QSU,52902
|
112
112
|
ultralytics/engine/predictor.py,sha256=ozPvmwlek6QRN5canK-BTQJI8KbBynWozF3AYN1ghE8,21626
|
113
113
|
ultralytics/engine/results.py,sha256=H3pFJhUjYKvVyOUqqZjfIn8vnCpl81aYNOnregMrBoQ,79716
|
@@ -177,7 +177,7 @@ ultralytics/models/yolo/world/__init__.py,sha256=nlh8I6t8hMGz_vZg8QSlsUW1R-2eKvn
|
|
177
177
|
ultralytics/models/yolo/world/train.py,sha256=HfOVrWvbnqPqW3MpwFRVbkDHC2hZ8S0A-TnzaPtO1lI,4876
|
178
178
|
ultralytics/models/yolo/world/train_world.py,sha256=GbXY3IJOvtYHHyuuhipMxCizrffgJ0iAjbcNcLpliMo,6360
|
179
179
|
ultralytics/nn/__init__.py,sha256=rjociYD9lo_K-d-1s6TbdWklPLjTcEHk7OIlRDJstIE,615
|
180
|
-
ultralytics/nn/autobackend.py,sha256=
|
180
|
+
ultralytics/nn/autobackend.py,sha256=lTv6wQ8S3BG0VV5lBzKFzNIyiNSaIa165K5vZO1w8LI,38210
|
181
181
|
ultralytics/nn/tasks.py,sha256=az5yjT2S3vbOTgZ2NXwUbIuRvIyGiITwt1WI4jIuBJE,52678
|
182
182
|
ultralytics/nn/modules/__init__.py,sha256=R_qrw30VU_cgg1YyowVpzAbqh87WfYXkPZe4Og_bQqk,2951
|
183
183
|
ultralytics/nn/modules/activation.py,sha256=_DL_rQw4QmhNO0CaftNR8HRvqNnTGRbmjyD6HGbPjxw,1392
|
@@ -213,7 +213,7 @@ ultralytics/trackers/utils/__init__.py,sha256=lm6MckFYCPTbqIoX7w0s_daxdjNeBeKW6D
|
|
213
213
|
ultralytics/trackers/utils/gmc.py,sha256=NnLxtgZIKdO5-C_J0xqeob1iRXgpubyJOgbIEeJz0Ps,14500
|
214
214
|
ultralytics/trackers/utils/kalman_filter.py,sha256=A0CqOnnaKH6kr0XwuHzyHmIU6aJAjJYxF9jVlNBKZHo,21326
|
215
215
|
ultralytics/trackers/utils/matching.py,sha256=7eIufSdeN7cXuFMjvcfvz0Ldq84m4YKZl5IGxBR8IIo,7169
|
216
|
-
ultralytics/utils/__init__.py,sha256=
|
216
|
+
ultralytics/utils/__init__.py,sha256=vkL5eXMA-1CvTJou5D16FkIdO_ANDwPUJPB4NovnMQw,50197
|
217
217
|
ultralytics/utils/autobatch.py,sha256=KnvmNSAO_6H3ZLJ4fOFMTFbOaMlbp025LiJqrdKIz8c,4998
|
218
218
|
ultralytics/utils/benchmarks.py,sha256=0lhuwA_yJ1uGYqL-yMFZrrGZQrLVp09xklKITKYHX_c,30246
|
219
219
|
ultralytics/utils/checks.py,sha256=d30cJY1G3wBWWTlq3C3yGVmDhAUtfXa9U3nuTO4sXQo,32677
|
@@ -234,7 +234,7 @@ ultralytics/utils/tuner.py,sha256=mJLrORb67FqnTvKD5Y3dM7LxhkMcJpZwWVYfv9yfQ8w,59
|
|
234
234
|
ultralytics/utils/callbacks/__init__.py,sha256=hzL63Rce6VkZhP4Lcim9LKjadixaQG86nKqPhk7IkS0,242
|
235
235
|
ultralytics/utils/callbacks/base.py,sha256=QMdltbVe806lekq-w_7ohpXysoZjuB8gStZ14wPaS78,5877
|
236
236
|
ultralytics/utils/callbacks/clearml.py,sha256=jxTL2QSt8Cjp_BkK2XUDPg5t2XnykMYXJFRp6B66ulA,6005
|
237
|
-
ultralytics/utils/callbacks/comet.py,sha256=
|
237
|
+
ultralytics/utils/callbacks/comet.py,sha256=5WlPesVXRcW_VvQh4fVb5dYc4mrzc7Vb50Kid-aTGk8,18051
|
238
238
|
ultralytics/utils/callbacks/dvc.py,sha256=tF8oN8_zkXVsjxQmZjUK4klB9I2I-oRdLxkIr1afCys,5168
|
239
239
|
ultralytics/utils/callbacks/hub.py,sha256=dPSeSStRE1x-WYyqrUghCp_VtBxNZ5-Bmb4wW2KYV2Y,4073
|
240
240
|
ultralytics/utils/callbacks/mlflow.py,sha256=olMilfFKKLb9X53sJxFCn-AHnbcvTmXwtU_CVqSqzeE,5434
|
@@ -242,9 +242,9 @@ ultralytics/utils/callbacks/neptune.py,sha256=TQDHJsgAdnMtSdLeQyVTJ1zBdvuwLm-U4U
|
|
242
242
|
ultralytics/utils/callbacks/raytune.py,sha256=omVZNNuzYxsZZXrF9xpbFv7R1Wjdx1j-gv0xXuZrQas,1122
|
243
243
|
ultralytics/utils/callbacks/tensorboard.py,sha256=rnyja6LpSyixwuL0WKovgARe6RPiX8ORuknlre3VEu4,4255
|
244
244
|
ultralytics/utils/callbacks/wb.py,sha256=AZH7-bARpHhnonnN57dvoPpfK35xBnu7rINZzHeugeg,6851
|
245
|
-
ultralytics-8.3.
|
246
|
-
ultralytics-8.3.
|
247
|
-
ultralytics-8.3.
|
248
|
-
ultralytics-8.3.
|
249
|
-
ultralytics-8.3.
|
250
|
-
ultralytics-8.3.
|
245
|
+
ultralytics-8.3.97.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
|
246
|
+
ultralytics-8.3.97.dist-info/METADATA,sha256=aBBD8oqXqoT9ZQCOFh1RhRacbgiK0RZsCeHKBhcCZYU,35250
|
247
|
+
ultralytics-8.3.97.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
|
248
|
+
ultralytics-8.3.97.dist-info/entry_points.txt,sha256=YM_wiKyTe9yRrsEfqvYolNO5ngwfoL4-NwgKzc8_7sI,93
|
249
|
+
ultralytics-8.3.97.dist-info/top_level.txt,sha256=XP49TwiMw4QGsvTLSYiJhz1xF_k7ev5mQ8jJXaXi45Q,12
|
250
|
+
ultralytics-8.3.97.dist-info/RECORD,,
|
File without changes
|
File without changes
|
File without changes
|