From a22c2e372f177ec36c2cdb3319988d60142552a0 Mon Sep 17 00:00:00 2001 From: Aditya Oke Date: Mon, 6 Dec 2021 13:48:42 +0530 Subject: [PATCH 1/2] Upgrade to py37 --- torchvision/datasets/_optical_flow.py | 4 ++-- torchvision/io/_video_opt.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/torchvision/datasets/_optical_flow.py b/torchvision/datasets/_optical_flow.py index 80063a6e3de..455f33fff4e 100644 --- a/torchvision/datasets/_optical_flow.py +++ b/torchvision/datasets/_optical_flow.py @@ -326,10 +326,10 @@ def __init__(self, root, split="train", pass_name="clean", camera="left", transf directions = ("into_future", "into_past") for pass_name, camera, direction in itertools.product(passes, cameras, directions): image_dirs = sorted(glob(str(root / pass_name / split / "*/*"))) - image_dirs = sorted([Path(image_dir) / camera for image_dir in image_dirs]) + image_dirs = sorted(Path(image_dir) / camera for image_dir in image_dirs) flow_dirs = sorted(glob(str(root / "optical_flow" / split / "*/*"))) - flow_dirs = sorted([Path(flow_dir) / direction / camera for flow_dir in flow_dirs]) + flow_dirs = sorted(Path(flow_dir) / direction / camera for flow_dir in flow_dirs) if not image_dirs or not flow_dirs: raise FileNotFoundError( diff --git a/torchvision/io/_video_opt.py b/torchvision/io/_video_opt.py index 45bec44ec61..8110cf83d35 100644 --- a/torchvision/io/_video_opt.py +++ b/torchvision/io/_video_opt.py @@ -72,7 +72,7 @@ def _validate_pts(pts_range: Tuple[int, int]) -> None: assert ( pts_range[0] <= pts_range[1] ), """Start pts should not be smaller than end pts, got - start pts: {0:d} and end pts: {1:d}""".format( + start pts: {:d} and end pts: {:d}""".format( pts_range[0], pts_range[1], ) From 9e6a4ad756b58776a09e6bc41d598d46371e9d79 Mon Sep 17 00:00:00 2001 From: Aditya Oke Date: Sat, 25 Dec 2021 17:49:17 +0530 Subject: [PATCH 2/2] Update --- torchvision/datasets/food101.py | 2 +- torchvision/models/optical_flow/raft.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/torchvision/datasets/food101.py b/torchvision/datasets/food101.py index b94a78169d2..cffe0c50a06 100644 --- a/torchvision/datasets/food101.py +++ b/torchvision/datasets/food101.py @@ -51,7 +51,7 @@ def __init__( self._labels = [] self._image_files = [] - with open(self._meta_folder / f"{split}.json", "r") as f: + with open(self._meta_folder / f"{split}.json") as f: metadata = json.loads(f.read()) self.classes = sorted(metadata.keys()) diff --git a/torchvision/models/optical_flow/raft.py b/torchvision/models/optical_flow/raft.py index 5e3388d66b2..b183f89b630 100644 --- a/torchvision/models/optical_flow/raft.py +++ b/torchvision/models/optical_flow/raft.py @@ -74,7 +74,7 @@ class BottleneckBlock(nn.Module): """Slightly modified BottleNeck block (extra relu and biases)""" def __init__(self, in_channels, out_channels, *, norm_layer, stride=1): - super(BottleneckBlock, self).__init__() + super().__init__() # See note in ResidualBlock for the reason behind bias=True self.convnormrelu1 = ConvNormActivation(