Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make multiprocess call optional #55

Merged
merged 3 commits into from
Apr 28, 2021
Merged

make multiprocess call optional #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee45d0a
utilize category remapping for coco
fcakyon Apr 27, 2021
96ff380
fix category_remapping
fcakyon Apr 27, 2021
77be1bd
add mp argument
fcakyon Apr 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions sahi/utils/coco.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ def add_image(self, image):
self.images.append(image)

@classmethod
def from_coco_dict_or_path(cls, coco_dict_or_path, desired_name2id=None, remapping_dict=None):
def from_coco_dict_or_path(cls, coco_dict_or_path, desired_name2id=None, remapping_dict=None, mp=False):
"""
Creates coco object from COCO formatted dict or COCO dataset file path.

Expand All @@ -803,6 +803,9 @@ def from_coco_dict_or_path(cls, coco_dict_or_path, desired_name2id=None, remappi
{"human": 1, "car": 2, "big_vehicle": 3}
remapping_dict: dict
{1:0, 2:1} maps category id 1 to 0 and category id 2 to 1
mp: bool
If True, multiprocess mode is on.
Should be called in 'if __name__ == __main__:' block.

Properties:
images: list of CocoImage
Expand Down Expand Up @@ -834,7 +837,10 @@ def from_coco_dict_or_path(cls, coco_dict_or_path, desired_name2id=None, remappi

# arrange image id to annotation id mapping
coco.add_categories_from_coco_category_list(coco_dict["categories"])
imageid2annotationlist = get_imageid2annotationlist_mapping_mt(coco_dict)
if mp:
imageid2annotationlist = get_imageid2annotationlist_mapping_mp(coco_dict)
else:
imageid2annotationlist = get_imageid2annotationlist_mapping(coco_dict)
category_mapping = coco.category_mapping

coco_image_list = []
Expand Down Expand Up @@ -875,10 +881,6 @@ def category_mapping(self):
category_mapping[category.id] = category.name
return category_mapping

@property
def imageid2annotationlist(self):
return get_imageid2annotationlist_mapping_mt(self.json)

@property
def json(self):
return create_coco_dict(
Expand Down Expand Up @@ -1326,9 +1328,9 @@ def get_image_annotations(image_id, annotations):
return image_id, image_annotations


def get_imageid2annotationlist_mapping_mt(coco_dict):
def get_imageid2annotationlist_mapping_mp(coco_dict):
"""
Multithreaded version of sahi.utils.coco.get_imageid2annotationlist_mapping. (3 times faster)
Multiprocess version of sahi.utils.coco.get_imageid2annotationlist_mapping. (3 times faster)
"""
imageid2annotationlist_mapping = {}
annotations = coco_dict["annotations"]
Expand Down
4 changes: 2 additions & 2 deletions tests/test_cocoutils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,11 +352,11 @@ def check_image_id(image_id):
check_image_id(image_id=2)

def test_get_imageid2annotationlist_mapping_mt(self):
from sahi.utils.coco import get_imageid2annotationlist_mapping_mt
from sahi.utils.coco import get_imageid2annotationlist_mapping_mp

coco_path = "tests/data/coco_utils/combined_coco.json"
coco_dict = load_json(coco_path)
imageid2annotationlist_mapping = get_imageid2annotationlist_mapping_mt(coco_dict)
imageid2annotationlist_mapping = get_imageid2annotationlist_mapping_mp(coco_dict)
self.assertEqual(len(imageid2annotationlist_mapping), 2)

def check_image_id(image_id):
Expand Down