GitLab

Co-authored-by: Philip Meier <github.pmeier@posteo.de>
Co-authored-by: vfdev <vfdev.5@gmail.com>

* fix typos throughout the code base

* fix grammar

* revert formatting changes to gallery

* revert 'an uXX'

* remove 'number of the best'

* fix prototype kernels

* fix stable kernels

* fix tests

* make test more robust

* improve invert for signed integers

* improve invert

* fix posterize

* Revert "assume that integer images are [0, 255] in equalize (#6859)"

This reverts commit 436ff9a5

.

* fix solarize in AA

* fix resize

* Revert "fix resize"

This reverts commit 5f33f4aa73e098237650b794157ec9335d964152.

* add comment to float max value
Co-authored-by: Vasilis Vryniotis <datumbox@users.noreply.github.com>

* WIP

* _blend optim v1

* _blend and color ops optims: v2

* updated a/r tol and configs to make tests pass

* Loose a/r tolerance in AA tests

* Use custom rgb_to_grayscale

* Renamed img -> image

* nit code update

* PR review

* adjust_contrast convert to float32 earlier

* Revert "adjust_contrast convert to float32 earlier"

This reverts commit a82cf8c739d02acd9868ebee4b8b99d101c3e45e.

* pad_image_tensor

* pad_mask and pad_bounding_box

* resize_{image_tensor, mask, bounding_box}

* center_crop_{image_tensor, mask}

* {five, ten}_crop_image_tensor

* crop_{image_tensor, mask}

* convert_color_space_image_tensor

* affine_{image_tensor, mask, bounding_box}

* rotate_{image_tensor, mask}

* gaussian_blur_image_tensor

* cleanup

* prevent feature wrapping for inplace ops

* cleanup

* mypy

* refactor __torch_function__ to be more concise

* avoid double lookup

* fix normalize

* refactor normalize

* mypy

Co-authored-by: Vasilis Vryniotis <datumbox@users.noreply.github.com>

* Updated fill arg typehint for affine, perspective and elastic ops

* Updated pad op on prototype side

* Code updates

* Few other minor updates

* WIP

* WIP

* Updates

* Update _image.py

* Fixed tests

* Updated fill arg typehint for affine, perspective and elastic ops

* Updated pad op on prototype side

* Code updates

* Few other minor updates

* clean up bboxes

* Adding padding_mode in pad_bbox

* Fixing tests and renamed _compute_output_size to appropriate names
Co-authored-by: Vasilis Vryniotis <vvryniotis@fb.com>

* [proto] Fixed RandAug implementation

* Fixed randomness in tests for trivial aug

* Fixed all AA tests

* add deprecated color conversion functionals

* allow grayscale tensor inputs in rgb_to_grayscale

* add cloning to tensor no-op

* improve todo comment

* [skip ci]

* use legacy kernels

use legacy kernels

* fix import

* remove duplicate code

* remove duplicate check

* [proto] Fixed issue with `F.pad` from RandomZoomOut

* Fixed failing tests

* Fixed wrong type hint

* Fixed fill=None in pad_image_pil

* Try to support fill=None in functional

* Code formatting

