Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Type hint #2195

Merged
merged 4 commits into from
Jul 17, 2024
Merged

Fix Type hint #2195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5654d80
Fix Type hint
ZhipengXue97 Jul 13, 2024
35c0b04
fix type hint
ZhipengXue97 Jul 16, 2024
790d2f7
Remove Union
ZhipengXue97 Jul 16, 2024
e9e98c4
format code
ZhipengXue97 Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions rastervision_core/rastervision/core/data/utils/misc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
log = logging.getLogger(__name__)


def color_to_triple(
color: str | Sequence | None = None) -> tuple[int, int, int]:
def color_to_triple(color: str | Sequence | None = None
) -> list[str] | tuple[int, int, int]:
"""Given a PIL ImageColor string, return a triple of integers
representing the red, green, and blue values.

Expand Down
5 changes: 3 additions & 2 deletions rastervision_pytorch_learner/rastervision/pytorch_learner/learner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1181,8 +1181,9 @@ def build_dataset(self,
ds = self.cfg.data.build_dataset(split=split, tmp_dir=self.tmp_dir)
return ds

def build_dataloaders(self, distributed: bool | None = None
) -> tuple[DataLoader, DataLoader, DataLoader]:
def build_dataloaders(
self, distributed: bool | None = None
) -> tuple[DataLoader, DataLoader, DataLoader | None]:
"""Build DataLoaders for train, validation, and test splits."""
if distributed is None:
distributed = self.distributed
Expand Down
7 changes: 3 additions & 4 deletions rastervision_pytorch_learner/rastervision/pytorch_learner/learner_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ def num_classes(self):

@field_validator('augmentors')
@classmethod
def validate_augmentors(cls, v: list[str]) -> str:
def validate_augmentors(cls, v: list[str]) -> list[str]:
for aug_name in v:
if aug_name not in augmentors:
raise ConfigError(f'Unsupported augmentor "{aug_name}"')
Expand Down Expand Up @@ -862,8 +862,7 @@ def validate_group_uris(self) -> Self:

def _build_dataset(self,
dirs: Iterable[str],
tf: A.BasicTransform | None = None
) -> tuple[Dataset, Dataset, Dataset]:
tf: A.BasicTransform | None = None) -> Dataset:
"""Make datasets for a single split.

Args:
Expand Down Expand Up @@ -1224,7 +1223,7 @@ def _build_dataset(self,
split: Literal['train', 'valid', 'test'],
tf: A.BasicTransform | None = None,
tmp_dir: str | None = None,
**kwargs) -> tuple[Dataset, Dataset, Dataset]:
**kwargs) -> Dataset:
"""Make training, validation, and test datasets.

Args:
Expand Down