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

Refactor trainers #1541

Merged
merged 19 commits into from
Sep 11, 2023
+1,227 −1,628
Merged

Refactor trainers #1541

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
f4c516e
Refactor trainers
adamjstewart Sep 1, 2023
7c8e23b
Update conf files
adamjstewart Sep 1, 2023
43fd0b5
Fix pydocstyle
adamjstewart Sep 1, 2023
0c9042c
Add scheduler monitor
adamjstewart Sep 1, 2023
7cb1556
Update conf files
adamjstewart Sep 1, 2023
f658e1c
Fix BYOL backbone
adamjstewart Sep 2, 2023
c0d830c
Remove broken configure_optimizers out type
adamjstewart Sep 2, 2023
03f8483
Fix type hints
adamjstewart Sep 2, 2023
7d3a6f7
No casts
adamjstewart Sep 2, 2023
1355bc9
Increase test coverage
adamjstewart Sep 2, 2023
e55a8dc
Better documentation of supported models
adamjstewart Sep 2, 2023
3f32e09
Remove unimportant configuration
adamjstewart Sep 2, 2023
c64b7e3
Remove unimportant configuration
adamjstewart Sep 2, 2023
04fc8cb
Drop model_kwargs
adamjstewart Sep 2, 2023
79944a2
Docstring improvements
adamjstewart Sep 2, 2023
49b684e
Add base class for all torchgeo trainers
adamjstewart Sep 5, 2023
40e8960
Add configure_* methods for losses/metrics/models
adamjstewart Sep 5, 2023
189727e
init must come first
adamjstewart Sep 5, 2023
0825d73
More type hints
adamjstewart Sep 5, 2023
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 conf/bigearthnet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions conf/chesapeake_cvpr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions conf/cowc_counting.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions conf/cyclone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions conf/deepglobelandcover.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ module:
model: "unet"
backbone: "resnet18"
weights: null
learning_rate: 1e-3
learning_rate_schedule_patience: 6
verbose: false
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Verbose isn't an option

lr: 1e-3
patience: 6
in_channels: 3
num_classes: 7
num_filters: 1
Expand Down
4 changes: 2 additions & 2 deletions conf/etci2021.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions conf/eurosat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions conf/gid15.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions conf/inria.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions conf/l7irish.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions conf/l8biome.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions conf/landcoverai.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions conf/naipchesapeake.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions conf/nasa_marine_debris.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions conf/potsdam2d.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions conf/resisc45.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions conf/seco_100k.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions conf/sen12ms.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions conf/so2sat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions conf/spacenet1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions conf/ssl4eo_benchmark_etm_sr_cdl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions conf/ssl4eo_benchmark_etm_sr_nlcd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions conf/ssl4eo_benchmark_etm_toa_cdl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions conf/ssl4eo_benchmark_etm_toa_nlcd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions conf/ssl4eo_benchmark_oli_sr_cdl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions conf/ssl4eo_benchmark_oli_sr_nlcd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions conf/ssl4eo_benchmark_oli_tirs_toa_cdl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions conf/ssl4eo_benchmark_oli_tirs_toa_nlcd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions conf/ssl4eo_benchmark_tm_toa_cdl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions conf/ssl4eo_benchmark_tm_toa_nlcd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions conf/ucmerced.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 2 additions & 3 deletions conf/vaihingen2d.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/conf/bigearthnet_all.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/conf/bigearthnet_s1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: 2
num_classes: 19
Expand Down
4 changes: 2 additions & 2 deletions tests/conf/bigearthnet_s2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: 12
num_classes: 19
Expand Down
Loading