Skip to content

Commit a8d5e99

Browse files
refactor: ♻️ remove deprecated yolov5 functions and serialize methods (#1326)
Co-authored-by: Onuralp SEZER <thunderbirdtr@gmail.com>
1 parent bbb3002 commit a8d5e99

2 files changed

Lines changed: 2 additions & 80 deletions

File tree

sahi/utils/coco.py

Lines changed: 0 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import os
66
import random
77
import threading
8-
import warnings
98
from collections import Counter, defaultdict
109
from dataclasses import dataclass
1110
from multiprocessing import Pool
@@ -285,10 +284,6 @@ def json(self):
285284
"area": self.area,
286285
}
287286

288-
def serialize(self):
289-
warnings.warn("Use json property instead of serialize method", DeprecationWarning, stacklevel=2)
290-
return self.json
291-
292287
def __repr__(self):
293288
return f"""CocoAnnotation<
294289
image_id: {self.image_id},
@@ -433,9 +428,6 @@ def json(self):
433428
"area": self.area,
434429
}
435430

436-
def serialize(self):
437-
warnings.warn("Use json property instead of serialize method", DeprecationWarning, stacklevel=2)
438-
439431
def __repr__(self):
440432
return f"""CocoPrediction<
441433
image_id: {self.image_id},
@@ -1251,30 +1243,6 @@ def split_coco_as_train_val(self, train_split_rate=0.9, numpy_seed=0):
12511243
"val_coco": val_coco,
12521244
}
12531245

1254-
def export_as_yolov5(
1255-
self,
1256-
output_dir: str | Path,
1257-
train_split_rate: float = 1.0,
1258-
numpy_seed: int = 0,
1259-
mp: bool = False,
1260-
disable_symlink: bool = False,
1261-
):
1262-
"""Deprecated.
1263-
1264-
Please use export_as_yolo instead. Calls export_as_yolo with the same arguments.
1265-
"""
1266-
warnings.warn(
1267-
"export_as_yolov5 is deprecated. Please use export_as_yolo instead.",
1268-
DeprecationWarning,
1269-
)
1270-
self.export_as_yolo(
1271-
output_dir=output_dir,
1272-
train_split_rate=train_split_rate,
1273-
numpy_seed=numpy_seed,
1274-
mp=mp,
1275-
disable_symlink=disable_symlink,
1276-
)
1277-
12781246
def export_as_yolo(
12791247
self,
12801248
output_dir: str | Path,
@@ -2323,32 +2291,6 @@ def remove_invalid_coco_results(result_list_or_path: list | str, dataset_dict_or
23232291
return fixed_result_list
23242292

23252293

2326-
def export_coco_as_yolov5(
2327-
output_dir: str,
2328-
train_coco: Coco | None = None,
2329-
val_coco: Coco | None = None,
2330-
train_split_rate: float = 0.9,
2331-
numpy_seed=0,
2332-
disable_symlink=False,
2333-
):
2334-
"""Deprecated.
2335-
2336-
Please use export_coco_as_yolo instead. Calls export_coco_as_yolo with the same arguments.
2337-
"""
2338-
warnings.warn(
2339-
"export_coco_as_yolov5 is deprecated. Please use export_coco_as_yolo instead.",
2340-
DeprecationWarning,
2341-
)
2342-
export_coco_as_yolo(
2343-
output_dir=output_dir,
2344-
train_coco=train_coco,
2345-
val_coco=val_coco,
2346-
train_split_rate=train_split_rate,
2347-
numpy_seed=numpy_seed,
2348-
disable_symlink=disable_symlink,
2349-
)
2350-
2351-
23522294
def export_coco_as_yolo(
23532295
output_dir: str,
23542296
train_coco: Coco | None = None,
@@ -2441,26 +2383,6 @@ def export_coco_as_yolo(
24412383
return yaml_path
24422384

24432385

2444-
def export_coco_as_yolov5_via_yml(
2445-
yml_path: str, output_dir: str, train_split_rate: float = 0.9, numpy_seed=0, disable_symlink=False
2446-
):
2447-
"""Deprecated.
2448-
2449-
Please use export_coco_as_yolo_via_yml instead. Calls export_coco_as_yolo_via_yml with the same arguments.
2450-
"""
2451-
warnings.warn(
2452-
"export_coco_as_yolov5_via_yml is deprecated. Please use export_coco_as_yolo_via_yml instead.",
2453-
DeprecationWarning,
2454-
)
2455-
export_coco_as_yolo_via_yml(
2456-
yml_path=yml_path,
2457-
output_dir=output_dir,
2458-
train_split_rate=train_split_rate,
2459-
numpy_seed=numpy_seed,
2460-
disable_symlink=disable_symlink,
2461-
)
2462-
2463-
24642386
def export_coco_as_yolo_via_yml(
24652387
yml_path: str, output_dir: str, train_split_rate: float = 0.9, numpy_seed=0, disable_symlink=False
24662388
):

tests/test_coco_utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -655,12 +655,12 @@ def test_get_area_filtered_coco(self):
655655
assert area_filtered_coco.stats["num_images"] == len(area_filtered_coco.images)
656656
assert area_filtered_coco.stats["num_annotations"] == len(area_filtered_coco.json["annotations"])
657657

658-
def test_export_coco_as_yolov5(self):
658+
def test_export_coco_as_yolo(self):
659659
from sahi.utils.coco import Coco, export_coco_as_yolo
660660

661661
coco_dict_path = "tests/data/coco_utils/combined_coco.json"
662662
image_dir = "tests/data/coco_utils/"
663-
output_dir = "tests/data/export_coco_as_yolov5/"
663+
output_dir = "tests/data/export_coco_as_yolo/"
664664
if os.path.isdir(output_dir):
665665
shutil.rmtree(output_dir, ignore_errors=True)
666666
coco = Coco.from_coco_dict_or_path(coco_dict_path, image_dir=image_dir)

0 commit comments

Comments
 (0)