microsoft · adamjstewart · Jan 23, 2023 · Dec 30, 2022 · Dec 30, 2022 · Dec 30, 2022
diff --git a/conf/chesapeake_cvpr.yaml b/conf/chesapeake_cvpr.yaml
@@ -25,9 +25,8 @@ experiment:
       - "de-val"
     test_splits:
       - "de-test"
-    patches_per_tile: 200
+    batch_size: 200
     patch_size: 256
-    batch_size: 64
     num_workers: 4
     class_set: ${experiment.module.num_classes}
     use_prior_labels: False
diff --git a/conf/cowc_counting.yaml b/conf/cowc_counting.yaml
@@ -13,6 +13,5 @@ experiment:
     learning_rate_schedule_patience: 2
   datamodule:
     root: "data/cowc_counting"
-    seed: 0
     batch_size: 64
     num_workers: 4
diff --git a/conf/cyclone.yaml b/conf/cyclone.yaml
@@ -13,6 +13,5 @@ experiment:
     learning_rate_schedule_patience: 2
   datamodule:
     root: "data/cyclone"
-    seed: 0
     batch_size: 32
     num_workers: 4
diff --git a/conf/deepglobelandcover.yaml b/conf/deepglobelandcover.yaml
@@ -14,8 +14,7 @@ experiment:
     ignore_index: null
   datamodule:
     root: "data/deepglobelandcover"
-    num_tiles_per_batch: 16
-    num_patches_per_tile: 16
+    batch_size: 1
     patch_size: 64
     val_split_pct: 0.5
     num_workers: 0
diff --git a/conf/gid15.yaml b/conf/gid15.yaml
@@ -14,8 +14,7 @@ experiment:
     ignore_index: null
   datamodule:
     root: "data/gid15"
-    num_tiles_per_batch: 16
-    num_patches_per_tile: 16
+    batch_size: 1
     patch_size: 64
     val_split_pct: 0.5
     num_workers: 0
diff --git a/conf/inria.yaml b/conf/inria.yaml
@@ -1,7 +1,7 @@
 program:
   overwrite: True
 
-  
+
 trainer:
   gpus: 1
   min_epochs: 5
@@ -23,8 +23,7 @@ experiment:
     num_classes: 2
     ignore_index: null
   datamodule:
-      root: "data/inria"
-      batch_size: 2
-      num_workers: 32
-      patch_size: 512
-      num_patches_per_tile: 4
+    root: "data/inria"
+    batch_size: 1
+    patch_size: 512
+    num_workers: 32
diff --git a/conf/nasa_marine_debris.yaml b/conf/nasa_marine_debris.yaml
@@ -1,5 +1,4 @@
 program:
-  seed: 0
   overwrite: True
 
 trainer:
@@ -22,5 +21,5 @@ experiment:
   datamodule:
     root: "data/nasamr/nasa_marine_debris"
     batch_size: 4
-    num_workers: 56
+    num_workers: 6
     val_split_pct: 0.2
diff --git a/conf/oscd.yaml b/conf/oscd.yaml
diff --git a/conf/potsdam2d.yaml b/conf/potsdam2d.yaml
@@ -14,8 +14,7 @@ experiment:
     ignore_index: null
   datamodule:
     root: "data/potsdam"
-    num_tiles_per_batch: 16
-    num_patches_per_tile: 16
+    batch_size: 1
     patch_size: 64
     val_split_pct: 0.5
     num_workers: 0
diff --git a/conf/sen12ms.yaml b/conf/sen12ms.yaml
@@ -20,4 +20,3 @@ experiment:
     band_set: "all"
     batch_size: 32
     num_workers: 4
-    seed: 0
diff --git a/conf/so2sat.yaml b/conf/so2sat.yaml
@@ -11,11 +11,10 @@ experiment:
     learning_rate: 1e-3
     learning_rate_schedule_patience: 6
     weights: null
-    in_channels: 3
+    in_channels: 18
     num_classes: 17
   datamodule:
     root: "data/so2sat"
     batch_size: 128
     num_workers: 4
-    band_set: "rgb"
-    unsupervised_mode: False
+    band_set: "all"
diff --git a/conf/spacenet1.yaml b/conf/spacenet1.yaml
@@ -1,6 +1,5 @@
 program:
   overwrite: False
