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

(Refactor) Removed the coco function. #964

Merged
merged 6 commits into from
Nov 1, 2021
Merged

(Refactor) Removed the coco function. #964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9985b98
(Refactor) Removed the coco function.
Oct 31, 2021
b16f611
Merge branch 'master' into remove_coco
Nov 1, 2021
f533b5a
(Fix) Fixed test to pass.
Nov 1, 2021
aa0b084
(FIX) Removed keyword argumetn mask.
Nov 1, 2021
a2138b5
(FIX) black
Nov 1, 2021
2cacf81
(Refactor) Cleand up the code.
Nov 1, 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
16 changes: 0 additions & 16 deletions icevision/parsers/coco_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
__all__ = [
"coco",
"COCOBaseParser",
"COCOBBoxParser",
"COCOMaskParser",
Expand All @@ -13,21 +12,6 @@
from icevision.parsers import *


# TODO: Deprecated
def coco(
annotations_file: Union[str, Path],
img_dir: Union[str, Path],
mask: bool = True,
idmap: Optional[IDMap] = None,
) -> Parser:
logger.warning(
"This function will be deprecated, instantiate the concrete "
"classes instead: `COCOBBoxParser`, `COCOMaskParser`, `COCOKeypointsParser`"
)
parser_cls = COCOMaskParser if mask else COCOBBoxParser
return parser_cls(annotations_file, img_dir, idmap=idmap)


class COCOBaseParser(Parser):
def __init__(
self,
Expand Down
8 changes: 3 additions & 5 deletions tests/parsers/test_coco_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

@pytest.fixture
def coco_bbox_parser(coco_dir):
return parsers.coco(coco_dir / "annotations.json", coco_dir / "images", mask=False)
return parsers.COCOBBoxParser(coco_dir / "annotations.json", coco_dir / "images")


@pytest.fixture
def coco_mask_parser(coco_dir):
return parsers.coco(coco_dir / "annotations.json", coco_dir / "images", mask=True)
return parsers.COCOMaskParser(coco_dir / "annotations.json", coco_dir / "images")


def test_keypoints_parser(coco_dir, coco_keypoints_parser):
Expand Down Expand Up @@ -197,7 +197,5 @@ def test_mask_parser(coco_mask_parser):

def test_coco_base_parser_init_from_dict(coco_dir):
annotations_dict = json.load(open(coco_dir / "annotations.json"))
parser_init_by_dict = parsers.coco(
annotations_dict, coco_dir / "images", mask=False
)
parser_init_by_dict = parsers.COCOBBoxParser(annotations_dict, coco_dir / "images")
assert parser_init_by_dict.annotations_dict == annotations_dict