[proto] Fix bug with Compose and PR 6504 (#6510)

* [proto] Fix bug with Compose and PR 6504

* Added tests and fixed other bugs

Author: vfdev-5

test/test_prototype_transforms.py

@@ -1108,13 +1108,18 @@ def test_assertions(self, transform_cls):
 
     @pytest.mark.parametrize("transform_cls", [transforms.Compose, transforms.RandomChoice, transforms.RandomOrder])
     @pytest.mark.parametrize(
-        "trfms", [[transforms.Pad(2), transforms.RandomCrop(28)], [lambda x: 2.0 * x, transforms.RandomCrop(28)]]
+        "trfms",
+        [
+            [transforms.Pad(2), transforms.RandomCrop(28)],
+            [lambda x: 2.0 * x, transforms.Pad(2), transforms.RandomCrop(28)],
+        ],
     )
     def test_ctor(self, transform_cls, trfms):
         c = transform_cls(trfms)
         inpt = torch.rand(1, 3, 32, 32)
         output = c(inpt)
         assert isinstance(output, torch.Tensor)
+        assert output.ndim == 4
 
 
 class TestRandomChoice:

torchvision/prototype/transforms/_container.py

@@ -15,9 +15,10 @@ def __init__(self, transforms: Sequence[Callable]) -> None:
         self.transforms = transforms
 
     def forward(self, *inputs: Any) -> Any:
+        sample = inputs if len(inputs) > 1 else inputs[0]
         for transform in self.transforms:
-            inputs = transform(*inputs)
-        return inputs
+            sample = transform(sample)
+        return sample
 
 
 class RandomApply(_RandomApplyTransform):
@@ -76,7 +77,8 @@ def __init__(self, transforms: Sequence[Callable]) -> None:
         self.transforms = transforms
 
     def forward(self, *inputs: Any) -> Any:
+        sample = inputs if len(inputs) > 1 else inputs[0]
         for idx in torch.randperm(len(self.transforms)):
             transform = self.transforms[idx]
-            inputs = transform(*inputs)
-        return inputs
+            sample = transform(sample)
+        return sample