You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by GitBox <gi...@apache.org> on 2018/05/09 18:01:48 UTC
[GitHub] piiswrong closed pull request #10825: Adding max_area to
random_size_crop
piiswrong closed pull request #10825: Adding max_area to random_size_crop
URL: https://github.com/apache/incubator-mxnet/pull/10825
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/docs/tutorials/python/types_of_data_augmentation.md b/docs/tutorials/python/types_of_data_augmentation.md
index 4ec461d68ec..4308932bf48 100644
--- a/docs/tutorials/python/types_of_data_augmentation.md
+++ b/docs/tutorials/python/types_of_data_augmentation.md
@@ -302,7 +302,7 @@ Some shortcut functions are provided to perform multiple augmentation in a singl
```python
# A random crop, with a random resizing, and random aspect ratio jitter
example_image_copy = example_image.copy()
-aug = mx.image.RandomSizedCropAug(size=(100, 100), min_area=0.1, ratio=(1.0, 1.5))
+aug = mx.image.RandomSizedCropAug(size=(100, 100), area=0.1, ratio=(1.0, 1.5))
aug_image = aug(example_image_copy)
plot_mx_array(aug_image)
diff --git a/python/mxnet/gluon/data/vision/transforms.py b/python/mxnet/gluon/data/vision/transforms.py
index 5e65715e1b2..7ec1c32d5e3 100644
--- a/python/mxnet/gluon/data/vision/transforms.py
+++ b/python/mxnet/gluon/data/vision/transforms.py
@@ -200,7 +200,7 @@ def __init__(self, size, scale=(0.08, 1.0), ratio=(3.0/4.0, 4.0/3.0),
super(RandomResizedCrop, self).__init__()
if isinstance(size, numeric_types):
size = (size, size)
- self._args = (size, scale[0], ratio, interpolation)
+ self._args = (size, scale, ratio, interpolation)
def forward(self, x):
return image.random_size_crop(x, *self._args)[0]
diff --git a/python/mxnet/image/image.py b/python/mxnet/image/image.py
index ace9cb18fff..b4b9cc2f1c0 100644
--- a/python/mxnet/image/image.py
+++ b/python/mxnet/image/image.py
@@ -25,6 +25,7 @@
import random
import logging
import json
+import warnings
import numpy as np
try:
@@ -432,7 +433,7 @@ def color_normalize(src, mean, std=None):
return src
-def random_size_crop(src, size, min_area, ratio, interp=2):
+def random_size_crop(src, size, area, ratio, interp=2, **kwargs):
"""Randomly crop src with size. Randomize area and aspect ratio.
Parameters
@@ -441,8 +442,9 @@ def random_size_crop(src, size, min_area, ratio, interp=2):
Input image
size : tuple of (int, int)
Size of the crop formatted as (width, height).
- min_area : int
- Minimum area to be maintained after cropping
+ area : float in (0, 1] or tuple of (float, float)
+ If tuple, minimum area and maximum area to be maintained after cropping
+ If float, minimum area to be maintained after cropping, maximum area is set to 1.0
ratio : tuple of (float, float)
Aspect ratio range as (min_aspect_ratio, max_aspect_ratio)
interp: int, optional, default=2
@@ -457,9 +459,18 @@ def random_size_crop(src, size, min_area, ratio, interp=2):
"""
h, w, _ = src.shape
- area = h * w
+ src_area = h * w
+
+ if 'min_area' in kwargs:
+ warnings.warn('`min_area` is deprecated. Please use `area` instead.',
+ DeprecationWarning)
+ area = kwargs.pop('min_area')
+ assert not kwargs, "unexpected keyword arguments for `random_size_crop`."
+
+ if isinstance(area, numeric_types):
+ area = (area, 1.0)
for _ in range(10):
- target_area = random.uniform(min_area, 1.0) * area
+ target_area = random.uniform(area[0], area[1]) * src_area
new_ratio = random.uniform(*ratio)
new_w = int(round(np.sqrt(target_area * new_ratio)))
@@ -596,24 +607,31 @@ class RandomSizedCropAug(Augmenter):
----------
size : tuple of (int, int)
Size of the crop formatted as (width, height).
- min_area : int
- Minimum area to be maintained after cropping
+ area : float in (0, 1] or tuple of (float, float)
+ If tuple, minimum area and maximum area to be maintained after cropping
+ If float, minimum area to be maintained after cropping, maximum area is set to 1.0
ratio : tuple of (float, float)
Aspect ratio range as (min_aspect_ratio, max_aspect_ratio)
interp: int, optional, default=2
Interpolation method. See resize_short for details.
"""
- def __init__(self, size, min_area, ratio, interp=2):
- super(RandomSizedCropAug, self).__init__(size=size, min_area=min_area,
+ def __init__(self, size, area, ratio, interp=2, **kwargs):
+ super(RandomSizedCropAug, self).__init__(size=size, area=area,
ratio=ratio, interp=interp)
self.size = size
- self.min_area = min_area
+ if 'min_area' in kwargs:
+ warnings.warn('`min_area` is deprecated. Please use `area` instead.',
+ DeprecationWarning)
+ self.area = kwargs.pop('min_area')
+ else:
+ self.area = area
self.ratio = ratio
self.interp = interp
+ assert not kwargs, "unexpected keyword arguments for `RandomSizedCropAug`."
def __call__(self, src):
"""Augmenter body"""
- return random_size_crop(src, self.size, self.min_area, self.ratio, self.interp)[0]
+ return random_size_crop(src, self.size, self.area, self.ratio, self.interp)[0]
class CenterCropAug(Augmenter):
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services