-  seed: 0
 trainer:
   gpus: [3]
   min_epochs: 50
@@ -22,4 +21,4 @@ experiment:
   datamodule:
     root: "data/spacenet"
     batch_size: 32
-    num_workers: 4
+    num_workers: 4
diff --git a/conf/vaihingen2d.yaml b/conf/vaihingen2d.yaml
@@ -14,8 +14,7 @@ experiment:
     ignore_index: null
   datamodule:
     root: "data/vaihingen"
-    num_tiles_per_batch: 16
-    num_patches_per_tile: 16
+    batch_size: 1
     patch_size: 64
     val_split_pct: 0.5
     num_workers: 0
diff --git a/docs/api/datamodules.rst b/docs/api/datamodules.rst
@@ -128,3 +128,21 @@ xView2
 ^^^^^^
 
 .. autoclass:: XView2DataModule
+
+Base Classes
+------------
+
+GeoDataModule
+^^^^^^^^^^^^^
+
+.. autoclass:: GeoDataModule
+
+NonGeoDataModule
+^^^^^^^^^^^^^^^^
+
+.. autoclass:: NonGeoDataModule
+
+Utilities
+---------
+
+.. autoclass:: MisconfigurationException
diff --git a/tests/conf/chesapeake_cvpr_5.yaml b/tests/conf/chesapeake_cvpr_5.yaml
@@ -20,9 +20,8 @@ experiment:
     - "de-test"
     test_splits:
     - "de-test"
-    patches_per_tile: 2
-    patch_size: 64
     batch_size: 2
+    patch_size: 64
     num_workers: 0
     class_set: ${experiment.module.num_classes}
     use_prior_labels: False
diff --git a/tests/conf/chesapeake_cvpr_7.yaml b/tests/conf/chesapeake_cvpr_7.yaml
@@ -20,9 +20,8 @@ experiment:
     - "de-test"
     test_splits:
     - "de-test"
-    patches_per_tile: 2
-    patch_size: 64
     batch_size: 2
+    patch_size: 64
     num_workers: 0
     class_set: ${experiment.module.num_classes}
     use_prior_labels: False
diff --git a/tests/conf/chesapeake_cvpr_prior.yaml b/tests/conf/chesapeake_cvpr_prior.yaml
@@ -20,9 +20,8 @@ experiment:
     - "de-test"
     test_splits:
     - "de-test"
-    patches_per_tile: 2
-    patch_size: 64
     batch_size: 2
+    patch_size: 64
     num_workers: 0
     class_set: ${experiment.module.num_classes}
     use_prior_labels: True
diff --git a/tests/conf/cowc_counting.yaml b/tests/conf/cowc_counting.yaml
@@ -10,6 +10,5 @@ experiment:
   datamodule:
     root: "tests/data/cowc_counting"
     download: true
-    seed: 0
     batch_size: 1
     num_workers: 0
diff --git a/tests/conf/cyclone.yaml b/tests/conf/cyclone.yaml
@@ -10,6 +10,5 @@ experiment:
   datamodule:
     root: "tests/data/cyclone"
     download: true
-    seed: 0
     batch_size: 1
     num_workers: 0
diff --git a/tests/conf/deepglobelandcover.yaml b/tests/conf/deepglobelandcover.yaml
@@ -14,8 +14,7 @@ experiment:
     ignore_index: null
   datamodule:
     root: "tests/data/deepglobelandcover"
-    num_tiles_per_batch: 1
-    num_patches_per_tile: 1
+    batch_size: 1
     patch_size: 2
     val_split_pct: 0.5
     num_workers: 0
diff --git a/tests/conf/gid15.yaml b/tests/conf/gid15.yaml
@@ -15,8 +15,7 @@ experiment:
   datamodule:
     root: "tests/data/gid15"
     download: true
-    num_tiles_per_batch: 1
-    num_patches_per_tile: 1
+    batch_size: 1
     patch_size: 2
     val_split_pct: 0.5
     num_workers: 0
diff --git a/tests/conf/inria_test.yaml → tests/conf/inria.yaml b/tests/conf/inria_test.yaml → tests/conf/inria.yaml
@@ -11,10 +11,9 @@ experiment:
     num_classes: 2
     ignore_index: null
   datamodule:
-      root: "tests/data/inria"
-      batch_size: 1
-      num_workers: 0
-      val_split_pct: 0.2
-      test_split_pct: 0.2
-      patch_size: 2
-      num_patches_per_tile: 2
+    root: "tests/data/inria"
+    batch_size: 1
+    patch_size: 2
+    num_workers: 0
+    val_split_pct: 0.2
+    test_split_pct: 0.2
diff --git a/tests/conf/inria_train.yaml b/tests/conf/inria_train.yaml
diff --git a/tests/conf/inria_val.yaml b/tests/conf/inria_val.yaml
diff --git a/tests/conf/potsdam2d.yaml b/tests/conf/potsdam2d.yaml
@@ -14,8 +14,7 @@ experiment:
     ignore_index: null
   datamodule:
     root: "tests/data/potsdam"
-    num_tiles_per_batch: 1
-    num_patches_per_tile: 1
+    batch_size: 1
     patch_size: 2
     val_split_pct: 0.5
     num_workers: 0
diff --git a/tests/conf/sen12ms_all.yaml b/tests/conf/sen12ms_all.yaml
@@ -15,4 +15,3 @@ experiment:
     band_set: "all"
     batch_size: 1
     num_workers: 0
-    seed: 0
diff --git a/tests/conf/sen12ms_s1.yaml b/tests/conf/sen12ms_s1.yaml
@@ -16,4 +16,3 @@ experiment:
     band_set: "s1"
     batch_size: 1
     num_workers: 0
-    seed: 0
diff --git a/tests/conf/sen12ms_s2_all.yaml b/tests/conf/sen12ms_s2_all.yaml
@@ -15,4 +15,3 @@ experiment:
     band_set: "s2-all"
     batch_size: 1
     num_workers: 0
-    seed: 0
diff --git a/tests/conf/sen12ms_s2_reduced.yaml b/tests/conf/sen12ms_s2_reduced.yaml
@@ -15,4 +15,3 @@ experiment:
     band_set: "s2-reduced"
     batch_size: 1
     num_workers: 0
-    seed: 0
diff --git a/tests/conf/so2sat_all.yaml b/tests/conf/so2sat_all.yaml
@@ -0,0 +1,15 @@
+experiment:
+  task: "so2sat"
+  module:
+    loss: "ce"
+    model: "resnet18"
+    learning_rate: 1e-3
+    learning_rate_schedule_patience: 6
+    weights: null
+    in_channels: 18
+    num_classes: 17
+  datamodule:
+    root: "tests/data/so2sat"
+    batch_size: 1
+    num_workers: 0
+    band_set: "all"
diff --git a/tests/conf/so2sat_supervised.yaml → tests/conf/so2sat_s1.yaml b/tests/conf/so2sat_supervised.yaml → tests/conf/so2sat_s1.yaml
@@ -6,11 +6,10 @@ experiment:
     learning_rate: 1e-3
     learning_rate_schedule_patience: 6
     weights: null
-    in_channels: 3
+    in_channels: 8
     num_classes: 17
   datamodule:
     root: "tests/data/so2sat"
     batch_size: 1
     num_workers: 0
-    band_set: "rgb"
-    unsupervised_mode: False
+    band_set: "s1"
diff --git a/tests/conf/so2sat_unsupervised.yaml → tests/conf/so2sat_s2.yaml b/tests/conf/so2sat_unsupervised.yaml → tests/conf/so2sat_s2.yaml
@@ -6,11 +6,10 @@ experiment:
     learning_rate: 1e-3
     learning_rate_schedule_patience: 6
     weights: null
-    in_channels: 3
+    in_channels: 10
     num_classes: 17
   datamodule:
     root: "tests/data/so2sat"
     batch_size: 1
     num_workers: 0
-    band_set: "rgb"
-    unsupervised_mode: True
+    band_set: "s2"
diff --git a/tests/conf/vaihingen2d.yaml b/tests/conf/vaihingen2d.yaml
@@ -14,8 +14,7 @@ experiment:
     ignore_index: null
   datamodule:
     root: "tests/data/vaihingen"
-    num_tiles_per_batch: 1
-    num_patches_per_tile: 1
+    batch_size: 1
     patch_size: 2
     val_split_pct: 0.5
     num_workers: 0