From 693c18a76a9aacba2cd53d93ef73894137b52ad5 Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Tue, 31 Mar 2020 08:04:01 +0200 Subject: [PATCH 1/4] type annotations for torchvision/utils.py --- torchvision/utils.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/torchvision/utils.py b/torchvision/utils.py index 9658328a704..47329ff78ff 100644 --- a/torchvision/utils.py +++ b/torchvision/utils.py @@ -1,10 +1,13 @@ +from typing import Union, Optional, Sequence, Tuple +import io import torch import math irange = range -def make_grid(tensor, nrow=8, padding=2, - normalize=False, range=None, scale_each=False, pad_value=0): +def make_grid(tensor: Union[torch.Tensor, Sequence[torch.Tensor]], nrow: int = 8, + padding: int = 2, normalize=False, range: Optional[Tuple[int, int]] = None, + scale_each: bool = False, pad_value: int = 0) -> torch.Tensor: """Make a grid of images. Args: @@ -88,8 +91,9 @@ def norm_range(t, range): return grid -def save_image(tensor, fp, nrow=8, padding=2, - normalize=False, range=None, scale_each=False, pad_value=0, format=None): +def save_image(tensor: Union[torch.Tensor, Sequence[torch.Tensor]], fp: Union[str, io.FileIO, io.BytesIO], + nrow: int = 8, padding: int = 2, normalize: bool = False, range: Optional[Tuple[int, int]] = None, + scale_each: bool = False, pad_value: int = 0, format: Optional[str, io.FileIO] = None) -> None: """Save a given Tensor into an image file. Args: From adf4ed0360c3df6dc0c1d4b4990daf2a0c295ec8 Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Wed, 1 Apr 2020 08:03:10 +0200 Subject: [PATCH 2/4] add missing annotation for make_grid --- torchvision/utils.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/torchvision/utils.py b/torchvision/utils.py index 47329ff78ff..713ba7c3dce 100644 --- a/torchvision/utils.py +++ b/torchvision/utils.py @@ -6,8 +6,9 @@ def make_grid(tensor: Union[torch.Tensor, Sequence[torch.Tensor]], nrow: int = 8, - padding: int = 2, normalize=False, range: Optional[Tuple[int, int]] = None, - scale_each: bool = False, pad_value: int = 0) -> torch.Tensor: + padding: int = 2, normalize: bool = False, + range: Optional[Tuple[int, int]] = None, scale_each: bool = False, + pad_value: int = 0) -> torch.Tensor: """Make a grid of images. Args: From 55486457ee995a513cdbe7b52b6e612e99d14cb2 Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Wed, 1 Apr 2020 08:03:57 +0200 Subject: [PATCH 3/4] fix annotation for save_image --- torchvision/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/torchvision/utils.py b/torchvision/utils.py index 713ba7c3dce..34e5a42aa9c 100644 --- a/torchvision/utils.py +++ b/torchvision/utils.py @@ -94,7 +94,7 @@ def norm_range(t, range): def save_image(tensor: Union[torch.Tensor, Sequence[torch.Tensor]], fp: Union[str, io.FileIO, io.BytesIO], nrow: int = 8, padding: int = 2, normalize: bool = False, range: Optional[Tuple[int, int]] = None, - scale_each: bool = False, pad_value: int = 0, format: Optional[str, io.FileIO] = None) -> None: + scale_each: bool = False, pad_value: int = 0, format: Optional[str] = None) -> None: """Save a given Tensor into an image file. Args: From 57cb27dcfed7aabeaa9b8c043e5e468117998871 Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Fri, 3 Apr 2020 15:03:20 +0200 Subject: [PATCH 4/4] mirror PIL annotation for fp --- torchvision/utils.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/torchvision/utils.py b/torchvision/utils.py index 34e5a42aa9c..f4b97bfe4da 100644 --- a/torchvision/utils.py +++ b/torchvision/utils.py @@ -1,5 +1,6 @@ -from typing import Union, Optional, Sequence, Tuple +from typing import Union, Optional, Sequence, Tuple, Text, BinaryIO import io +import pathlib import torch import math irange = range @@ -92,7 +93,7 @@ def norm_range(t, range): return grid -def save_image(tensor: Union[torch.Tensor, Sequence[torch.Tensor]], fp: Union[str, io.FileIO, io.BytesIO], +def save_image(tensor: Union[torch.Tensor, Sequence[torch.Tensor]], fp: Union[Text, pathlib.Path, BinaryIO], nrow: int = 8, padding: int = 2, normalize: bool = False, range: Optional[Tuple[int, int]] = None, scale_each: bool = False, pad_value: int = 0, format: Optional[str] = None) -> None: """Save a given Tensor into an image file.