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

Add DeCUR RN50 weights #2191

Merged
merged 12 commits into from
Aug 19, 2024
Merged

Add DeCUR RN50 weights #2191

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8a1069a
add resnet50 weights from decur
wangyi111 Jul 23, 2024
d6e854c
Merge branch 'microsoft:main' into decur
wangyi111 Jul 24, 2024
6f6e48c
update decur rn50 weights
wangyi111 Jul 24, 2024
2fd371d
Alphabetical order
adamjstewart Aug 19, 2024
b3c6715
Merge branch 'main' into decur
adamjstewart Aug 19, 2024
8da11b3
Remove unneeded ignores
adamjstewart Aug 19, 2024
8d0b3c1
update data transform for loading resnet50 sentinel 1 weights
wangyi111 Aug 19, 2024
76ca56e
update formatting
wangyi111 Aug 19, 2024
3cf6e31
update formatting
wangyi111 Aug 19, 2024
940bdb0
update ssl4eo-s12 transforms and naming
wangyi111 Aug 19, 2024
bd65d86
update formatting
wangyi111 Aug 19, 2024
982623d
update transforms definition comments
wangyi111 Aug 19, 2024
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
1 change: 1 addition & 0 deletions docs/api/sentinel1_pretrained_weights.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Weight,Channels,Source,Citation,License
ResNet50_Weights.SENTINEL1_ALL_DECUR, 2,`link <https://github.com/zhu-xlab/DeCUR>`__,`link <https://arxiv.org/abs/2309.05300>`__,"Apache-2.0"
ResNet50_Weights.SENTINEL1_ALL_MOCO, 2,`link <https://github.com/zhu-xlab/SSL4EO-S12>`__,`link <https://arxiv.org/abs/2211.07044>`__,"CC-BY-4.0"
Swin_V2_B_Weights.SENTINEL1_SI_SATLAS,2,`link <https://github.com/allenai/satlas>`__,`link <https://arxiv.org/abs/2211.15660>`__,"ODC-BY"
1 change: 1 addition & 0 deletions docs/api/sentinel2_pretrained_weights.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Weight,Channels,Source,Citation,License,BigEarthNet,EuroSAT,So2Sat,OSCD
ResNet18_Weights.SENTINEL2_ALL_MOCO,13,`link <https://github.com/zhu-xlab/SSL4EO-S12>`__,`link <https://arxiv.org/abs/2211.07044>`__,"CC-BY-4.0",,,,
ResNet18_Weights.SENTINEL2_RGB_MOCO, 3,`link <https://github.com/zhu-xlab/SSL4EO-S12>`__,`link <https://arxiv.org/abs/2211.07044>`__,"CC-BY-4.0",,,,
ResNet18_Weights.SENTINEL2_RGB_SECO, 3,`link <https://github.com/ServiceNow/seasonal-contrast>`__,`link <https://arxiv.org/abs/2103.16607>`__,"Apache-2.0",87.27,93.14,,46.94
ResNet50_Weights.SENTINEL2_ALL_DECUR,13,`link <https://github.com/zhu-xlab/DeCUR>`__,`link <https://arxiv.org/abs/2309.05300>`__,"Apache-2.0",,,,
ResNet50_Weights.SENTINEL2_ALL_DINO,13,`link <https://github.com/zhu-xlab/SSL4EO-S12>`__,`link <https://arxiv.org/abs/2211.07044>`__,"CC-BY-4.0",90.7,99.1,63.6,
ResNet50_Weights.SENTINEL2_ALL_MOCO,13,`link <https://github.com/zhu-xlab/SSL4EO-S12>`__,`link <https://arxiv.org/abs/2211.07044>`__,"CC-BY-4.0",91.8,99.1,60.9,
ResNet50_Weights.SENTINEL2_RGB_MOCO, 3,`link <https://github.com/zhu-xlab/SSL4EO-S12>`__,`link <https://arxiv.org/abs/2211.07044>`__,"CC-BY-4.0",,,
Expand Down
92 changes: 84 additions & 8 deletions torchgeo/models/resnet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,64 @@

