Support for gravel augmentation #1365

onurtore · 2022-12-15T10:58:37Z

Signed-off-by: Onur Berk Tore onurberk_t@hotmail.com

Signed-off-by: Onur Berk Tore <onurberk_t@hotmail.com>

Signed-off-by: delivers-26 <delivers-26@pop-os.localdomain>

onurtore · 2022-12-15T13:35:26Z

@Dipet Hi!,
There are some test in the test_serialization which are failing when I run pytest. However the functionality that I added (RandomGravel) not in the except_augmentations or augmentation_cls for these tests, so I do not understand why these tests testing this functionality.

Furthermore all of the failures are related to params are out of their limit (see below.) But I already checking them (in the transforms.py, RandomGravel class, I raise exceptions for them).

Clearly I lack the structure of the testing system, so any help would appreciated.

Edit: Turns out my implementation was wrong, not that I missunderstand the system.

Signed-off-by: delivers-26 <delivers-26@pop-os.localdomain>

onurtore · 2022-12-19T13:39:04Z

Okay, serialization tests are fixed, however the "test_additional_targets_for_image_only" still fails, any input is welcome.

Signed-off-by: delivers-26 <delivers-26@pop-os.localdomain>

onurtore · 2022-12-19T14:46:05Z

@Dipet Hi!,
Can you run the workflows please ?

Signed-off-by: delivers-26 <delivers-26@pop-os.localdomain>

onurtore · 2022-12-22T07:16:41Z

Hi @Dipet,
How can I fix the documentation? Error output states to run: python3 tools/make_transforms_docs.py make

However when I run it, the output is not related to my code.

Traceback (most recent call last):
  File "tools/make_transforms_docs.py", line 194, in <module>
    main()
  File "tools/make_transforms_docs.py", line 174, in main
    transforms_info = get_transforms_info()
  File "tools/make_transforms_docs.py", line 80, in get_transforms_info
    if issubclass(cls, albumentations.DualIAATransform):
AttributeError: module 'albumentations' has no attribute 'DualIAATransform'

Dipet · 2022-12-22T08:13:45Z

Are you sure that you use correct environment? Try pip install -e . inside repo directory.

onurtore · 2022-12-22T10:18:20Z

Are you sure that you use correct environment? Try pip install -e . inside repo directory.

@Dipet, still same issue after checking the pip.

Dipet · 2022-12-22T10:22:50Z

Try pip install imgaug

Signed-off-by: delivers-26 <delivers-26@pop-os.localdomain>

onurtore · 2022-12-22T10:49:36Z

@Dipet,
Thanks, imgaug did the thing. All tests are now passed, you can review.

onurtore · 2022-12-30T10:42:10Z

@Dipet,
Friendly ping.

Dipet · 2022-12-22T10:34:35Z

albumentations/augmentations/transforms.py

