new preprocessor and only fix known bugs

.gitignore

@@ -8,6 +8,8 @@ pretrained_models/
 work-dir/
 wandb/
 data/*
+data
+pretrained_models
 # Scenes for mados tiny
 # Wow gitignore pattern mathcing is a mess
 !data/mados

configs/dataset/dynamicen.yaml

@@ -26,6 +26,14 @@ distribution:
   - 0.28
   - 0.08
 
+sample_dates:
+  - 1
+  - 5
+  - 10
+  - 15
+  - 20
+  - 25
+
 # data stats
 bands:
   optical:
@@ -36,15 +44,15 @@ bands:
 
 data_mean:
   optical:
-    - 1042.59240722656
-    - 915.618408203125
     - 671.260559082031
+    - 915.618408203125
+    - 1042.59240722656
     - 2605.20922851562
 data_std:
   optical:
-    - 957.958435058593
-    - 715.548767089843
     - 596.943908691406
+    - 715.548767089843
+    - 957.958435058593
     - 1059.90319824218
 
 data_min:

configs/encoder/croma_joint.yaml

@@ -28,3 +28,5 @@ output_layers:
   - 5
   - 7
   - 11
+
+output_dim: 1024

configs/encoder/croma_optical.yaml

@@ -24,3 +24,5 @@ output_layers:
   - 5
   - 7
   - 11
+
+output_dim: 1024

configs/encoder/croma_sar.yaml

@@ -14,4 +14,6 @@ output_layers:
   - 3
   - 5
   - 7
-  - 11
+  - 11
+
+output_dim: 1024

configs/encoder/dofa.yaml

@@ -41,3 +41,5 @@ output_layers:
   - 5
   - 7
   - 11
+
+output_dim: 768

configs/encoder/gfmswin.yaml

@@ -7,7 +7,6 @@ in_chans: 3
 t_patch_size: 3
 depth: 12
 embed_dim: 128
-output_dim: 1024
 img_size: 192    # fixed to 192 to avoid interpolation in checkpoints which leads to drop in performance
 depths: [ 2, 2, 18, 2 ]  
 num_heads: [ 4, 8, 16, 32 ]
@@ -28,3 +27,8 @@ output_layers:
   - 2
   - 3
 
+output_dim:
+  - 256
+  - 512
+  - 1024
+  - 1024

configs/encoder/prithvi.yaml

@@ -27,3 +27,5 @@ output_layers:
   - 5
   - 7
   - 11
+
+output_dim: 768

configs/encoder/remoteclip.yaml

@@ -20,4 +20,6 @@ output_layers:
   - 3
   - 5
   - 7
-  - 11
+  - 11
+
+output_dim: 768

configs/encoder/satlasnet_mi.yaml

@@ -5,7 +5,6 @@ download_url: null
 model_identifier: Sentinel2_SwinB_MI_MS # Multi-Image Multi-Spectral 
 fpn: False
 input_size: 128
-output_dim: 1024
 
 input_bands:
   optical:
@@ -23,3 +22,15 @@ input_bands:
     - B8
     - B11
     - B12
+
+output_layers:
+  - 0
+  - 1
+  - 2
+  - 3
+
+output_dim:
+  - 128
+  - 256
+  - 512
+  - 1024

configs/encoder/satlasnet_si.yaml

@@ -5,7 +5,6 @@ download_url: null
 model_identifier: Sentinel2_SwinB_SI_MS  # Single Image Multi-Spectral 
 fpn: False
 input_size: 128
-output_dim: 1024
 
 input_bands:
   optical:
@@ -23,3 +22,15 @@ input_bands:
     - B8
     - B11
     - B12
+
+output_layers:
+  - 0
+  - 1
+  - 2
+  - 3
+
+output_dim:
+  - 128
+  - 256
+  - 512
+  - 1024

configs/encoder/scalemae.yaml

@@ -25,3 +25,5 @@ output_layers:
   - 11
   - 15
   - 23
+
+output_dim: 1024

configs/encoder/spectralgpt.yaml

@@ -3,7 +3,7 @@ encoder_weights: ./pretrained_models/SpectralGPT+.pth
 download_url: https://zenodo.org/records/8412455/files/SpectralGPT+.pth
 
 input_size: 128
-output_dim: 3072   # 768 * (in_chans / t_patch_size)
+
 in_chans: 12    # number of spectral bands
 t_patch_size: 3
 depth: 12
@@ -34,4 +34,5 @@ output_layers:
   - 7
   - 11
 
+output_dim: 3072   # 768 * (in_chans / t_patch_size)
 

configs/encoder/ssl4eo_data2vec.yaml

@@ -31,3 +31,5 @@ output_layers:
   - 5
   - 7
   - 11
+
+output_dim: 384

configs/encoder/ssl4eo_dino.yaml

@@ -31,3 +31,5 @@ output_layers:
   - 5
   - 7
   - 11
+
+output_dim: 384

configs/encoder/ssl4eo_mae_optical.yaml

@@ -31,4 +31,6 @@ output_layers:
   - 3
   - 5
   - 7
-  - 11
+  - 11
+
+output_dim: 384

configs/encoder/ssl4eo_mae_sar.yaml

@@ -19,4 +19,6 @@ output_layers:
   - 3
   - 5
   - 7
-  - 11
+  - 11
+
+output_dim: 384

configs/encoder/ssl4eo_moco.yaml

@@ -31,3 +31,5 @@ output_layers:
   - 5
   - 7
   - 11
+
+output_dim: 384

configs/encoder/unet_encoder.yaml

@@ -6,3 +6,9 @@ topology: [64, 128, 256, 512,]
 
 input_bands: ${dataset.bands}
 
+output_dim:
+  - 64
+  - 128
+  - 256
+  - 512
+

configs/preprocessing/reg_default.yaml

@@ -1,35 +1,21 @@
-train: 
-  - _target_: pangaea.engine.data_preprocessor.RegPreprocessor
-    # overwritten in run
-    dataset: null
-    encoder: null
+train:
+    _target_: pangaea.engine.data_preprocessor.Preprocessor
+    preprocessor_cfg:
+        - _target_: pangaea.engine.data_preprocessor.RandomCropToEncoder
+        - _target_: pangaea.engine.data_preprocessor.BandFilter
+        - _target_: pangaea.engine.data_preprocessor.NormalizeMeanStd
+        - _target_: pangaea.engine.data_preprocessor.BandPadding
 
-  - _target_: pangaea.engine.data_preprocessor.NormalizeMinMax
-    # overwritten in run
-    dataset: null
-    encoder: null
-    data_min: -1
-    data_max: 1
+val:
+    _target_: pangaea.engine.data_preprocessor.Preprocessor
+    preprocessor_cfg:
+        - _target_: pangaea.engine.data_preprocessor.BandFilter
+        - _target_: pangaea.engine.data_preprocessor.NormalizeMeanStd
+        - _target_: pangaea.engine.data_preprocessor.BandPadding
 
-  - _target_: pangaea.engine.data_preprocessor.RandomCropToEncoder
-    # overwritten in run
-    dataset: null
-    encoder: null
-
-test: 
-  - _target_: pangaea.engine.data_preprocessor.RegPreprocessor
-    # overwritten in run
-    dataset: null
-    encoder: null
-
-  - _target_: pangaea.engine.data_preprocessor.NormalizeMinMax
-    # overwritten in run
-    dataset: null
-    encoder: null
-    data_min: -1
-    data_max: 1
-
-  - _target_: pangaea.engine.data_preprocessor.Tile
-    # overwritten in run
-    dataset: null
-    encoder: null
+test:
+    _target_: pangaea.engine.data_preprocessor.Preprocessor
+    preprocessor_cfg:
+        - _target_: pangaea.engine.data_preprocessor.BandFilter
+        - _target_: pangaea.engine.data_preprocessor.NormalizeMeanStd
+        - _target_: pangaea.engine.data_preprocessor.BandPadding

configs/preprocessing/seg_default.yaml

@@ -1,31 +1,21 @@
-train: 
-  - _target_: pangaea.engine.data_preprocessor.SegPreprocessor
-    # overwritten in run
-    dataset: null
-    encoder: null
+train:
+    _target_: pangaea.engine.data_preprocessor.Preprocessor
+    preprocessor_cfg:
+        - _target_: pangaea.engine.data_preprocessor.RandomCropToEncoder
+        - _target_: pangaea.engine.data_preprocessor.BandFilter
+        - _target_: pangaea.engine.data_preprocessor.NormalizeMeanStd
+        - _target_: pangaea.engine.data_preprocessor.BandPadding
 
-  - _target_: pangaea.engine.data_preprocessor.NormalizeMeanStd
-    # overwritten in run
-    dataset: null
-    encoder: null
+val:
+    _target_: pangaea.engine.data_preprocessor.Preprocessor
+    preprocessor_cfg:
+        - _target_: pangaea.engine.data_preprocessor.BandFilter
+        - _target_: pangaea.engine.data_preprocessor.NormalizeMeanStd
+        - _target_: pangaea.engine.data_preprocessor.BandPadding
 
-  - _target_: pangaea.engine.data_preprocessor.RandomCropToEncoder
-    # overwritten in run
-    dataset: null
-    encoder: null
-
-test: 
-  - _target_: pangaea.engine.data_preprocessor.SegPreprocessor
-    # overwritten in run
-    dataset: null
-    encoder: null
-
-  - _target_: pangaea.engine.data_preprocessor.NormalizeMeanStd
-    # overwritten in run
-    dataset: null
-    encoder: null
-
-  - _target_: pangaea.engine.data_preprocessor.Tile
-    # overwritten in run
-    dataset: null
-    encoder: null
+test:
+    _target_: pangaea.engine.data_preprocessor.Preprocessor
+    preprocessor_cfg:
+        - _target_: pangaea.engine.data_preprocessor.BandFilter
+        - _target_: pangaea.engine.data_preprocessor.NormalizeMeanStd
+        - _target_: pangaea.engine.data_preprocessor.BandPadding

configs/preprocessing/seg_importance_crop.yaml

@@ -1,31 +1,21 @@
-train: 
-  - _target_: pangaea.engine.data_preprocessor.SegPreprocessor
-    # overwritten in run
-    dataset: null
-    encoder: null
+train:
+    _target_: pangaea.engine.data_preprocessor.Preprocessor
+    preprocessor_cfg:
+        - _target_: pangaea.engine.data_preprocessor.ImportanceRandomCropToEncoder
+        - _target_: pangaea.engine.data_preprocessor.BandFilter
+        - _target_: pangaea.engine.data_preprocessor.NormalizeMeanStd
+        - _target_: pangaea.engine.data_preprocessor.BandPadding
 
-  - _target_: pangaea.engine.data_preprocessor.NormalizeMeanStd
-    # overwritten in run
-    dataset: null
-    encoder: null
+val:
+    _target_: pangaea.engine.data_preprocessor.Preprocessor
+    preprocessor_cfg:
+        - _target_: pangaea.engine.data_preprocessor.BandFilter
+        - _target_: pangaea.engine.data_preprocessor.NormalizeMeanStd
+        - _target_: pangaea.engine.data_preprocessor.BandPadding
 
-  - _target_: pangaea.engine.data_preprocessor.ImportanceRandomCropToEncoder
-    # overwritten in run
-    dataset: null
-    encoder: null
-
-test: 
-  - _target_: pangaea.engine.data_preprocessor.SegPreprocessor
-    # overwritten in run
-    dataset: null
-    encoder: null
-
-  - _target_: pangaea.engine.data_preprocessor.NormalizeMeanStd
-    # overwritten in run
-    dataset: null
-    encoder: null
-
-  - _target_: pangaea.engine.data_preprocessor.Tile
-    # overwritten in run
-    dataset: null
-    encoder: null
+test:
+    _target_: pangaea.engine.data_preprocessor.Preprocessor
+    preprocessor_cfg:
+        - _target_: pangaea.engine.data_preprocessor.BandFilter
+        - _target_: pangaea.engine.data_preprocessor.NormalizeMeanStd
+        - _target_: pangaea.engine.data_preprocessor.BandPadding