Additional Satlas pretrained models #1884

piperwolters · 2024-02-15T19:43:56Z

Documentation, satellite-specific transforms, and weights for additional Satlas single-image RGB & multispectral Swin-v2 models. Tests pass.

Few things:

Renamed the existing model weights to include "SI", for single-image input. torchgeo doesn't support multi-image input yet, but there are multi-image Satlas models so hopefully someday those could be included.
There are a couple custom transforms, for Landsat and multispectral Sentinel-2. Maybe there's a cleaner way to do this?

…l Satlas single-image rgb&multispectral Swin-v2 models. Tests pass.

piperwolters · 2024-02-15T20:49:53Z

@piperwolters please read the following Contributor License Agreement(CLA). If you agree with the CLA, please reply with the following information.
@microsoft-github-policy-service agree [company="Allen Institute for AI"]
Options:

(default - no company specified) I have sole ownership of intellectual property rights to my Submissions and I am not making Submissions in the course of work for my employer.
@microsoft-github-policy-service agree
(when company given) I am making Submissions in the course of work for my employer (or my employer has intellectual property rights in my Submissions by contract or applicable law). I have permission from my employer to make Submissions and enter into this Agreement on behalf of my employer. By signing below, the defined term “You” includes me and my employer.
@microsoft-github-policy-service agree company="Microsoft"
Contributor License Agreement

docs/api/naip_pretrained_weights.csv

docs/api/sentinel1_pretrained_weights.csv

torchgeo/models/swin.py

piperwolters · 2024-02-20T22:51:32Z

@microsoft-github-policy-service agree company="Allen Institute for AI"

isaaccorley

Minor change but otherwise LGTM. @adamjstewart not sure if the CLA bot is broken or what's happening here

torchgeo/models/swin.py

piperwolters · 2024-02-21T02:02:22Z

@microsoft-github-policy-service agree company="Allen Institute for AI"

calebrob6 · 2024-02-21T05:14:37Z

Looks like that last one did it 🤷‍♂️

torchgeo/models/swin.py

calebrob6 · 2024-02-21T17:42:01Z

Thanks Piper!!

piperwolters · 2024-02-21T18:13:55Z

Woohoo! Thank you guys

adamjstewart · 2024-02-22T10:14:00Z

docs/api/naip_pretrained_weights.csv

Thanks for correcting this license

Wait, but https://huggingface.co/allenai/satlas-pretrain has an Apache-2.0 license?

docs/api/sentinel2_pretrained_weights.csv

torchgeo/models/swin.py

torchgeo/transforms/transforms.py

adamjstewart · 2024-02-28T12:08:46Z

Another comment on this. Our unit tests do not actually attempt to download the model. We have separate tests for this that are only run before each release. If you run:

> pytest -m slow tests/models/test_swin.py

you'll see that these models fail due to:

RuntimeError: Attempting to deserialize object on a CUDA device but torch.cuda.is_available() is False. If you are running on a CPU-only machine, please use torch.load with map_location=torch.device('cpu') to map your storages to the CPU.

We should either change the weights to be for the CPU (this is what we did for all other model weights in TorchGeo) or set the map_location for all models.

adamjstewart · 2024-02-28T12:11:51Z

Also see #1916, I'm changing the URLs for all of our models to ensure that the md5 is reproducible even if you make this kind of change.

* Documentation, satellite-specific transform and weights for additional Satlas single-image rgb&multispectral Swin-v2 models. Tests pass. * Address 3 of comments * Address comments, fix readmydocs and isort, mypy still unhappy * update * Add bands to meta dicts * Add comment about Satlas S2 RGB using TCI product * linting --------- Co-authored-by: Piper Wolters <piperw@allenai.org> Co-authored-by: Piper Wolters <piperw@prior-cirrascale-79.reviz.ai2.in>

