Unverified Commit ffd5a567 authored by Vasilis Vryniotis's avatar Vasilis Vryniotis Committed by GitHub
Browse files

[prototype] Speed up `autocontrast_image_tensor` (#6935)

* Performance optimization for autocontrast

* Fixing tests
parent 10d47a66
...@@ -251,6 +251,8 @@ CONSISTENCY_CONFIGS = [ ...@@ -251,6 +251,8 @@ CONSISTENCY_CONFIGS = [
ArgsKwargs(p=0), ArgsKwargs(p=0),
ArgsKwargs(p=1), ArgsKwargs(p=1),
], ],
# Use default tolerances of `torch.testing.assert_close`
closeness_kwargs=dict(rtol=None, atol=None),
), ),
ConsistencyConfig( ConsistencyConfig(
prototype_transforms.RandomAdjustSharpness, prototype_transforms.RandomAdjustSharpness,
......
...@@ -377,17 +377,23 @@ def autocontrast_image_tensor(image: torch.Tensor) -> torch.Tensor: ...@@ -377,17 +377,23 @@ def autocontrast_image_tensor(image: torch.Tensor) -> torch.Tensor:
return image return image
bound = _FT._max_value(image.dtype) bound = _FT._max_value(image.dtype)
dtype = image.dtype if torch.is_floating_point(image) else torch.float32 fp = image.is_floating_point()
float_image = image if fp else image.to(torch.float32)
minimum = image.amin(dim=(-2, -1), keepdim=True).to(dtype) minimum = float_image.amin(dim=(-2, -1), keepdim=True)
maximum = image.amax(dim=(-2, -1), keepdim=True).to(dtype) maximum = float_image.amax(dim=(-2, -1), keepdim=True)
scale = bound / (maximum - minimum)
eq_idxs = maximum == minimum eq_idxs = maximum == minimum
inv_scale = maximum.sub_(minimum).div_(bound)
minimum[eq_idxs] = 0.0 minimum[eq_idxs] = 0.0
scale[eq_idxs] = 1.0 inv_scale[eq_idxs] = 1.0
if fp:
diff = float_image.sub(minimum)
else:
diff = float_image.sub_(minimum)
return (image - minimum).mul_(scale).clamp_(0, bound).to(image.dtype) return diff.div_(inv_scale).clamp_(0, bound).to(image.dtype)
autocontrast_image_pil = _FP.autocontrast autocontrast_image_pil = _FP.autocontrast
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment