[AI-1260][internal] add loading of polygon support for object detection datasets #679

ChristofferEdlund · 2023-10-09T12:27:10Z

Problem

In the initial implementation, when loading classes for datasets labeled with the bounding_box annotation type, it wasn't taking into consideration that the polygon annotations could also be relevant because they contain bounding box information in their annotations.

Solution

We modified the load_classes function to incorporate the following logic:

When the annotation_type is specified as bounding_box, the function now additionally considers polygon annotations.
It attempts to load class labels from both classes_bounding_box.txt and classes_polygon.txt files, combining the two lists if both exist.
The changes ensure a more comprehensive loading of classes that may be relevant to object detection tasks.

Aka, we now load BOTH bounding_box and polygon classes that has been exported per default.

Changelog

Enhanced the load_classes function to load polygon class labels when the bounding_box annotation type is specified.
Ensured a combined list of classes from both bounding boxes and polygons for object detection datasets.

…-of-polygon-support-for-object-detection-datasets

…bject-detection datasets, also added better error msg

linear · 2023-10-09T12:27:12Z

AI-1260 Add loading of polygon support for object-detection datasets in darwin-py

The polygon datasets has bounding box annotations but those can not be loaded with obejct-detection dataloades currently in darwin-py.

Lets add the feature to load BOTH object-detection and instance-segmentation annoations with the object-detection dataloader.

owencjones

Some changes, and one query

darwin/dataset/utils.py

tests/darwin/torch/dataset_test.py

…-of-polygon-support-for-object-detection-datasets

…oad from multiple types, local_dataset has the logic to add bonding_boxes

…d list

…-of-polygon-support-for-object-detection-datasets

ChristofferEdlund · 2023-10-17T13:44:56Z

darwin/dataset/local_dataset.py

@@ -64,20 +63,6 @@ def __init__(
        split_type: str = "random",
        release_name: Optional[str] = None,
    ):
-        assert dataset_path is not None


Refactoring the init function to make ruff happy

I like this refactoring - thanks ruff!

ChristofferEdlund

The major changes is that extract_classes and get_classes has the same default behavior.

FThe logic of loading polygon annotations with bounding_box are placed a level higher in stratified sampling and local_dataset. This is done by enabling loading of a list of annotation_types.

owencjones

Looks sound to me, I think QA needs to be solid, and Jon should ideally have a glance, because this changes code I'm not as familiar with, that he probably wrote :)

owencjones · 2023-10-18T09:00:12Z

darwin/dataset/local_dataset.py

-            raise ValueError(f"Could not find any {SUPPORTED_IMAGE_EXTENSIONS} file", f" in {images_dir}")
-
-        assert len(self.images_path) == len(self.annotations_path)
+    def _initial_setup(self, dataset_path, release_name):


I like the extraction here, even if it is only to make Ruff happy!

owencjones · 2023-10-18T09:02:59Z

darwin/dataset/utils.py

@@ -238,102 +285,97 @@ def get_coco_format_record(
    image_id: Optional[Union[str, int]] = None,
    classes: Optional[List[str]] = None,
 ) -> Dict[str, Any]:
-    """


What was the reason behind removing the docblock? Internal function?

That's strange, its there in my code. Will see if I can get it back on the github as well.

dorfmanrobert · 2023-10-18T10:53:40Z

darwin/dataset/utils.py

@@ -93,7 +100,10 @@ def extract_classes(annotations_path: Path, annotation_type: str) -> Tuple[Dict[
            continue

        for annotation in annotation_file.annotations:
-            if annotation.annotation_class.annotation_type != annotation_type:
+            if (


I believe this may be inconsistent with this logic. Here it seems "complex_polygon" will not be considered in creating the class list (based on how this is called in make_class_lists), while in the linked logic "complex_polygon" is considered for an annotation.annotation_class.annotation_type.

Not sure which is better: remove complex_polygon from linked logic or add it in make_class_lists

Unless this is an intentional difference

Great input, I have not changed anything considering that logic. So the behavior should be the same as main darwin-py in that regard. BUT, that does not stop us from fixing it if there is an issue.

I suggest, we skip this for now. It might be a bug, but it would be a pre-existing condition and we have the same behavior as before. Besides, I think that complex-polygons are getting deprecated.

We could raise a bug report thought.

almazan

Looks good.

Disclamer: really long PR to review, so I might have missed things. Haven't tested it myself.

almazan · 2023-10-19T13:26:51Z

darwin/dataset/local_dataset.py

@@ -64,20 +63,6 @@ def __init__(
        split_type: str = "random",
        release_name: Optional[str] = None,
    ):
-        assert dataset_path is not None


I like this refactoring - thanks ruff!

darwin/dataset/split_manager.py

ChristofferEdlund added 6 commits September 29, 2023 13:22

added albumentations transform test

7ff1132

updated poetry file

88a2750

added albumentations to poetry.lock

520f9f3

added manual install of albumentations

38fb230

Merge remote-tracking branch 'origin/master' into ai-1260-add-loading…

bc5931c

…-of-polygon-support-for-object-detection-datasets

added support to load both polygon and bounding-box annotations for o…

9e83781

…bject-detection datasets, also added better error msg

ChristofferEdlund requested a review from almazan October 9, 2023 12:27

ChristofferEdlund added 4 commits October 9, 2023 14:59

commit

264fe33

removed test that will be introduced in another pr

31dc64c

added a check for duplicate classes (from polygon and bounding_boxes

094cc70

removed code that is not supposed to be in github workflow

65d43eb

owencjones suggested changes Oct 10, 2023

View reviewed changes

darwin/dataset/utils.py Outdated Show resolved Hide resolved

darwin/dataset/utils.py Outdated Show resolved Hide resolved

darwin/dataset/utils.py Show resolved Hide resolved

tests/darwin/torch/dataset_test.py Outdated Show resolved Hide resolved

updated stratified to support bounding_box + polygon

a3dfca9

owencjones changed the title ~~[Ai-1260] add loading of polygon support for object detection datasets~~ [AI-1260][internal] add loading of polygon support for object detection datasets Oct 11, 2023

removed some printing

99cb219

ChristofferEdlund force-pushed the ai-1260-add-loading-of-polygon-support-for-object-detection-datasets branch from 017b1c0 to 99cb219 Compare October 13, 2023 12:55

ChristofferEdlund added 13 commits October 13, 2023 15:02

changes based on owen's feedback

752b54f

minor update

09ba55b

Merge remote-tracking branch 'origin/master' into ai-1260-add-loading…

4341ca0

…-of-polygon-support-for-object-detection-datasets

black formatting

199a71d

reverted classes functionality to old one, but added the ability to l…

56788cf

…oad from multiple types, local_dataset has the logic to add bonding_boxes

linter check

3855279

poetry lock fix

ba78fe1

manually fixed some ruff issues

081f249

ignoring ruff import * issues in dataset_test.py

c5f7286

refactored local_dataset class to appease ruff (to long init)

145ce20

added test to extract_classes with multiple annotation types selected

99c4186

added stratefied split logic to add polygons to bounding_box stratife…

67dd274

…d list

merged from master

d128a18

ChristofferEdlund added 6 commits October 17, 2023 14:23

BLACK

7e1f194

Merge remote-tracking branch 'origin/master' into ai-1260-add-loading…

94da955

…-of-polygon-support-for-object-detection-datasets

revrting to old init

04de9c5

revrting to old init

57797ca

made the refactor more like the original

a4431f8

added black

0ce35b3

ChristofferEdlund commented Oct 17, 2023

View reviewed changes

ChristofferEdlund added 2 commits October 17, 2023 16:51

fixed minor issue

f2bee69

removed hard val- and test- set requirements

6aab1ec

owencjones approved these changes Oct 18, 2023

View reviewed changes

is exhaust generator code present now?

0f799a5

dorfmanrobert reviewed Oct 18, 2023

View reviewed changes

almazan reviewed Oct 19, 2023

View reviewed changes

no longer forcing users to have a training split

2273fa2

almazan approved these changes Oct 19, 2023

View reviewed changes

ChristofferEdlund merged commit 5b7ad8b into master Oct 20, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[AI-1260][internal] add loading of polygon support for object detection datasets #679

[AI-1260][internal] add loading of polygon support for object detection datasets #679

ChristofferEdlund commented Oct 9, 2023 •

edited

Loading

linear bot commented Oct 9, 2023

owencjones left a comment

ChristofferEdlund Oct 17, 2023

almazan Oct 19, 2023

ChristofferEdlund left a comment

owencjones left a comment

owencjones Oct 18, 2023

owencjones Oct 18, 2023

ChristofferEdlund Oct 18, 2023

dorfmanrobert Oct 18, 2023 •

edited

Loading

dorfmanrobert Oct 18, 2023 •

edited

Loading

ChristofferEdlund Oct 18, 2023

ChristofferEdlund Oct 18, 2023

almazan left a comment

almazan Oct 19, 2023

[AI-1260][internal] add loading of polygon support for object detection datasets #679

[AI-1260][internal] add loading of polygon support for object detection datasets #679

Conversation

ChristofferEdlund commented Oct 9, 2023 • edited Loading

Problem

Solution

Changelog

linear bot commented Oct 9, 2023

owencjones left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ChristofferEdlund left a comment

Choose a reason for hiding this comment

owencjones left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dorfmanrobert Oct 18, 2023 • edited Loading

Choose a reason for hiding this comment

dorfmanrobert Oct 18, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

almazan left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ChristofferEdlund commented Oct 9, 2023 •

edited

Loading

dorfmanrobert Oct 18, 2023 •

edited

Loading

dorfmanrobert Oct 18, 2023 •

edited

Loading