* initial commit * add init description * correct scanning of files in init * added random data generation * remove test directory * Update metadata * fix formatting * add s1 data and update regex * fix dataset and add tests * formatting * mypy * add timeseries test and take images from july * fix bug in merging files across dates * mypy * Bump lightly from 1.4.25 to 1.5.0 in /requirements (#1894) * Additional Satlas pretrained models (#1884) * Documentation, satellite-specific transform and weights for additional Satlas single-image rgb&multispectral Swin-v2 models. Tests pass. * Address 3 of comments * Address comments, fix readmydocs and isort, mypy still unhappy * update * Add bands to meta dicts * Add comment about Satlas S2 RGB using TCI product * linting --------- Co-authored-by: Piper Wolters <piperw@allenai.org> Co-authored-by: Piper Wolters <piperw@prior-cirrascale-79.reviz.ai2.in> * Update tests/data/south_africa_crop_type/data.py Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com> * Update tests/data/south_africa_crop_type/data.py Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com> * Update torchgeo/datasets/south_africa_crop_type.py Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com> * Update torchgeo/datasets/south_africa_crop_type.py Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com> * Update torchgeo/datasets/south_africa_crop_type.py Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com> * Update torchgeo/datasets/south_africa_crop_type.py Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com> * refactor gettitem and bug fixes * typo * data.py style * Update torchgeo/datasets/south_africa_crop_type.py Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com> * Update torchgeo/datasets/south_africa_crop_type.py Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com> * added comments for nonstandard functionality * Update torchgeo/datasets/south_africa_crop_type.py Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com> * small change * add verbose documentation --------- Co-authored-by: georgehuber <“georgehuber8@gmail.com”> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Piper Wolters <46272042+piperwolters@users.noreply.github.com> Co-authored-by: Piper Wolters <piperw@allenai.org> Co-authored-by: Piper Wolters <piperw@prior-cirrascale-79.reviz.ai2.in> Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

adamjstewart · 2024-05-02T10:56:14Z

@piperwolters did you ever get a chance to apply the change requests here?

adamjstewart · 2024-07-24T06:45:36Z

Soft reminder @piperwolters 😅

docs/api/landsat_pretrained_weights.csv

github-actions bot added documentation Improvements or additions to documentation models Models and pretrained weights labels Feb 15, 2024

Documentation, satellite-specific transform and weights for additiona…

c4cf522

…l Satlas single-image rgb&multispectral Swin-v2 models. Tests pass.

piperwolters force-pushed the main branch from 747012f to c4cf522 Compare February 15, 2024 19:52

isaaccorley requested changes Feb 15, 2024

View reviewed changes

docs/api/naip_pretrained_weights.csv Outdated Show resolved Hide resolved

docs/api/sentinel1_pretrained_weights.csv Outdated Show resolved Hide resolved

torchgeo/models/swin.py Outdated Show resolved Hide resolved

torchgeo/models/swin.py Outdated Show resolved Hide resolved

Piper Wolters added 2 commits February 15, 2024 15:34

Address 3 of comments

eeceb79

Merge branch 'main' of https://github.com/microsoft/torchgeo into main

452727a

isaaccorley requested changes Feb 20, 2024

View reviewed changes

torchgeo/models/swin.py Outdated Show resolved Hide resolved

torchgeo/models/swin.py Outdated Show resolved Hide resolved

torchgeo/models/swin.py Outdated Show resolved Hide resolved

github-actions bot added the transforms Data augmentation transforms label Feb 20, 2024

Address comments, fix readmydocs and isort, mypy still unhappy

f8e4d4e

piperwolters force-pushed the main branch from 3a2d359 to f8e4d4e Compare February 20, 2024 21:31

Piper Wolters added 2 commits February 20, 2024 13:31

Merge branch 'main' of https://github.com/microsoft/torchgeo into main

5fc622f

update

ee7e668

piperwolters requested a review from isaaccorley February 20, 2024 22:27

isaaccorley requested changes Feb 21, 2024

View reviewed changes

torchgeo/models/swin.py Outdated Show resolved Hide resolved

torchgeo/models/swin.py Show resolved Hide resolved

Add bands to meta dicts

e281f23

calebrob6 reviewed Feb 21, 2024

View reviewed changes

torchgeo/models/swin.py Outdated Show resolved Hide resolved

Add comment about Satlas S2 RGB using TCI product

ddf0d63

piperwolters force-pushed the main branch from d228be0 to ddf0d63 Compare February 21, 2024 17:01

calebrob6 previously approved these changes Feb 21, 2024

View reviewed changes

linting

9b3bcf0

piperwolters dismissed calebrob6’s stale review via 9b3bcf0 February 21, 2024 17:27

calebrob6 approved these changes Feb 21, 2024

View reviewed changes

isaaccorley approved these changes Feb 21, 2024

View reviewed changes

calebrob6 merged commit ad2ef7a into microsoft:main Feb 21, 2024
24 checks passed

adamjstewart reviewed Feb 22, 2024

View reviewed changes

adamjstewart added this to the 0.6.0 milestone Feb 22, 2024

adamjstewart mentioned this pull request Feb 29, 2024

Support additional SatlasPretrain models. #1861

Open

4 tasks

adamjstewart mentioned this pull request May 2, 2024

SatlasPretrain: ResNet50/152 and Swin_V2_T Weights #2038

Merged

adamjstewart mentioned this pull request May 23, 2024

Add new pretrained weights #1043

Open

21 tasks

adamjstewart reviewed Jul 24, 2024

View reviewed changes

docs/api/landsat_pretrained_weights.csv Show resolved Hide resolved

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Additional Satlas pretrained models #1884

Additional Satlas pretrained models #1884

piperwolters commented Feb 15, 2024 •

edited

Loading

piperwolters commented Feb 15, 2024

piperwolters commented Feb 20, 2024

isaaccorley left a comment

piperwolters commented Feb 21, 2024

calebrob6 commented Feb 21, 2024

calebrob6 commented Feb 21, 2024

piperwolters commented Feb 21, 2024

adamjstewart Feb 22, 2024

adamjstewart Aug 20, 2024

adamjstewart commented Feb 28, 2024

adamjstewart commented Feb 28, 2024

adamjstewart commented May 2, 2024

adamjstewart commented Jul 24, 2024

Additional Satlas pretrained models #1884

Additional Satlas pretrained models #1884

Conversation

piperwolters commented Feb 15, 2024 • edited Loading

piperwolters commented Feb 15, 2024

piperwolters commented Feb 20, 2024

isaaccorley left a comment

Choose a reason for hiding this comment

piperwolters commented Feb 21, 2024

calebrob6 commented Feb 21, 2024

calebrob6 commented Feb 21, 2024

piperwolters commented Feb 21, 2024

adamjstewart Feb 22, 2024

Choose a reason for hiding this comment

adamjstewart Aug 20, 2024

Choose a reason for hiding this comment

adamjstewart commented Feb 28, 2024

adamjstewart commented Feb 28, 2024

adamjstewart commented May 2, 2024

adamjstewart commented Jul 24, 2024

piperwolters commented Feb 15, 2024 •

edited

Loading