* [proto] Added few transforms tests, part 1 (#6262)

* Added supported/unsupported data checks in the tests for cutmix/mixup

* Added RandomRotation, RandomAffine transforms tests

* Added tests for RandomZoomOut, Pad

* Update test_prototype_transforms.py

* Added RandomCrop transform and tests (#6271)

* [proto] Added GaussianBlur transform and tests (#6273)

* Added GaussianBlur transform and tests

* Fixing code format

* Copied correctness test

* [proto] Added random color transforms and tests (#6275)

* Added random color transforms and tests

* Disable smoke test for RandomSolarize, RandomAdjustSharpness

* Added RandomPerspective and tests (#6284)

- replaced real image creation by mocks for other tests

* Added more functional tests (#6285)

* [proto] Added elastic transform and tests (#6295)

* WIP [proto] Added functional elastic transform with tests

* Added more functional tests

* WIP on elastic op

* Added elastic transform and tests

* Added tests

* Added tests for ElasticTransform

* Try to format code as in https://github.com/pytorch/vision/pull/5106



* Fixed bug in affine get_params test

* Implemented RandomErase on PIL input as fallback to tensors (#6309)

Added tests

* Added image_size computation for BoundingBox.rotate if expand (#6319)

* Added image_size computation for BoundingBox.rotate if expand

* Added tests

* Added erase_image_pil and eager/jit erase_image_tensor test (#6320)

* Updates according to the review
Co-authored-by: Vasilis Vryniotis <datumbox@users.noreply.github.com>

* upgrade usort to

* Also update black

* Actually use 1.0.2

* Apply pre-commit
Co-authored-by: Nicolas Hug <contact@nicolas-hug.com>

* Another attempt to add transforms

* Fixed padding type hint

* Fixed fill arg for pad and rotate, affine

* code formatting and type hints for affine transformation

* Fixed flake8

* Updated tests to save and load transforms

* Fixed code formatting issue

* Fixed jit loading issue

* Restored fill default value to None
Updated code according to the review

* Added tests for rotation, affine and zoom transforms

* Put back commented code

* Random erase bypass boxes and masks
Go back with if-return/elif-return/else-return

* Fixed acceptable and non-acceptable types for Cutmix/Mixup

* Updated conditions for _BaseMixupCutmix

* Refactored and modified private api for resize functional op

* Fixed failures

* More updates

* Fixed flake8

* Added elastic augment

* ufmt formatting

* updated comments

* fixed circular dependency issue and bare except error

* Fixed three type checking errors in functional_tensor.py

* ufmt formatted

* changed elastic_deformation to a more common implementation

Implementation uses alpha and sigma to control strength and smoothness of the displacement vectors in elastic_deformation instead of control_point_spacings and sigma.

* ufmt formatting

* Some performance updates

Put random offset vectors to device before gaussian_blur is applied speeds it up 3-fold.

* fixed type error

* fixed again a type error

* Update torchvision/transforms/functional_tensor.py
Co-authored-by: vfdev <vfdev.5@gmail.com>

* Added some requested changes

- pil image support similar to GaussianBlur
- changed interpolation arg to InterpolationMode
- added a wrapper in torchvision.transforms.functional.py that gets called by the class in transforms.py
-renamed it to ElasticTransform
- handled sigma = 0 case

* added img docstring

* added some tests

* Updated tests and the code

* Added the requested changes to the arguments of F.elastic_transform

Added random_state and displacement as arguments to F.elastic_transform

* fixed the type error

* Fixed tests and docs

* implemented requested changes

Changes:
1) alpha AND sigma OR displacement must be given as arguments to transforms.functional_tensor.elastic_transform instead of alpha AND sigma AND displacement
2) displacements are accepted in transforms.functional.elastic_transform as np.array and torch.Tensor instead of only accepting torch.Tensor

* ufmt formatting

* trochscript error resolved

replaced torch.from_numpy() to torch.Tensor() to make it compatible to torchscript

* revert to torch.from_numpy()

* updated argument checks and errors

- In F.elastic_transform added check to see if both user inputs img and displacement are either of type PIL Image and ndarray or both of type tensor.
- In F_t.elastic_transform added check if alpha and sigma are None if displacement is given or vice versa.

* fixed seed error

changed torch.seed to torch.manual_seed in F_t.elastic_transform

* Reverted displacement type and other cosmetics

* Other minor improvements

* changed gaussian_blur filter size

changed gaussian_blur filter size
from
4 * int(sigma) + 1
to
int(8 * sigma + 1)
to make it consistent with ernestums implementation

* resolved merge error

* Revert "resolved merge error"

This reverts commit 6a4a4e74ff4d078e2c2753d359185f9a81c415d0.

* resolve merge error

* ufmt formatted

* ufmt formated once again..

* fixed unsupported operand error

* Update API and removed random_state from functional part

* Added default values

* Added ElasticTransform to gallery and updated the docstring

* Updated gallery and added _log_api_usage_once
BTW, matplotlib.pylab is deprecated

* Updated gallery transforms code

* Updates according to review
Co-authored-by: vfdev <vfdev.5@gmail.com>

* Fixed issue with padding on CI

* Disabled failing tests with color_jitter

* Remove Jitter workaround
Co-authored-by: Vasilis Vryniotis <datumbox@users.noreply.github.com>

* Fixed rotate with expand inconsistency between torch vs PIL on odd-sized images

* Update functional_tensor.py

* port RandomZoomOut from detection references to prototype transforms

* copy by default

* move padding parsing to stable API

* merge zoom out kernels into transform

* lint

* fix filling if no padding was done

* resolve todo

* Removed _max_value method and added a dictionary

Related to https://github.com/pytorch/vision/issues/5502

* Addressed failing tests and restored _max_value method

* Added xfailing test to switch quicker

* Switch to if/else impl

* Replace get_image_size/num_channels with get_image_dims

* Reduce verbosity

* Fix JIT-scriptability

* Refactoring

* More refactoring

* Replace all _FP/_FT direct calls.

* Remove usages of get_image_size and get_image_num_channels from code-base.

* Fix JIT issues

* Adding missing assertion.

* add tensor kernels for normalize and erase

* add image tensor assertion

* Fix resize when size == small_edge_size and max_size isn't None

* Better test name

* Removed custom ops for interp with AA

* Fixed umft issues
Co-authored-by: Vasilis Vryniotis <datumbox@users.noreply.github.com>

* Remove APIs that were deprecated before 0.8

* More stuff

* Some more

* oops

* Fix bug on autocontrast when `min==max`

* Adding PIL vs TorchVision test for min==max

* Update functional_tensor.py

To resolve issue #4818
Add assert function and logic after checking bound of image

* Update functional_tensor.py

* Update test

* Update test_functional_tensor.py

* Update test_functional_tensor.py

* Update test_functional_tensor.py

* Update test_functional_tensor.py

* Update test_functional_tensor.py

* Update test_functional_tensor.py

* Update test_functional_tensor.py

* Update test_functional_tensor.py

* Fix linter
Co-authored-by: Vasilis Vryniotis <datumbox@users.noreply.github.com>

Co-authored-by: Nicolas Hug <nicolashug@fb.com>

* add ufmt as code formatter

* cleanup

* quote ufmt requirement

* split imports into more groups

* regenerate circleci config

* fix CI

* clarify local testing utils section

* use ufmt pre-commit hook

* split relative imports into local category

* Revert "split relative imports into local category"

This reverts commit f2e224cde2008c56c9347c1f69746d39065cdd51.

* pin black and usort dependencies

* fix local test utils detection

* fix ufmt rev

* add reference utils to local category

* fix usort config

* remove custom categories sorting

* Run pre-commit without fixing flake8

* got a double import in merge
Co-authored-by: Nicolas Hug <nicolashug@fb.com>

* update channels parameter to every calling to check_functional_vs_PIL_vs_scripted

* update adjust_saturation

* update docstrings for functional transformations

* parametrize channels

* update docstring of ColorJitter class

* move channels to class's parameter

* remove testing channels for geometric transforms

* revert redundant changes

* revert redundant changes

* update grayscale test cases for randaugment, autoaugment, trivialaugment

* update docstrings of randaugment, autoaugment, trivialaugment

* update docstring of ColorJitter

* fix adjust_hue's docstring

* change test equal tolerance

* refactor grayscale tests

* make get_grayscale_test_image private