# https://github.com/zhu-xlab/SSL4EO-S12/blob/d2868adfada65e40910bfcedfc49bc3b20df2248/src/benchmark/transfer_classification/linear_BE_moco.py#L167
adamjstewart marked this conversation as resolved.
Show resolved Hide resolved
# https://github.com/zhu-xlab/SSL4EO-S12/blob/d2868adfada65e40910bfcedfc49bc3b20df2248/src/benchmark/transfer_classification/datasets/EuroSat/eurosat_dataset.py#L97
# Normalization either by 10K or channel-wise with band statistics
_zhu_xlab_transforms = K.AugmentationSequential(
# Normalization either by 10K (for S2 uint16 input) or channel-wise with band statistics
_mean_s1 = torch.tensor([-12.59, -20.26])
_std_s1 = torch.tensor([5.26, 5.91])
_ssl4eo_s12_transforms_s1 = K.AugmentationSequential(
K.Resize(256),
K.CenterCrop(224),
K.Normalize(mean=_mean_s1, std=_std_s1),
data_keys=None,
)

_ssl4eo_s12_transforms_s2_10k = K.AugmentationSequential(
K.Resize(256),
K.CenterCrop(224),
K.Normalize(mean=torch.tensor(0), std=torch.tensor(10000)),
data_keys=None,
)

_mean_s2 = torch.tensor(
[
1612.9,
1397.6,
1322.3,
1373.1,
1561.0,
2108.4,
2390.7,
2318.7,
2581.0,
837.7,
22.0,
2195.2,
1537.4,
]
)
_std_s2 = torch.tensor(
[
791.0,
854.3,
878.7,
1144.9,
1127.5,
1164.2,
1276.0,
1249.5,
1345.9,
577.5,
47.5,
1340.0,
1142.9,
]
)
_ssl4eo_s12_transforms_s2_stats = K.AugmentationSequential(
K.Resize(256),
K.CenterCrop(224),
K.Normalize(mean=_mean_s2, std=_std_s2),
data_keys=None,
)

# Normalization only available for RGB dataset, defined here:
# https://github.com/ServiceNow/seasonal-contrast/blob/8285173ec205b64bc3e53b880344dd6c3f79fa7a/datasets/seco_dataset.py
_min = torch.tensor([3, 2, 0])
Expand Down Expand Up @@ -201,7 +251,7 @@ class ResNet18_Weights(WeightsEnum): # type: ignore[misc]

SENTINEL2_ALL_MOCO = Weights(
url='https://hf.co/torchgeo/resnet18_sentinel2_all_moco/resolve/5b8cddc9a14f3844350b7f40b85bcd32aed75918/resnet18_sentinel2_all_moco-59bfdff9.pth',
transforms=_zhu_xlab_transforms,
transforms=_ssl4eo_s12_transforms_s2_10k,
meta={
'dataset': 'SSL4EO-S12',
'in_chans': 13,
Expand All @@ -214,7 +264,7 @@ class ResNet18_Weights(WeightsEnum): # type: ignore[misc]

SENTINEL2_RGB_MOCO = Weights(
url='https://hf.co/torchgeo/resnet18_sentinel2_rgb_moco/resolve/e1c032e7785fd0625224cdb6699aa138bb304eec/resnet18_sentinel2_rgb_moco-e3a335e3.pth',
transforms=_zhu_xlab_transforms,
transforms=_ssl4eo_s12_transforms_s2_10k,
meta={
'dataset': 'SSL4EO-S12',
'in_chans': 3,
Expand Down Expand Up @@ -391,9 +441,22 @@ class ResNet50_Weights(WeightsEnum): # type: ignore[misc]
},
)

SENTINEL1_ALL_DECUR = Weights(
url='https://huggingface.co/torchgeo/decur/resolve/9328eeb90c686a88b30f8526ed757b4bc0f12027/rn50_ssl4eo-s12_sar_decur_ep100-f0e69ba2.pth',
transforms=_ssl4eo_s12_transforms_s1,
meta={
'dataset': 'SSL4EO-S12',
'in_chans': 2,
'model': 'resnet50',
'publication': 'https://arxiv.org/abs/2309.05300',
'repo': 'https://github.com/zhu-xlab/DeCUR',
'ssl_method': 'decur',
},
)

SENTINEL1_ALL_MOCO = Weights(
url='https://hf.co/torchgeo/resnet50_sentinel1_all_moco/resolve/e79862c667853c10a709bdd77ea8ffbad0e0f1cf/resnet50_sentinel1_all_moco-906e4356.pth',
transforms=_zhu_xlab_transforms,
transforms=_ssl4eo_s12_transforms_s1,
meta={
'dataset': 'SSL4EO-S12',
'in_chans': 2,
Expand All @@ -404,9 +467,22 @@ class ResNet50_Weights(WeightsEnum): # type: ignore[misc]
},
)

SENTINEL2_ALL_DECUR = Weights(
url='https://huggingface.co/torchgeo/decur/resolve/eba7ae5945d482a4319be046d34b552db5dd9950/rn50_ssl4eo-s12_ms_decur_ep100-fc6b09ff.pth',
transforms=_ssl4eo_s12_transforms_s2_10k,
meta={
'dataset': 'SSL4EO-S12',
'in_chans': 13,
'model': 'resnet50',
'publication': 'https://arxiv.org/abs/2309.05300',
'repo': 'https://github.com/zhu-xlab/DeCUR',
'ssl_method': 'decur',
},
)

SENTINEL2_ALL_DINO = Weights(
url='https://hf.co/torchgeo/resnet50_sentinel2_all_dino/resolve/d7f14bf5530d70ac69d763e58e77e44dbecfec7c/resnet50_sentinel2_all_dino-d6c330e9.pth',
transforms=_zhu_xlab_transforms,
transforms=_ssl4eo_s12_transforms_s2_10k,
meta={
'dataset': 'SSL4EO-S12',
'in_chans': 13,
Expand All @@ -419,7 +495,7 @@ class ResNet50_Weights(WeightsEnum): # type: ignore[misc]

SENTINEL2_ALL_MOCO = Weights(
url='https://hf.co/torchgeo/resnet50_sentinel2_all_moco/resolve/da4f3c9dbe09272eb902f3b37f46635fa4726879/resnet50_sentinel2_all_moco-df8b932e.pth',
transforms=_zhu_xlab_transforms,
transforms=_ssl4eo_s12_transforms_s2_10k,
meta={
'dataset': 'SSL4EO-S12',
'in_chans': 13,
Expand All @@ -432,7 +508,7 @@ class ResNet50_Weights(WeightsEnum): # type: ignore[misc]

SENTINEL2_RGB_MOCO = Weights(
url='https://hf.co/torchgeo/resnet50_sentinel2_rgb_moco/resolve/efd9723b59a88e9dc1420dc1e96afb25b0630a3c/resnet50_sentinel2_rgb_moco-2b57ba8b.pth',
transforms=_zhu_xlab_transforms,
transforms=_ssl4eo_s12_transforms_s2_10k,
meta={
'dataset': 'SSL4EO-S12',
'in_chans': 3,
Expand Down
Loading