+
+    def __init__(
+        self,
+        gravel_roi=(0.1, 0.4, 0.9, 0.9),


Please, add types.

Dipet · 2022-12-22T10:34:50Z

albumentations/augmentations/functional.py

@@ -765,6 +766,43 @@ def add_shadow(img, vertices_list):
    return image_rgb


+@ensure_contiguous
+@preserve_shape
+def add_gravel(img, gravels):


Please, add types.

Dipet · 2022-12-22T10:35:51Z

albumentations/augmentations/transforms.py

+        (gravel_lower_x, gravel_lower_y, gravel_upper_x, gravel_upper_y) = gravel_roi
+
+        if not 0 <= gravel_lower_x < gravel_upper_x <= 1 or not 0 <= gravel_lower_y < gravel_upper_y <= 1:
+            raise ValueError("Invalid gravel_roi. Got: {}".format(gravel_roi))


Better to use f-strings

Dipet · 2022-12-22T10:36:52Z

albumentations/augmentations/transforms.py

+
+        if not 0 <= gravel_lower_x < gravel_upper_x <= 1 or not 0 <= gravel_lower_y < gravel_upper_y <= 1:
+            raise ValueError("Invalid gravel_roi. Got: {}".format(gravel_roi))
+        if not 1 <= no_of_patches:


if no_of_patches < 1

Dipet · 2022-12-22T10:37:21Z

albumentations/augmentations/transforms.py

+        self.no_of_patches = no_of_patches
+
+    def generate_gravel_patch(self, rectangular_roi):
+        x1 = rectangular_roi[0]


x1, y1, x2, y2 = rectangular_roi

Dipet · 2022-12-22T10:51:24Z

albumentations/augmentations/transforms.py

+        for i in range((int)(area // 10)):
+            x = np.random.randint(x1, x2)
+            y = np.random.randint(y1, y2)
+            gravels.append((x, y))


count = area // 10 gravels = np.empty([count, 2], dtype=np.int64) gravels[:, 0] = random_utils.randint(x1, x2, count) gravels[:, 1] = random_utils.randint(y1, y2, count)

Dipet · 2022-12-22T10:55:45Z

albumentations/augmentations/transforms.py

+    def __init__(
+        self,
+        gravel_roi=(0.1, 0.4, 0.9, 0.9),
+        no_of_patches=2,


Strange name, better rename to number_of_patches or count_of_patches

Dipet · 2022-12-22T11:08:59Z

albumentations/augmentations/transforms.py

+        rectangular_rois = []
+        for i in range(self.no_of_patches):
+
+            xx1 = random_utils.randint(x_min + 1, x_max)
+            xx2 = random_utils.randint(x_min, xx1)
+            yy1 = random_utils.randint(y_min + 1, y_max)
+            yy2 = random_utils.randint(y_min, yy1)
+            rectangular_rois.append((xx2, yy2, min(xx1, xx2 + 200), min(yy1, yy2 + 30)))


I can not understand logic of this rois

I updated the code and added comment for xmin, xmax, ymin, ymax. I think you understand that I am trying to generate xmin, xmax, ymin, ymax, so what part is not clear?

Dipet · 2023-01-06T07:02:37Z

albumentations/augmentations/functional.py

+    image_hls = cv2.cvtColor(img, cv2.COLOR_RGB2HLS)
+
+    for gravel in gravels:
+        minx, maxx, miny, maxy, val = gravel


mixed up x and y, because gen formula is gravel_info = [max(y - r, 0), min(y + r, y), max(x - r, 0), min(x + r, x), r1]

Dipet · 2023-01-06T07:06:03Z

albumentations/augmentations/transforms.py

+        self.gravels_infos = []
+        for roi in rectangular_rois:
+            gravels = self.generate_gravel_patch(roi)
+            for gravel in gravels:
+                x = gravel[0]
+                y = gravel[1]
+                r = random_utils.randint(1, 4)
+                r1 = random_utils.randint(0, 255)
+                gravel_info = [max(y - r, 0), min(y + r, y), max(x - r, 0), min(x + r, x), r1]
+                self.gravels_infos.append(gravel_info)
+
+        return {"gravels_infos": self.gravels_infos}


Speedup:

minx = [] maxx = [] miny = [] maxy = [] val = [] for roi in rectangular_rois: gravels = self.generate_gravel_patch(roi) x = gravels[:, 0] y = gravels[:, 1] r = random_utils.randint(1, 4, len(gravels)) r1 = random_utils.randint(0, 255, len(gravels)) miny.append(np.maximum(y - r, 0)) maxy.append(np.minimum(y + r, y)) minx.append(np.maximum(x - r, 0)) maxx.append(np.minimum(x + r, x)) val.append(r1) return { "gravels_infos": np.stack([ np.concatenate(miny), np.concatenate(maxy), np.concatenate(minx), np.concatenate(maxx), np.concatenate(val), ], 1) }

Done, thanks

Signed-off-by: delivers-26 <delivers-26@pop-os.localdomain>

onurtore · 2023-01-29T09:54:38Z

Hi @Dipet, friendly ping.

Supports for gravel animations

d3fd540

Signed-off-by: Onur Berk Tore <onurberk_t@hotmail.com>

onurtore changed the title ~~Supports for gravel animations~~ Supports for gravel augmentations Dec 15, 2022

onurtore changed the title ~~Supports for gravel augmentations~~ Supports for gravel augmentation Dec 15, 2022

onurtore marked this pull request as draft December 15, 2022 11:36

Adds exceptions for tests

2d2213d

Signed-off-by: delivers-26 <delivers-26@pop-os.localdomain>

Fixes serialization tests

a7c8d65

Signed-off-by: delivers-26 <delivers-26@pop-os.localdomain>

Fixes rest of the tests

f811193

Signed-off-by: delivers-26 <delivers-26@pop-os.localdomain>

onurtore marked this pull request as ready for review December 19, 2022 14:45

onurtore mentioned this pull request Dec 20, 2022

Adds support for manhole augmentation #1369

Open

Dipet and others added 6 commits December 21, 2022 18:49

Merge branch 'master' into master

4a27f88

Fixes non-rgb warnings.

5e9a271

Signed-off-by: delivers-26 <delivers-26@pop-os.localdomain>

Merge branch 'master' into master

7902d2f

Fixes the linting errors

e415f9b

Signed-off-by: delivers-26 <delivers-26@pop-os.localdomain>

Fix more linting

8614f90

Signed-off-by: delivers-26 <delivers-26@pop-os.localdomain>

Fix black

4229f8b

Signed-off-by: delivers-26 <delivers-26@pop-os.localdomain>

delivers-26 added 2 commits December 22, 2022 13:27

Fixes the readme.md

b34f8e9

Signed-off-by: delivers-26 <delivers-26@pop-os.localdomain>

Fix the readme

8388426

Signed-off-by: delivers-26 <delivers-26@pop-os.localdomain>

Dipet requested changes Jan 6, 2023

View reviewed changes

Dipet reviewed Jan 6, 2023

View reviewed changes

Dipet requested changes Jan 6, 2023

View reviewed changes

fix: Review updates

166a92e

Signed-off-by: delivers-26 <delivers-26@pop-os.localdomain>

onurtore changed the title ~~Supports for gravel augmentation~~ Support for gravel augmentation Jan 29, 2023

Dipet approved these changes Jan 31, 2023

View reviewed changes

Dipet merged commit 7e49d47 into albumentations-team:master Jan 31, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support for gravel augmentation #1365

Support for gravel augmentation #1365

onurtore commented Dec 15, 2022

onurtore commented Dec 15, 2022 •

edited

onurtore commented Dec 19, 2022

onurtore commented Dec 19, 2022 •

edited

onurtore commented Dec 22, 2022

Dipet commented Dec 22, 2022

onurtore commented Dec 22, 2022 •

edited

Dipet commented Dec 22, 2022

onurtore commented Dec 22, 2022

onurtore commented Dec 30, 2022

Dipet Dec 22, 2022

onurtore Jan 29, 2023

Dipet Dec 22, 2022

onurtore Jan 29, 2023

Dipet Dec 22, 2022

onurtore Jan 29, 2023

Dipet Dec 22, 2022

onurtore Jan 29, 2023

Dipet Dec 22, 2022

onurtore Jan 29, 2023

Dipet Dec 22, 2022

onurtore Jan 29, 2023

Dipet Dec 22, 2022

onurtore Jan 29, 2023

Dipet Dec 22, 2022

onurtore Jan 29, 2023

Dipet Jan 6, 2023

onurtore Jan 29, 2023

Dipet Jan 6, 2023

onurtore Jan 29, 2023

onurtore commented Jan 29, 2023

Support for gravel augmentation #1365

Support for gravel augmentation #1365

Conversation

onurtore commented Dec 15, 2022

onurtore commented Dec 15, 2022 • edited

onurtore commented Dec 19, 2022

onurtore commented Dec 19, 2022 • edited

onurtore commented Dec 22, 2022

Dipet commented Dec 22, 2022

onurtore commented Dec 22, 2022 • edited

Dipet commented Dec 22, 2022

onurtore commented Dec 22, 2022

onurtore commented Dec 30, 2022

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

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

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

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

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

onurtore commented Jan 29, 2023

onurtore commented Dec 15, 2022 •

edited

onurtore commented Dec 19, 2022 •

edited

onurtore commented Dec 22, 2022 •

edited