Datasets: add default 'root' argument (microsoft#802)

* Datasets: add default 'root' argument * Allow SpaceNet image to be optional * Remove modifications to SpaceNet base class
yichiac · Oct 1, 2022 · 91f1f43 · 91f1f43
1 parent 90604e3
commit 91f1f43
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/torchgeo/datasets/geo.py b/torchgeo/datasets/geo.py
@@ -306,7 +306,7 @@ class RasterDataset(GeoDataset):
 
     def __init__(
         self,
-        root: str,
+        root: str = "data",
         crs: Optional[CRS] = None,
         res: Optional[float] = None,
         bands: Optional[Sequence[str]] = None,
@@ -712,7 +712,7 @@ class NonGeoClassificationDataset(NonGeoDataset, ImageFolder):  # type: ignore[m
 
     def __init__(
         self,
-        root: str,
+        root: str = "data",
         transforms: Optional[Callable[[Dict[str, Tensor]], Dict[str, Tensor]]] = None,
         loader: Optional[Callable[[str], Any]] = pil_loader,
         is_valid_file: Optional[Callable[[str], bool]] = None,

diff --git a/torchgeo/datasets/inria.py b/torchgeo/datasets/inria.py
@@ -53,7 +53,7 @@ class InriaAerialImageLabeling(NonGeoDataset):
 
     def __init__(
         self,
-        root: str,
+        root: str = "data",
         split: str = "train",
         transforms: Optional[Callable[[Dict[str, Any]], Dict[str, Any]]] = None,
         checksum: bool = False,

diff --git a/torchgeo/datasets/spacenet.py b/torchgeo/datasets/spacenet.py
@@ -401,7 +401,7 @@ class SpaceNet1(SpaceNet):
 
     def __init__(
         self,
-        root: str,
+        root: str = "data",
         image: str = "rgb",
         transforms: Optional[Callable[[Dict[str, Any]], Dict[str, Any]]] = None,
         download: bool = False,
@@ -523,7 +523,7 @@ class SpaceNet2(SpaceNet):
 
     def __init__(
         self,
-        root: str,
+        root: str = "data",
         image: str = "PS-RGB",
         collections: List[str] = [],
         transforms: Optional[Callable[[Dict[str, Any]], Dict[str, Any]]] = None,
@@ -650,7 +650,7 @@ class SpaceNet3(SpaceNet):
 
     def __init__(
         self,
-        root: str,
+        root: str = "data",
         image: str = "PS-RGB",
         speed_mask: Optional[bool] = False,
         collections: List[str] = [],
@@ -907,7 +907,7 @@ class SpaceNet4(SpaceNet):
 
     def __init__(
         self,
-        root: str,
+        root: str = "data",
         image: str = "PS-RGBNIR",
         angles: List[str] = [],
         transforms: Optional[Callable[[Dict[str, Any]], Dict[str, Any]]] = None,
@@ -1082,7 +1082,7 @@ class SpaceNet5(SpaceNet3):
 
     def __init__(
         self,
-        root: str,
+        root: str = "data",
         image: str = "PS-RGB",
         speed_mask: Optional[bool] = False,
         collections: List[str] = [],
@@ -1179,7 +1179,7 @@ class SpaceNet7(SpaceNet):
 
     def __init__(
         self,
-        root: str,
+        root: str = "data",
         split: str = "train",
         transforms: Optional[Callable[[Dict[str, Any]], Dict[str, Any]]] = None,
         download: bool = False,