From 82b632276252a96d5f5675a985dcd9383058b330 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sat, 11 Feb 2023 17:42:12 -0600 Subject: [PATCH 1/2] Weights: add sha256 suffix --- docs/api/resnet_pretrained_weights.csv | 2 +- docs/api/vit_pretrained_weights.csv | 2 +- torchgeo/models/resnet.py | 54 +++++++------------------- torchgeo/models/vit.py | 18 +++------ 4 files changed, 23 insertions(+), 53 deletions(-) diff --git a/docs/api/resnet_pretrained_weights.csv b/docs/api/resnet_pretrained_weights.csv index d1fa7c4134d..3c4bf283853 100644 --- a/docs/api/resnet_pretrained_weights.csv +++ b/docs/api/resnet_pretrained_weights.csv @@ -3,7 +3,7 @@ ResNet18_Weights.SENTINEL2_ALL_MOCO,13,`link `__,`link `__,,,, ResNet18_Weights.SENTINEL2_RGB_SECO, 3,`link `__,`link `__,87.27,93.14,,46.94 ResNet50_Weights.SENTINEL1_ALL_MOCO, 2,`link `__,`link `__,,,, +ResNet50_Weights.SENTINEL2_ALL_DINO,13,`link `__,`link `__,90.7,99.1,63.6, ResNet50_Weights.SENTINEL2_ALL_MOCO,13,`link `__,`link `__,91.8,99.1,60.9, ResNet50_Weights.SENTINEL2_RGB_MOCO, 3,`link `__,`link `__,,,, -ResNet50_Weights.SENTINEL2_ALL_DINO,13,`link `__,`link `__,90.7,99.1,63.6, ResNet50_Weights.SENTINEL2_RGB_SECO, 3,`link `__,`link `__,87.81,,, diff --git a/docs/api/vit_pretrained_weights.csv b/docs/api/vit_pretrained_weights.csv index 2ba06060d45..9f6899a7eb5 100644 --- a/docs/api/vit_pretrained_weights.csv +++ b/docs/api/vit_pretrained_weights.csv @@ -1,3 +1,3 @@ Weight,Channels,Source,Citation,BigEarthNet,EuroSAT,So2Sat,OSCD -ViTSmall16_Weights.SENTINEL2_ALL_MOCO,13,`link `__,`link `__,89.9,98.6,61.6, ViTSmall16_Weights.SENTINEL2_ALL_DINO,13,`link `__,`link `__,90.5,99.0,62.2, +ViTSmall16_Weights.SENTINEL2_ALL_MOCO,13,`link `__,`link `__,89.9,98.6,61.6, diff --git a/torchgeo/models/resnet.py b/torchgeo/models/resnet.py index 18812156e72..d2f0c822463 100644 --- a/torchgeo/models/resnet.py +++ b/torchgeo/models/resnet.py @@ -35,10 +35,7 @@ class ResNet18_Weights(WeightsEnum): # type: ignore[misc] """ SENTINEL2_ALL_MOCO = Weights( - url=( - "https://huggingface.co/torchgeo/resnet18_sentinel2_all_moco/" - "resolve/main/resnet18_sentinel2_all_moco.pth" - ), + url="https://huggingface.co/torchgeo/resnet18_sentinel2_all_moco/resolve/main/resnet18_sentinel2_all_moco-59bfdff9.pth", # noqa: E501 transforms=_zhu_xlab_transforms, meta={ "dataset": "SSL4EO-S12", @@ -51,10 +48,7 @@ class ResNet18_Weights(WeightsEnum): # type: ignore[misc] ) SENTINEL2_RGB_MOCO = Weights( - url=( - "https://huggingface.co/torchgeo/resnet18_sentinel2_rgb_moco/" - "resolve/main/resnet18_sentinel2_rgb_moco.pth" - ), + url="https://huggingface.co/torchgeo/resnet18_sentinel2_rgb_moco/resolve/main/resnet18_sentinel2_rgb_moco-e3a335e3.pth", # noqa: E501 transforms=_zhu_xlab_transforms, meta={ "dataset": "SSL4EO-S12", @@ -67,10 +61,7 @@ class ResNet18_Weights(WeightsEnum): # type: ignore[misc] ) SENTINEL2_RGB_SECO = Weights( - url=( - "https://huggingface.co/torchgeo/resnet18_sentinel2_rgb_seco/" - "resolve/main/resnet18_sentinel2_rgb_seco.ckpt" - ), + url="https://huggingface.co/torchgeo/resnet18_sentinel2_rgb_seco/resolve/main/resnet18_sentinel2_rgb_seco-9976a9cb.pth", # noqa: E501 transforms=nn.Identity(), meta={ "dataset": "SeCo Dataset", @@ -93,10 +84,7 @@ class ResNet50_Weights(WeightsEnum): # type: ignore[misc] """ SENTINEL1_ALL_MOCO = Weights( - url=( - "https://huggingface.co/torchgeo/resnet50_sentinel1_all_moco/" - "resolve/main/resnet50_sentinel1_all_moco.pth" - ), + url="https://huggingface.co/torchgeo/resnet50_sentinel1_all_moco/resolve/main/resnet50_sentinel1_all_moco-906e4356.pth", # noqa: E501 transforms=_zhu_xlab_transforms, meta={ "dataset": "SSL4EO-S12", @@ -108,11 +96,8 @@ class ResNet50_Weights(WeightsEnum): # type: ignore[misc] }, ) - SENTINEL2_ALL_MOCO = Weights( - url=( - "https://huggingface.co/torchgeo/resnet50_sentinel2_all_moco/" - "resolve/main/resnet50_sentinel2_all_moco.pth" - ), + SENTINEL2_ALL_DINO = Weights( + url="https://huggingface.co/torchgeo/resnet50_sentinel2_all_dino/resolve/main/resnet50_sentinel2_all_dino-d6c330e9.pth", # noqa: E501 transforms=_zhu_xlab_transforms, meta={ "dataset": "SSL4EO-S12", @@ -120,19 +105,16 @@ class ResNet50_Weights(WeightsEnum): # type: ignore[misc] "model": "resnet50", "publication": "https://arxiv.org/abs/2211.07044", "repo": "https://github.com/zhu-xlab/SSL4EO-S12", - "ssl_method": "moco", + "ssl_method": "dino", }, ) - SENTINEL2_RGB_MOCO = Weights( - url=( - "https://huggingface.co/torchgeo/resnet50_sentinel2_rgb_moco/" - "resolve/main/resnet50_sentinel2_rgb_moco.pth" - ), + SENTINEL2_ALL_MOCO = Weights( + url="https://huggingface.co/torchgeo/resnet50_sentinel2_all_moco/resolve/main/resnet50_sentinel2_all_moco-df8b932e.pth", # noqa: E501 transforms=_zhu_xlab_transforms, meta={ "dataset": "SSL4EO-S12", - "in_chans": 3, + "in_chans": 13, "model": "resnet50", "publication": "https://arxiv.org/abs/2211.07044", "repo": "https://github.com/zhu-xlab/SSL4EO-S12", @@ -140,27 +122,21 @@ class ResNet50_Weights(WeightsEnum): # type: ignore[misc] }, ) - SENTINEL2_ALL_DINO = Weights( - url=( - "https://huggingface.co/torchgeo/resnet50_sentinel2_all_dino/" - "resolve/main/resnet50_sentinel2_all_dino.pth" - ), + SENTINEL2_RGB_MOCO = Weights( + url="https://huggingface.co/torchgeo/resnet50_sentinel2_rgb_moco/resolve/main/resnet50_sentinel2_rgb_moco-2b57ba8b.pth", # noqa: E501 transforms=_zhu_xlab_transforms, meta={ "dataset": "SSL4EO-S12", - "in_chans": 13, + "in_chans": 3, "model": "resnet50", "publication": "https://arxiv.org/abs/2211.07044", "repo": "https://github.com/zhu-xlab/SSL4EO-S12", - "ssl_method": "dino", + "ssl_method": "moco", }, ) SENTINEL2_RGB_SECO = Weights( - url=( - "https://huggingface.co/torchgeo/resnet50_sentinel2_rgb_seco/" - "resolve/main/resnet50_sentinel2_rgb_seco.ckpt" - ), + url="https://huggingface.co/torchgeo/resnet50_sentinel2_rgb_seco/blob/main/resnet50_sentinel2_rgb_seco-584035db.pth", # noqa: E501 transforms=nn.Identity(), meta={ "dataset": "SeCo Dataset", diff --git a/torchgeo/models/vit.py b/torchgeo/models/vit.py index b8d0874d47d..1f42c40405e 100644 --- a/torchgeo/models/vit.py +++ b/torchgeo/models/vit.py @@ -33,11 +33,8 @@ class ViTSmall16_Weights(WeightsEnum): # type: ignore[misc] .. versionadded:: 0.4 """ - SENTINEL2_ALL_MOCO = Weights( - url=( - "https://huggingface.co/torchgeo/vit_small_patch16_224_sentinel2_all_moco/" - "resolve/main/vit_small_patch16_224_sentinel2_all_moco.pth" - ), + SENTINEL2_ALL_DINO = Weights( + url="https://huggingface.co/torchgeo/vit_small_patch16_224_sentinel2_all_dino/resolve/main/vit_small_patch16_224_sentinel2_all_dino-36bcc127.pth", # noqa: E501 transforms=_zhu_xlab_transforms, meta={ "dataset": "SSL4EO-S12", @@ -45,15 +42,12 @@ class ViTSmall16_Weights(WeightsEnum): # type: ignore[misc] "model": "vit_small_patch16_224", "publication": "https://arxiv.org/abs/2211.07044", "repo": "https://github.com/zhu-xlab/SSL4EO-S12", - "ssl_method": "moco", + "ssl_method": "dino", }, ) - SENTINEL2_ALL_DINO = Weights( - url=( - "https://huggingface.co/torchgeo/vit_small_patch16_224_sentinel2_all_dino/" - "resolve/main/vit_small_patch16_224_sentinel2_all_dino.pth" - ), + SENTINEL2_ALL_MOCO = Weights( + url="https://huggingface.co/torchgeo/vit_small_patch16_224_sentinel2_all_moco/resolve/main/vit_small_patch16_224_sentinel2_all_moco-67c9032d.pth", # noqa: E501 transforms=_zhu_xlab_transforms, meta={ "dataset": "SSL4EO-S12", @@ -61,7 +55,7 @@ class ViTSmall16_Weights(WeightsEnum): # type: ignore[misc] "model": "vit_small_patch16_224", "publication": "https://arxiv.org/abs/2211.07044", "repo": "https://github.com/zhu-xlab/SSL4EO-S12", - "ssl_method": "dino", + "ssl_method": "moco", }, ) From 656b0d4ff74a5c98862461a92b2febf009a7965b Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sat, 11 Feb 2023 18:07:44 -0600 Subject: [PATCH 2/2] Fix URL --- torchgeo/models/resnet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/torchgeo/models/resnet.py b/torchgeo/models/resnet.py index d2f0c822463..6240b40405b 100644 --- a/torchgeo/models/resnet.py +++ b/torchgeo/models/resnet.py @@ -136,7 +136,7 @@ class ResNet50_Weights(WeightsEnum): # type: ignore[misc] ) SENTINEL2_RGB_SECO = Weights( - url="https://huggingface.co/torchgeo/resnet50_sentinel2_rgb_seco/blob/main/resnet50_sentinel2_rgb_seco-584035db.pth", # noqa: E501 + url="https://huggingface.co/torchgeo/resnet50_sentinel2_rgb_seco/resolve/main/resnet50_sentinel2_rgb_seco-584035db.pth", # noqa: E501 transforms=nn.Identity(), meta={ "dataset": "SeCo Dataset",