From 9985b98d77da10d922b255dbb1985d1808148138 Mon Sep 17 00:00:00 2001 From: frederik Date: Sun, 31 Oct 2021 22:59:46 +0100 Subject: [PATCH 1/5] (Refactor) Removed the coco function. --- icevision/parsers/coco_parser.py | 28 ++++++++++++++-------------- tests/parsers/test_coco_parser.py | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/icevision/parsers/coco_parser.py b/icevision/parsers/coco_parser.py index 275e1015d..e1a61dec6 100644 --- a/icevision/parsers/coco_parser.py +++ b/icevision/parsers/coco_parser.py @@ -1,5 +1,5 @@ __all__ = [ - "coco", + # "coco", "COCOBaseParser", "COCOBBoxParser", "COCOMaskParser", @@ -13,19 +13,19 @@ 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) +# # 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): diff --git a/tests/parsers/test_coco_parser.py b/tests/parsers/test_coco_parser.py index b587b18b1..d0ecd45a6 100644 --- a/tests/parsers/test_coco_parser.py +++ b/tests/parsers/test_coco_parser.py @@ -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): From f533b5a4975437c782c960d9f9a2642e7703df50 Mon Sep 17 00:00:00 2001 From: frederik Date: Mon, 1 Nov 2021 19:46:22 +0100 Subject: [PATCH 2/5] (Fix) Fixed test to pass. --- tests/parsers/test_coco_parser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/parsers/test_coco_parser.py b/tests/parsers/test_coco_parser.py index 905db369e..2d1d0ec39 100644 --- a/tests/parsers/test_coco_parser.py +++ b/tests/parsers/test_coco_parser.py @@ -197,7 +197,7 @@ 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( + parser_init_by_dict = parsers.COCOBBoxParser( annotations_dict, coco_dir / "images", mask=False ) assert parser_init_by_dict.annotations_dict == annotations_dict From aa0b084b099cfc9c4845313d7671a320a9805fe3 Mon Sep 17 00:00:00 2001 From: frederik Date: Mon, 1 Nov 2021 20:20:31 +0100 Subject: [PATCH 3/5] (FIX) Removed keyword argumetn mask. --- tests/parsers/test_coco_parser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/parsers/test_coco_parser.py b/tests/parsers/test_coco_parser.py index 2d1d0ec39..c6432eee1 100644 --- a/tests/parsers/test_coco_parser.py +++ b/tests/parsers/test_coco_parser.py @@ -198,6 +198,6 @@ 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.COCOBBoxParser( - annotations_dict, coco_dir / "images", mask=False + annotations_dict, coco_dir / "images" ) assert parser_init_by_dict.annotations_dict == annotations_dict From a2138b59aa6e8baf00a4d5693af406395ee17a1e Mon Sep 17 00:00:00 2001 From: frederik Date: Mon, 1 Nov 2021 20:23:35 +0100 Subject: [PATCH 4/5] (FIX) black --- tests/parsers/test_coco_parser.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/parsers/test_coco_parser.py b/tests/parsers/test_coco_parser.py index c6432eee1..3da0dbb7c 100644 --- a/tests/parsers/test_coco_parser.py +++ b/tests/parsers/test_coco_parser.py @@ -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.COCOBBoxParser( - annotations_dict, coco_dir / "images" - ) + parser_init_by_dict = parsers.COCOBBoxParser(annotations_dict, coco_dir / "images") assert parser_init_by_dict.annotations_dict == annotations_dict From 2cacf81ae638829e462cb907f71a0e531144c7a6 Mon Sep 17 00:00:00 2001 From: frederik Date: Mon, 1 Nov 2021 21:02:11 +0100 Subject: [PATCH 5/5] (Refactor) Cleand up the code. --- icevision/parsers/coco_parser.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/icevision/parsers/coco_parser.py b/icevision/parsers/coco_parser.py index 39c68e424..c5cd91789 100644 --- a/icevision/parsers/coco_parser.py +++ b/icevision/parsers/coco_parser.py @@ -1,5 +1,4 @@ __all__ = [ - # "coco", "COCOBaseParser", "COCOBBoxParser", "COCOMaskParser", @@ -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,