Undo changes to tests/conf files

microsoft · Jan 6, 2022 · b5c5dbf · b5c5dbf
1 parent b484e05
commit b5c5dbf
Show file tree

Hide file tree

Showing 25 changed files with 48 additions and 6 deletions.
diff --git a/tests/conf/bigearthnet_all.yaml b/tests/conf/bigearthnet_all.yaml
@@ -3,6 +3,8 @@ experiment:
   module:
     loss: "bce"
     classification_model: "resnet18"
+    learning_rate: 1e-3
+    learning_rate_schedule_patience: 6
     weights: "random"
     in_channels: 14
     num_classes: 19

diff --git a/tests/conf/bigearthnet_s1.yaml b/tests/conf/bigearthnet_s1.yaml
@@ -3,6 +3,8 @@ experiment:
   module:
     loss: "bce"
     classification_model: "resnet18"
+    learning_rate: 1e-3
+    learning_rate_schedule_patience: 6
     weights: "random"
     in_channels: 2
     num_classes: 19

diff --git a/tests/conf/bigearthnet_s2.yaml b/tests/conf/bigearthnet_s2.yaml
@@ -3,6 +3,8 @@ experiment:
   module:
     loss: "bce"
     classification_model: "resnet18"
+    learning_rate: 1e-3
+    learning_rate_schedule_patience: 6
     weights: "random"
     in_channels: 12
     num_classes: 19

diff --git a/tests/conf/byol.yaml b/tests/conf/byol.yaml
@@ -6,6 +6,8 @@ experiment:
     encoder: "resnet18"
     input_channels: 4
     imagenet_pretraining: False
+    learning_rate: 1e-3
+    learning_rate_schedule_patience: 6
   datamodule:
     root_dir: "tests/data/chesapeake/cvpr"
     train_splits:

diff --git a/tests/conf/chesapeake_cvpr_5.yaml b/tests/conf/chesapeake_cvpr_5.yaml
@@ -6,6 +6,8 @@ experiment:
     encoder_name: "resnet50"
     encoder_weights: null
     encoder_output_stride: 16
+    learning_rate: 1e-3
+    learning_rate_schedule_patience: 6
     in_channels: 4
     num_classes: 5
     num_filters: 1

diff --git a/tests/conf/chesapeake_cvpr_7.yaml b/tests/conf/chesapeake_cvpr_7.yaml
@@ -6,6 +6,8 @@ experiment:
     encoder_name: "resnet18"
     encoder_weights: null
     encoder_output_stride: 16
+    learning_rate: 1e-3
+    learning_rate_schedule_patience: 6
     in_channels: 4
     num_classes: 7
     num_filters: 1

diff --git a/tests/conf/chesapeake_cvpr_prior.yaml b/tests/conf/chesapeake_cvpr_prior.yaml
@@ -6,6 +6,8 @@ experiment:
     encoder_name: "resnet50"
     encoder_weights: null
     encoder_output_stride: 16
+    learning_rate: 1e-3
+    learning_rate_schedule_patience: 6
     in_channels: 4
     num_classes: 5
     num_filters: 1

diff --git a/tests/conf/cowc_counting.yaml b/tests/conf/cowc_counting.yaml
@@ -2,6 +2,8 @@ experiment:
   task: cowc_counting
   module:
     model: resnet18
+    learning_rate: 1e-3
+    learning_rate_schedule_patience: 2
     pretrained: False
   datamodule:
     root_dir: "tests/data/cowc_counting"

diff --git a/tests/conf/cyclone.yaml b/tests/conf/cyclone.yaml
@@ -2,6 +2,8 @@ experiment:
   task: "cyclone"
   module:
     model: "resnet18"
+    learning_rate: 1e-3
+    learning_rate_schedule_patience: 2
     pretrained: False
   datamodule:
     root_dir: "tests/data/cyclone"

diff --git a/tests/conf/etci2021.yaml b/tests/conf/etci2021.yaml
@@ -5,6 +5,8 @@ experiment:
     segmentation_model: "unet"
     encoder_name: "resnet18"
     encoder_weights: null
+    learning_rate: 1e-3
+    learning_rate_schedule_patience: 6
     in_channels: 7
     num_classes: 2
     ignore_zeros: True

diff --git a/tests/conf/eurosat.yaml b/tests/conf/eurosat.yaml
@@ -3,6 +3,8 @@ experiment:
   module:
     loss: "ce"
     classification_model: "resnet18"
+    learning_rate: 1e-3
+    learning_rate_schedule_patience: 6
     weights: "random"
     in_channels: 13
     num_classes: 2

diff --git a/tests/conf/landcoverai.yaml b/tests/conf/landcoverai.yaml
@@ -5,6 +5,8 @@ experiment:
     segmentation_model: "unet"
     encoder_name: "resnet18"
     encoder_weights: null
+    learning_rate: 1e-3
+    learning_rate_schedule_patience: 6
     verbose: false
     in_channels: 3
     num_classes: 6

diff --git a/tests/conf/naipchesapeake.yaml b/tests/conf/naipchesapeake.yaml
@@ -6,6 +6,8 @@ experiment:
     encoder_name: "resnet34"
     encoder_weights: null
     encoder_output_stride: 16
+    learning_rate: 1e-3
+    learning_rate_schedule_patience: 2
     in_channels: 4
     num_classes: 13
     num_filters: 1

