Refactor trainers (#1541)

* Refactor trainers * Update conf files * Fix pydocstyle * Add scheduler monitor * Update conf files * Fix BYOL backbone * Remove broken configure_optimizers out type * Fix type hints * No casts * Increase test coverage * Better documentation of supported models * Remove unimportant configuration * Remove unimportant configuration * Drop model_kwargs * Docstring improvements * Add base class for all torchgeo trainers * Add configure_* methods for losses/metrics/models * init must come first * More type hints
microsoft · Sep 11, 2023 · 578aded · 578aded
1 parent 5400840
commit 578aded
Show file tree

Hide file tree

Showing 92 changed files with 1,227 additions and 1,628 deletions.
diff --git a/conf/bigearthnet.yaml b/conf/bigearthnet.yaml
@@ -2,8 +2,8 @@ module:
   _target_: torchgeo.trainers.MultiLabelClassificationTask
   loss: "bce"
   model: "resnet18"
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
+  lr: 1e-3
+  patience: 6
   weights: null
   in_channels: 14
   num_classes: 19

diff --git a/conf/chesapeake_cvpr.yaml b/conf/chesapeake_cvpr.yaml
@@ -4,8 +4,8 @@ module:
   model: "unet"
   backbone: "resnet18"
   weights: null
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
+  lr: 1e-3
+  patience: 6
   in_channels: 4
   num_classes: 7
   num_filters: 256

diff --git a/conf/cowc_counting.yaml b/conf/cowc_counting.yaml
@@ -4,8 +4,8 @@ module:
   weights: null
   num_outputs: 1
   in_channels: 3
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 2
+  lr: 1e-3
+  patience: 2
 
 datamodule:
   _target_: torchgeo.datamodules.COWCCountingDataModule

diff --git a/conf/cyclone.yaml b/conf/cyclone.yaml
@@ -4,8 +4,8 @@ module:
   weights: null
   num_outputs: 1
   in_channels: 3
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 2
+  lr: 1e-3
+  patience: 2
 
 datamodule:
   _target_: torchgeo.datamodules.TropicalCycloneDataModule

diff --git a/conf/deepglobelandcover.yaml b/conf/deepglobelandcover.yaml
@@ -4,9 +4,8 @@ module:
   model: "unet"
   backbone: "resnet18"
   weights: null
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
-  verbose: false
+  lr: 1e-3
+  patience: 6
   in_channels: 3
   num_classes: 7
   num_filters: 1

diff --git a/conf/etci2021.yaml b/conf/etci2021.yaml
@@ -4,8 +4,8 @@ module:
   model: "unet"
   backbone: "resnet18"
   weights: true
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
+  lr: 1e-3
+  patience: 6
   in_channels: 6
   num_classes: 2
   ignore_index: 0

diff --git a/conf/eurosat.yaml b/conf/eurosat.yaml
@@ -2,8 +2,8 @@ module:
   _target_: torchgeo.trainers.ClassificationTask
   loss: "ce"
   model: "resnet18"
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
+  lr: 1e-3
+  patience: 6
   weights: null
   in_channels: 13
   num_classes: 10

diff --git a/conf/gid15.yaml b/conf/gid15.yaml
@@ -4,9 +4,8 @@ module:
   model: "unet"
   backbone: "resnet18"
   weights: null
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
-  verbose: false
+  lr: 1e-3
+  patience: 6
   in_channels: 3
   num_classes: 16
   num_filters: 1

diff --git a/conf/inria.yaml b/conf/inria.yaml
@@ -4,8 +4,8 @@ module:
   model: "unet"
   backbone: "resnet18"
   weights: true
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
+  lr: 1e-3
+  patience: 6
   in_channels: 3
   num_classes: 2
   ignore_index: null

diff --git a/conf/l7irish.yaml b/conf/l7irish.yaml
@@ -7,8 +7,8 @@ module:
   num_classes: 5
   loss: "ce"
   ignore_index: 0
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
+  lr: 1e-3
+  patience: 6
 
 datamodule:
   _target_: torchgeo.datamodules.L7IrishDataModule

diff --git a/conf/l8biome.yaml b/conf/l8biome.yaml
@@ -7,8 +7,8 @@ module:
   num_classes: 5
   loss: "ce"
   ignore_index: 0
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
+  lr: 1e-3
+  patience: 6
 
 datamodule:
   _target_: torchgeo.datamodules.L8BiomeDataModule

diff --git a/conf/landcoverai.yaml b/conf/landcoverai.yaml
@@ -4,8 +4,8 @@ module:
   model: "unet"
   backbone: "resnet18"
   weights: true
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
+  lr: 1e-3
+  patience: 6
   in_channels: 3
   num_classes: 5
   num_filters: 256

diff --git a/conf/naipchesapeake.yaml b/conf/naipchesapeake.yaml
@@ -4,8 +4,8 @@ module:
   model: "deeplabv3+"
   backbone: "resnet34"
   weights: true
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 2
+  lr: 1e-3
+  patience: 2
   in_channels: 4
   num_classes: 14
   num_filters: 64

diff --git a/conf/nasa_marine_debris.yaml b/conf/nasa_marine_debris.yaml
@@ -3,9 +3,8 @@ module:
   model: "faster-rcnn"
   backbone: "resnet50"
   num_classes: 2
-  learning_rate: 1.2e-4
-  learning_rate_schedule_patience: 6
-  verbose: false
+  lr: 1.2e-4
+  patience: 6
 
 datamodule:
   _target_: torchgeo.datamodules.NASAMarineDebrisDataModule

diff --git a/conf/potsdam2d.yaml b/conf/potsdam2d.yaml
@@ -4,9 +4,8 @@ module:
   model: "unet"
   backbone: "resnet18"
   weights: null
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
-  verbose: false
+  lr: 1e-3
+  patience: 6
   in_channels: 4
   num_classes: 6
   num_filters: 1

diff --git a/conf/resisc45.yaml b/conf/resisc45.yaml
@@ -2,8 +2,8 @@ module:
   _target_: torchgeo.trainers.ClassificationTask
   loss: "ce"
   model: "resnet18"
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
+  lr: 1e-3
+  patience: 6
   weights: null
   in_channels: 3
   num_classes: 45

diff --git a/conf/seco_100k.yaml b/conf/seco_100k.yaml
@@ -3,8 +3,8 @@ module:
   in_channels: 12
   backbone: "resnet18"
   weights: True
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
+  lr: 1e-3
+  patience: 6
   optimizer: "Adam"
 
 datamodule:

diff --git a/conf/sen12ms.yaml b/conf/sen12ms.yaml
@@ -4,8 +4,8 @@ module:
   model: "unet"
   backbone: "resnet18"
   weights: null
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 2
+  lr: 1e-3
+  patience: 2
   in_channels: 15
   num_classes: 11
   ignore_index: null

diff --git a/conf/so2sat.yaml b/conf/so2sat.yaml
@@ -2,8 +2,8 @@ module:
   _target_: torchgeo.trainers.ClassificationTask
   loss: "ce"
   model: "resnet18"
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
+  lr: 1e-3
+  patience: 6
   weights: null
   in_channels: 18
   num_classes: 17

diff --git a/conf/spacenet1.yaml b/conf/spacenet1.yaml
@@ -4,8 +4,8 @@ module:
   model: "unet"
   backbone: "resnet18"
   weights: true
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
+  lr: 1e-3
+  patience: 6
   in_channels: 3
   num_classes: 3
   ignore_index: 0

diff --git a/conf/ssl4eo_benchmark_etm_sr_cdl.yaml b/conf/ssl4eo_benchmark_etm_sr_cdl.yaml
@@ -7,8 +7,8 @@ module:
   num_classes: 18
   loss: "ce"
   ignore_index: 0
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
+  lr: 1e-3
+  patience: 6
 
 datamodule:
   _target_: torchgeo.datamodules.SSL4EOLBenchmarkDataModule

diff --git a/conf/ssl4eo_benchmark_etm_sr_nlcd.yaml b/conf/ssl4eo_benchmark_etm_sr_nlcd.yaml
@@ -7,8 +7,8 @@ module:
   num_classes: 14
   loss: "ce"
   ignore_index: 0
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
+  lr: 1e-3
+  patience: 6
 
 datamodule:
   _target_: torchgeo.datamodules.SSL4EOLBenchmarkDataModule

diff --git a/conf/ssl4eo_benchmark_etm_toa_cdl.yaml b/conf/ssl4eo_benchmark_etm_toa_cdl.yaml
@@ -7,8 +7,8 @@ module:
   num_classes: 18
   loss: "ce"
   ignore_index: 0
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
+  lr: 1e-3
+  patience: 6
 
 datamodule:
   _target_: torchgeo.datamodules.SSL4EOLBenchmarkDataModule

diff --git a/conf/ssl4eo_benchmark_etm_toa_nlcd.yaml b/conf/ssl4eo_benchmark_etm_toa_nlcd.yaml
@@ -7,8 +7,8 @@ module:
   num_classes: 14
   loss: "ce"
   ignore_index: 0
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
+  lr: 1e-3
+  patience: 6
 
 datamodule:
   _target_: torchgeo.datamodules.SSL4EOLBenchmarkDataModule

diff --git a/conf/ssl4eo_benchmark_oli_sr_cdl.yaml b/conf/ssl4eo_benchmark_oli_sr_cdl.yaml
@@ -7,8 +7,8 @@ module:
   num_classes: 18
   loss: "ce"
   ignore_index: 0
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
+  lr: 1e-3
+  patience: 6
 
 datamodule:
   _target_: torchgeo.datamodules.SSL4EOLBenchmarkDataModule

diff --git a/conf/ssl4eo_benchmark_oli_sr_nlcd.yaml b/conf/ssl4eo_benchmark_oli_sr_nlcd.yaml
@@ -7,8 +7,8 @@ module:
   num_classes: 14
   loss: "ce"
   ignore_index: 0
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
+  lr: 1e-3
+  patience: 6
 
 datamodule:
   _target_: torchgeo.datamodules.SSL4EOLBenchmarkDataModule

diff --git a/conf/ssl4eo_benchmark_oli_tirs_toa_cdl.yaml b/conf/ssl4eo_benchmark_oli_tirs_toa_cdl.yaml
@@ -7,8 +7,8 @@ module:
   num_classes: 18
   loss: "ce"
   ignore_index: 0
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
+  lr: 1e-3
+  patience: 6
 
 datamodule:
   _target_: torchgeo.datamodules.SSL4EOLBenchmarkDataModule

diff --git a/conf/ssl4eo_benchmark_oli_tirs_toa_nlcd.yaml b/conf/ssl4eo_benchmark_oli_tirs_toa_nlcd.yaml
@@ -7,8 +7,8 @@ module:
   num_classes: 14
   loss: "ce"
   ignore_index: 0
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
+  lr: 1e-3
+  patience: 6
 
 datamodule:
   _target_: torchgeo.datamodules.SSL4EOLBenchmarkDataModule

diff --git a/conf/ssl4eo_benchmark_tm_toa_cdl.yaml b/conf/ssl4eo_benchmark_tm_toa_cdl.yaml
@@ -7,8 +7,8 @@ module:
   num_classes: 18
   loss: "ce"
   ignore_index: 0
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
+  lr: 1e-3
+  patience: 6
 
 datamodule:
   _target_: torchgeo.datamodules.SSL4EOLBenchmarkDataModule

diff --git a/conf/ssl4eo_benchmark_tm_toa_nlcd.yaml b/conf/ssl4eo_benchmark_tm_toa_nlcd.yaml
@@ -7,8 +7,8 @@ module:
   num_classes: 14
   loss: "ce"
   ignore_index: 0
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
+  lr: 1e-3
+  patience: 6
 
 datamodule:
   _target_: torchgeo.datamodules.SSL4EOLBenchmarkDataModule

diff --git a/conf/ucmerced.yaml b/conf/ucmerced.yaml
@@ -3,8 +3,8 @@ module:
   loss: "ce"
   model: "resnet18"
   weights: null
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
+  lr: 1e-3
+  patience: 6
   in_channels: 3
   num_classes: 21
 

diff --git a/conf/vaihingen2d.yaml b/conf/vaihingen2d.yaml
@@ -4,9 +4,8 @@ module:
   model: "unet"
   backbone: "resnet18"
   weights: null
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
-  verbose: false
+  lr: 1e-3
+  patience: 6
   in_channels: 3
   num_classes: 7
   num_filters: 1

diff --git a/tests/conf/bigearthnet_all.yaml b/tests/conf/bigearthnet_all.yaml
@@ -2,9 +2,6 @@ module:
   _target_: torchgeo.trainers.MultiLabelClassificationTask
   loss: "bce"
   model: "resnet18"
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
-  weights: null
   in_channels: 14
   num_classes: 19
 

diff --git a/tests/conf/bigearthnet_s1.yaml b/tests/conf/bigearthnet_s1.yaml
@@ -2,9 +2,6 @@ module:
   _target_: torchgeo.trainers.MultiLabelClassificationTask
   loss: "bce"
   model: "resnet18"
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
-  weights: null
   in_channels: 2
   num_classes: 19
 

diff --git a/tests/conf/bigearthnet_s2.yaml b/tests/conf/bigearthnet_s2.yaml
@@ -2,9 +2,6 @@ module:
   _target_: torchgeo.trainers.MultiLabelClassificationTask
   loss: "bce"
   model: "resnet18"
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
-  weights: null
   in_channels: 12
   num_classes: 19
 

diff --git a/tests/conf/chesapeake_cvpr_5.yaml b/tests/conf/chesapeake_cvpr_5.yaml
@@ -3,9 +3,6 @@ module:
   loss: "ce"
   model: "unet"
   backbone: "resnet50"
-  weights: null
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
   in_channels: 4
   num_classes: 5
   num_filters: 1