Remaining Transforms: Import version independent torchvision instead …

…of defaulting to v1 (#1723)

* image grid transform: make v1 independent

* jigsaw: make v1 independent

* MAE: make v1 independent

* MSN: make v1 independent

* multicrop: make v1 independent

* multiview: make v1 independent

* PIRL: make v1 independent

* random crop/flip: make v1 independent

* random rotation: make v1 independent

* simclr transform: make v1 independent

* SimSiam transform: make v1 independent

* SMoG: make v1 independent

* SwaV: make v1 independent

* VICReg: make v1 independent

* VICRegL: make v1 independent

* WMSE: make v1 independent

* fix formatting

lightly/transforms/image_grid_transform.py

@@ -1,9 +1,10 @@
 from typing import List, Sequence, Union
 
-import torchvision.transforms as T
 from PIL.Image import Image
 from torch import Tensor
 
+from lightly.transforms.torchvision_v2_compatibility import torchvision_transforms as T
+
 
 class ImageGridTransform:
     """Transforms an image into multiple views and grids.

lightly/transforms/jigsaw.py

@@ -8,7 +8,8 @@
 from PIL import Image as Image
 from PIL.Image import Image as PILImage
 from torch import Tensor
-from torchvision import transforms as T
+
+from lightly.transforms.torchvision_v2_compatibility import torchvision_transforms as T
 
 if TYPE_CHECKING:
     from numpy.typing import NDArray

lightly/transforms/mae_transform.py

@@ -1,9 +1,9 @@
 from typing import Dict, List, Tuple, Union
 
-import torchvision.transforms as T
 from PIL.Image import Image
 from torch import Tensor
 
+from lightly.transforms.torchvision_v2_compatibility import torchvision_transforms as T
 from lightly.transforms.utils import IMAGENET_NORMALIZE
 
 

lightly/transforms/msn_transform.py

@@ -1,11 +1,11 @@
 from typing import Dict, List, Optional, Tuple, Union
 
-import torchvision.transforms as T
 from PIL.Image import Image
 from torch import Tensor
 
 from lightly.transforms.gaussian_blur import GaussianBlur
 from lightly.transforms.multi_view_transform import MultiViewTransform
+from lightly.transforms.torchvision_v2_compatibility import torchvision_transforms as T
 from lightly.transforms.utils import IMAGENET_NORMALIZE
 
 

lightly/transforms/multi_crop_transform.py

@@ -1,8 +1,7 @@
 from typing import Tuple
 
-import torchvision.transforms as T
-
 from lightly.transforms.multi_view_transform import MultiViewTransform
+from lightly.transforms.torchvision_v2_compatibility import torchvision_transforms as T
 
 
 class MultiCropTranform(MultiViewTransform):

lightly/transforms/multi_view_transform.py

@@ -2,7 +2,8 @@
 
 from PIL.Image import Image
 from torch import Tensor
-from torchvision import transforms as T
+
+from lightly.transforms.torchvision_v2_compatibility import torchvision_transforms as T
 
 
 class MultiViewTransform:

lightly/transforms/pirl_transform.py

@@ -1,10 +1,9 @@
 from typing import Dict, List, Tuple, Union
 
-import torchvision.transforms as T
-
 from lightly.transforms.jigsaw import Jigsaw
 from lightly.transforms.multi_view_transform import MultiViewTransform
 from lightly.transforms.rotation import random_rotation_transform
+from lightly.transforms.torchvision_v2_compatibility import torchvision_transforms as T
 from lightly.transforms.utils import IMAGENET_NORMALIZE
 
 

lightly/transforms/random_crop_and_flip_with_grid.py

@@ -2,11 +2,12 @@
 from typing import Tuple
 
 import torch
-import torchvision.transforms as T
 import torchvision.transforms.functional as F
 from PIL import Image
 from torch import nn
 
+from lightly.transforms.torchvision_v2_compatibility import torchvision_transforms as T
+
 
 @dataclass
 class Location:

lightly/transforms/rotation.py

@@ -4,11 +4,12 @@
 from typing import Callable, Tuple, Union
 
 import numpy as np
-import torchvision.transforms as T
 from PIL.Image import Image
 from torch import Tensor
 from torchvision.transforms import functional as TF
 
+from lightly.transforms.torchvision_v2_compatibility import torchvision_transforms as T
+
 
 class RandomRotate:
     """Implementation of random rotation.

lightly/transforms/simclr_transform.py

@@ -1,12 +1,12 @@
 from typing import Dict, List, Optional, Tuple, Union
 
-import torchvision.transforms as T
 from PIL.Image import Image
 from torch import Tensor
 
 from lightly.transforms.gaussian_blur import GaussianBlur
 from lightly.transforms.multi_view_transform import MultiViewTransform
 from lightly.transforms.rotation import random_rotation_transform
+from lightly.transforms.torchvision_v2_compatibility import torchvision_transforms as T
 from lightly.transforms.utils import IMAGENET_NORMALIZE
 
 

lightly/transforms/simsiam_transform.py

@@ -1,12 +1,12 @@
 from typing import Dict, List, Optional, Tuple, Union
 
-import torchvision.transforms as T
 from PIL.Image import Image
 from torch import Tensor
 
 from lightly.transforms.gaussian_blur import GaussianBlur
 from lightly.transforms.multi_view_transform import MultiViewTransform
 from lightly.transforms.rotation import random_rotation_transform
+from lightly.transforms.torchvision_v2_compatibility import torchvision_transforms as T
 from lightly.transforms.utils import IMAGENET_NORMALIZE
 
 

lightly/transforms/smog_transform.py

@@ -1,12 +1,12 @@
 from typing import Dict, List, Optional, Tuple, Union
 
-import torchvision.transforms as T
 from PIL.Image import Image
 from torch import Tensor
 
 from lightly.transforms.gaussian_blur import GaussianBlur
 from lightly.transforms.multi_view_transform import MultiViewTransform
 from lightly.transforms.solarize import RandomSolarization
+from lightly.transforms.torchvision_v2_compatibility import torchvision_transforms as T
 from lightly.transforms.utils import IMAGENET_NORMALIZE
 
 

lightly/transforms/swav_transform.py

@@ -1,12 +1,12 @@
 from typing import Dict, List, Optional, Tuple, Union
 
-import torchvision.transforms as T
 from PIL.Image import Image
 from torch import Tensor
 
 from lightly.transforms.gaussian_blur import GaussianBlur
 from lightly.transforms.multi_crop_transform import MultiCropTranform
 from lightly.transforms.rotation import random_rotation_transform
+from lightly.transforms.torchvision_v2_compatibility import torchvision_transforms as T
 from lightly.transforms.utils import IMAGENET_NORMALIZE
 
 

lightly/transforms/vicreg_transform.py

@@ -1,13 +1,13 @@
 from typing import Dict, List, Optional, Tuple, Union
 
-import torchvision.transforms as T
 from PIL.Image import Image
 from torch import Tensor
 
 from lightly.transforms.gaussian_blur import GaussianBlur
 from lightly.transforms.multi_view_transform import MultiViewTransform
 from lightly.transforms.rotation import random_rotation_transform
 from lightly.transforms.solarize import RandomSolarization
+from lightly.transforms.torchvision_v2_compatibility import torchvision_transforms as T
 from lightly.transforms.utils import IMAGENET_NORMALIZE
 
 

lightly/transforms/vicregl_transform.py

@@ -1,13 +1,13 @@
 from typing import Dict, List, Optional, Tuple, Union
 
-import torchvision.transforms as T
 from PIL.Image import Image
 from torch import Tensor
 
 from lightly.transforms.gaussian_blur import GaussianBlur
 from lightly.transforms.image_grid_transform import ImageGridTransform
 from lightly.transforms.random_crop_and_flip_with_grid import RandomResizedCropAndFlip
 from lightly.transforms.solarize import RandomSolarization
+from lightly.transforms.torchvision_v2_compatibility import torchvision_transforms as T
 from lightly.transforms.utils import IMAGENET_NORMALIZE
 
 

lightly/transforms/wmse_transform.py

@@ -1,9 +1,8 @@
 from typing import Dict, List, Optional, Tuple
 
-import torchvision.transforms as T
-
 from lightly.transforms.gaussian_blur import GaussianBlur
 from lightly.transforms.multi_view_transform import MultiViewTransform
+from lightly.transforms.torchvision_v2_compatibility import torchvision_transforms as T
 from lightly.transforms.utils import IMAGENET_NORMALIZE