Revert "SimCLR: add new trainer (#1195)" (#1205)

This reverts commit 39d6941.
microsoft · Mar 29, 2023 · d14e254 · d14e254
1 parent 39d6941
commit d14e254
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 345 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -62,7 +62,6 @@
  ("py:class", "segmentation_models_pytorch.base.model.SegmentationModel"),
  ("py:class", "timm.models.resnet.ResNet"),
  ("py:class", "timm.models.vision_transformer.VisionTransformer"),
- ("py:class", "torch.optim.lr_scheduler.LRScheduler"),
  ("py:class", "torchvision.models._api.WeightsEnum"),
  ("py:class", "torchvision.models.resnet.ResNet"),
 ]

diff --git a/tests/conf/chesapeake_cvpr_prior_byol.yaml → tests/conf/chesapeake_cvpr_prior.yaml b/tests/conf/chesapeake_cvpr_prior_byol.yaml → tests/conf/chesapeake_cvpr_prior.yaml
@@ -3,7 +3,7 @@ experiment:
  module:
  loss: "ce"
  model: "unet"
- backbone: "resnet18"
+ backbone: "resnet50"
  learning_rate: 1e-3
  learning_rate_schedule_patience: 6
  in_channels: 4
@@ -13,7 +13,7 @@ experiment:
  weights: null
  datamodule:
  root: "tests/data/chesapeake/cvpr"
- download: false
+ download: true
  train_splits:
  - "de-test"
  val_splits:

diff --git a/tests/conf/chesapeake_cvpr_prior_simclr_1.yaml b/tests/conf/chesapeake_cvpr_prior_simclr_1.yaml
diff --git a/tests/conf/chesapeake_cvpr_prior_simclr_2.yaml b/tests/conf/chesapeake_cvpr_prior_simclr_2.yaml
diff --git a/tests/conf/seco_byol_1.yaml → tests/conf/seco_1.yaml b/tests/conf/seco_byol_1.yaml → tests/conf/seco_1.yaml
diff --git a/tests/conf/seco_byol_2.yaml → tests/conf/seco_2.yaml b/tests/conf/seco_byol_2.yaml → tests/conf/seco_2.yaml
diff --git a/tests/conf/seco_simclr_1.yaml b/tests/conf/seco_simclr_1.yaml
diff --git a/tests/conf/seco_simclr_2.yaml b/tests/conf/seco_simclr_2.yaml
diff --git a/tests/trainers/test_byol.py b/tests/trainers/test_byol.py
@@ -52,9 +52,9 @@ class TestBYOLTask:
  @pytest.mark.parametrize(
  "name,classname",
  [
- ("chesapeake_cvpr_prior_byol", ChesapeakeCVPRDataModule),
- ("seco_byol_1", SeasonalContrastS2DataModule),
- ("seco_byol_2", SeasonalContrastS2DataModule),
+ ("chesapeake_cvpr_prior", ChesapeakeCVPRDataModule),
+ ("seco_1", SeasonalContrastS2DataModule),
+ ("seco_2", SeasonalContrastS2DataModule),
  ],
  )
  def test_trainer(

diff --git a/tests/trainers/test_simclr.py b/tests/trainers/test_simclr.py
diff --git a/torchgeo/trainers/__init__.py b/torchgeo/trainers/__init__.py
@@ -8,7 +8,6 @@
 from .detection import ObjectDetectionTask
 from .regression import RegressionTask
 from .segmentation import SemanticSegmentationTask
-from .simclr import SimCLRTask
 
 __all__ = (
  "BYOLTask",
@@ -17,5 +16,4 @@
  "ObjectDetectionTask",
  "RegressionTask",
  "SemanticSegmentationTask",
- "SimCLRTask",
 )
diff --git a/torchgeo/trainers/simclr.py b/torchgeo/trainers/simclr.py