Merge branch 'main' into resize-image-kernel-atol

pytorch · Nov 23, 2023 · 0e4ae2b · 0e4ae2b
2 parents d2fa7b5 + ec7f80b
commit 0e4ae2b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/test/test_transforms_v2.py b/test/test_transforms_v2.py
@@ -3641,7 +3641,7 @@ def test_kernel_mask(self, make_mask):
     @pytest.mark.parametrize("fill", [[1], (0,), [1, 0, 1], (0, 1, 0)])
     def test_kernel_mask_errors(self, fill):
         with pytest.raises(ValueError, match="Non-scalar fill value is not supported"):
-            check_kernel(F.pad_mask, make_segmentation_mask(), padding=[1], fill=fill)
+            F.pad_mask(make_segmentation_mask(), padding=[1], fill=fill)
 
     def test_kernel_video(self):
         check_kernel(F.pad_video, make_video(), padding=[1])

diff --git a/torchvision/datasets/fakedata.py b/torchvision/datasets/fakedata.py
@@ -31,7 +31,7 @@ def __init__(
         target_transform: Optional[Callable] = None,
         random_offset: int = 0,
     ) -> None:
-        super().__init__(None, transform=transform, target_transform=target_transform)  # type: ignore[arg-type]
+        super().__init__(transform=transform, target_transform=target_transform)
         self.size = size
         self.num_classes = num_classes
         self.image_size = image_size

diff --git a/torchvision/datasets/vision.py b/torchvision/datasets/vision.py
@@ -29,7 +29,7 @@ class VisionDataset(data.Dataset):
 
     def __init__(
         self,
-        root: Optional[str] = None,
+        root: str = None,  # type: ignore[assignment]
         transforms: Optional[Callable] = None,
         transform: Optional[Callable] = None,
         target_transform: Optional[Callable] = None,