diff --git a/tests/conf/oscd_all.yaml b/tests/conf/oscd_all.yaml
@@ -5,6 +5,8 @@ experiment:
     segmentation_model: "unet"
     encoder_name: "resnet18"
     encoder_weights: null
+    learning_rate: 1e-3
+    learning_rate_schedule_patience: 6
     verbose: false
     in_channels: 26
     num_classes: 2

diff --git a/tests/conf/oscd_rgb.yaml b/tests/conf/oscd_rgb.yaml
@@ -5,6 +5,8 @@ experiment:
     segmentation_model: "unet"
     encoder_name: "resnet18"
     encoder_weights: null
+    learning_rate: 1e-3
+    learning_rate_schedule_patience: 6
     verbose: false
     in_channels: 6
     num_classes: 2

diff --git a/tests/conf/resisc45.yaml b/tests/conf/resisc45.yaml
@@ -3,6 +3,8 @@ experiment:
   module:
     loss: "ce"
     classification_model: "resnet18"
+    learning_rate: 1e-3
+    learning_rate_schedule_patience: 6
     weights: "random"
     in_channels: 3
     num_classes: 3

diff --git a/tests/conf/sen12ms_all.yaml b/tests/conf/sen12ms_all.yaml
@@ -6,6 +6,8 @@ experiment:
     encoder_name: "resnet18"
     encoder_weights: null
     encoder_output_stride: 16
+    learning_rate: 1e-3
+    learning_rate_schedule_patience: 2
     in_channels: 15
     num_classes: 11
     ignore_zeros: False

diff --git a/tests/conf/sen12ms_s1.yaml b/tests/conf/sen12ms_s1.yaml
@@ -7,6 +7,8 @@ experiment:
     encoder_name: "resnet18"
     encoder_weights: null
     encoder_output_stride: 16
+    learning_rate: 1e-3
+    learning_rate_schedule_patience: 2
     in_channels: 2
     num_classes: 11
     ignore_zeros: False

diff --git a/tests/conf/sen12ms_s2_all.yaml b/tests/conf/sen12ms_s2_all.yaml
@@ -6,6 +6,8 @@ experiment:
     encoder_name: "resnet18"
     encoder_weights: null
     encoder_output_stride: 16
+    learning_rate: 1e-3
+    learning_rate_schedule_patience: 2
     in_channels: 13
     num_classes: 11
     ignore_zeros: False

diff --git a/tests/conf/sen12ms_s2_reduced.yaml b/tests/conf/sen12ms_s2_reduced.yaml
@@ -6,6 +6,8 @@ experiment:
     encoder_name: "resnet18"
     encoder_weights: null
     encoder_output_stride: 16
+    learning_rate: 1e-3
+    learning_rate_schedule_patience: 2
     in_channels: 6
     num_classes: 11
     ignore_zeros: False

diff --git a/tests/conf/so2sat_supervised.yaml b/tests/conf/so2sat_supervised.yaml
@@ -3,6 +3,8 @@ experiment:
   module:
     loss: "focal"
     classification_model: "resnet18"
+    learning_rate: 1e-3
+    learning_rate_schedule_patience: 6
     weights: "random"
     in_channels: 3
     num_classes: 17

diff --git a/tests/conf/so2sat_unsupervised.yaml b/tests/conf/so2sat_unsupervised.yaml
@@ -3,6 +3,8 @@ experiment:
   module:
     loss: "jaccard"
     classification_model: "resnet18"
+    learning_rate: 1e-3
+    learning_rate_schedule_patience: 6
     weights: "random"
     in_channels: 3
     num_classes: 17

diff --git a/tests/conf/ucmerced.yaml b/tests/conf/ucmerced.yaml
@@ -4,6 +4,8 @@ experiment:
     loss: "ce"
     classification_model: "resnet18"
     weights: "random"
+    learning_rate: 1e-3
+    learning_rate_schedule_patience: 6
     in_channels: 3
     num_classes: 2
   datamodule:

diff --git a/tests/datamodules/test_chesapeake.py b/tests/datamodules/test_chesapeake.py
@@ -14,9 +14,7 @@
 class TestChesapeakeCVPRDataModule:
     @pytest.fixture(scope="class")
     def datamodule(self) -> ChesapeakeCVPRDataModule:
-        conf = OmegaConf.load(
-            os.path.join("tests", "conf", "chesapeake_cvpr_5.yaml")
-        )
+        conf = OmegaConf.load(os.path.join("tests", "conf", "chesapeake_cvpr_5.yaml"))
         kwargs = OmegaConf.to_object(conf.experiment.datamodule)
         kwargs = cast(Dict[str, Any], kwargs)
 

diff --git a/tests/trainers/test_classification.py b/tests/trainers/test_classification.py
@@ -163,9 +163,7 @@ def test_trainer(
         trainer.test(model=model, datamodule=datamodule)
 
     def test_no_logger(self) -> None:
-        conf = OmegaConf.load(
-            os.path.join("tests", "conf", "bigearthnet_s1.yaml")
-        )
+        conf = OmegaConf.load(os.path.join("tests", "conf", "bigearthnet_s1.yaml"))
         conf_dict = OmegaConf.to_object(conf.experiment)
         conf_dict = cast(Dict[Any, Dict[Any, Any]], conf_dict)