Граф коммитов

76 Коммитов

Автор SHA1 Сообщение Дата
Adam J. Stewart 54421b7940 Deps: make omegaconf/tensorboard optional (#1214)
* Deps: make omegaconf/tensorboard optional

* Bump minimum tensorboard

* Remove explicit tensorboard install from GitHub Actions

* Fix typo
2023-04-10 23:12:20 +00:00
Adam J. Stewart ce4c4b1455 Faster, more space-efficient tutorials (#1124)
* Speed up notebook tests

* Black fix

* Mock rest of variables

* Undo URL changes

* Update conda deps

* Notebooks also plot images

* Fix undefined variable

* Test with serial data loading

* Use tempfile for all data download directories

* Encode timeout in notebook

* Share datasets across processes

* Fix missing import

* Pretrained Weights: use EuroSAT100

* Transforms: use EuroSAT100

* Trainers: use EuroSAT100

* Blacken

* MPLBACKEND is already Agg by default on Linux

* Indices: use EuroSAT100

* Pretrained Weights: add output

* Pretrained Weights: add output

* Trainers: save output

* Pretrained Weights: ResNet 50 -> 18

* Trainers: better graph

* Indices: add missing plot

* Cache downloads

* Small edit

* Revert "Cache downloads"

This reverts commit 5276c53a06.

* Revert "Revert "Cache downloads""

This reverts commit 137c69e776.

* env only

* half env

* Variable with no braces

* Set tmpdir elsewhere

* Give up on tmpdir caching

* Trainers: clear output

* lightning.pytorch package import

* nbstripout

* Rerun upon failure

* Re-add caching

* Rerun failures on release branch too
2023-04-10 23:08:55 +00:00
dependabot[bot] 201942a3b1 Bump pytorch-lightning[extra] from 1.9.4 to 2.0.0 in /requirements (#1178)
* Bump pytorch-lightning[extra] from 1.9.4 to 2.0.0 in /requirements

Bumps [pytorch-lightning[extra]](https://github.com/Lightning-AI/lightning) from 1.9.4 to 2.0.0.
- [Release notes](https://github.com/Lightning-AI/lightning/releases)
- [Commits](https://github.com/Lightning-AI/lightning/compare/1.9.4...2.0.0)

---
updated-dependencies:
- dependency-name: pytorch-lightning[extra]
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Remove deprecated features

* pytorch_lightning -> lightning

* bump radiant-mlhub too

* isort fix

* lightning does not yet have public type hints

* More ignores

* blanket ignore

* blanket ignore

* Fix function typo

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
2023-04-10 23:02:42 +00:00
Adam J. Stewart ac8a9c0de0 Fix version selection button in docs (#1144)
* Fix version selection button in docs

* Try 6.0.0

* Require sphinx < 6

* Pin conda too
2023-04-10 22:59:45 +00:00
SpontaneousDuck 424751ab52 Support for radiant-mlhub 0.5+ (#1102)
* update datasets and tests to support radiant-mlhub>0.5

* add test coverage for nasa_marine_debris corrupted cases

* style fixes

* Correct return type in test_nasa_marine_debris.py

* Update setup.cfg to limit radiant-mlhub version

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

* radiant-mlhub version updates to <0.6

* Update environment.yml to not upper bound radiant-mlhub

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

---------

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
2023-04-10 22:55:58 +00:00
Ashwin Nair 7c2868814f
Add plot method for VHR10 dataset (#847)
* Add plot fn & rename nwpu -> vhr10

* Update test data & add data.py

* Add scikit-image dependency

* Move scikit-image dep to extras

* Comment out check for coverage

* Move skimage import

* Update requirements

* Test requirements

* Update requirements

* Update

* Update

* Update

* Update

* Update

* Update min scipy

* Update min scipy

* Update min scipy

* Update min scipy

* Update min scipy

* Update skimage

* Review comments#1

* Update skimage

* Revert rename to nwpu

* Revert renames

* Update min scipy

* Fix data dirname

* More fixes

* Bump numpy minor version

* Update scipy

* Going back to what worked

* Ignore numpy warning

* Edit

* Edit warning

* Ignore another warning

* Insanity

* Fix pooch

* Try older skimage

* Try older scipy

* scipy 1.2.0

* scipy 1.4.0

* scipy 1.5.0

* scipy 1.4.2

* scipy 1.6.0

* scipy 1.5.4

* scipy 1.5.2

* scipy 1.5.1

* scipy 1.5.1 is new min dep version

* Fix skip

* Newer scipy

* scipy 1.6.3

* scipy 1.6.0

* scipy 1.6.1

* scipy 1.6.2

* scipy 1.6.2 is new min

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
2023-01-22 23:37:24 -06:00
Adam J. Stewart e9c305861c
Remove packaging dependency (#1019)
* Remove packaging dependency

* Remove additional references

* Remove unused import
2023-01-22 21:04:42 -08:00
Nils Lehmann 60eb61b5fa
Add Multi-Weight Support API (#917)
* load pretrained weights

* change name millionaid

* restructure and additional weights

* rename sentinel1 weights

* add vit small weights

* forgot to add vit.py

* struggling with test

* wrong name failing test

* feedback on tests

* increase test coverage

* fix failing test

* fix failing test

* fix failing test and add vit tests

* fix failing vit test

* torchgeo.models.utils

* forgot utils file

* typo num channels

* nitpick docs, version torchvision

* another try min dependencies

* add documentation table

* expand pytests to test pretrained weights on tasks

* reverse changes to byol task

* add tests to init pretrained weights from config

* forgot to add the conf files

* change path

* increase test coverage

* vit tests all pass locally including slow

* now remote

* fix tests another one

* add a draft tutorial

* run black on tutorial notebook

* Tutorial typo fixes

* Lower min torch/vision versions

* Fix bad rebase

* Remove dead code

* Flake8 fixes

* Consistent in_chans

* Black fixes

* bison > yacs

* Remove one more reference

* Download modified weights from hugging face

* Add entrypoints

* Add torch.hub support

* progress arg is required

* Fix model loading for resnet18

* Add transforms, update tests

* VIT -> ViT

* add seco weights

* Fix type hints

* Link to timm docs

* Fix pydocstyle

* Try to fix timm docs link

* Fix tests

* Nuke ignores

* Ignore timm links

* Add model API methods

* Add to __init__ and document

* Test model API functions

* fix tests

* Use correct documentation link for intersphinx

* Typos

* Fix Windows tests

* meth -> func

* Explicit function scope

* weight-specific filename

* Support enums in classification trainer

* Update other trainers too

* Fix regression tests

* Fix classification tests

* Fix byol tests

* Fix types

* progress_bar is required arg

* Test weight enums

* Fix pickling

* Fix regression tests

* Improve coverage of classification tests

* Improve coverage of BYOL tests

* Update resnet table

* Update ViT table

* Update get_state_dict usage

* Remove unused YAML files

* Update table widths

* Documentation improvements

* Tweak tables

* Try to fix Windows tests

* Revert "Try to fix Windows tests"

This reverts commit 1325b13ff7.

* Monkeypatch everything

* Revert "Monkeypatch everything"

This reverts commit e3e8d7d042.

* Revert "Revert "Monkeypatch everything""

This reverts commit 9b27bd705b.

* Patch things not at the source

* Fix missing import

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
2023-01-22 14:25:49 -08:00
Nils Lehmann c62d8321fb
Add random crop logic to DeepGlobeLandCover Datamodule (#876)
* crop logic

* typo

* change train_batch_size logic

* fix failing test

* typos and naming

* return argument train dataloader

* typo

* fix failing test

* suggestions except about test file

* remove test_deepglobe and add test to trainer

* forgot new conf file

* reanme collate function

* move cropping logic to transform and utils

* remove comment

* simplify

* move pad_segmentation to transforms

* another one

* naming and versionadded

* another transforms approach

* typo

* fix read the docs

* some checks for Ncrop

* add unit tests new transforms

* Remove cruft

* More simplification

* Add config file

* Implemented ExtractTensorPatches

* Remove tests

* Remove unnecessary attrs

* Apply to both input and mask

* Implement RandomNCrop

* Fix dimensions

* mypy fixes

* Fix docs

* Ensure that image and mask get the same transformation

* Bump min kornia version

* ignore still needed?

* Remove unneeded hacks

* Fix pydocstyle

* Fix dimensions

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
2022-12-29 18:08:49 -06:00
Isaac Corley b9f0fb2bfe
Replace open3d with pyvista (#663)
* remove open3d add pyvista

* refactor plotting pcl with pyvista

* refactor tests with pyvista

* remove open3d

* remove skipping pcl plot test on mac

* fix

* remove unused import

* add pyvista docs

* use xvfb for pyvista tests

* changes per suggestions

* changes per suggestions x2

* remove bugged test

* Test minimum pyvista version

* mypy fix

* More dep file updates

* Document change

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
2022-12-17 05:41:19 +00:00
Adam J. Stewart 3f47ea3a29
Update torchmetrics dep in other places (#832) 2022-10-13 16:16:58 -05:00
dependabot[bot] ee6132041b
Bump torchvision from 0.12.0 to 0.13.0 in /requirements (#631)
* Bump torchvision from 0.12.0 to 0.13.0 in /requirements

Bumps [torchvision](https://github.com/pytorch/vision) from 0.12.0 to 0.13.0.
- [Release notes](https://github.com/pytorch/vision/releases)
- [Commits](https://github.com/pytorch/vision/compare/v0.12.0...v0.13.0)

---
updated-dependencies:
- dependency-name: torchvision
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump PyTorch too

* mypy fixes

* Fix deprecation warning in tests

* Style fixes

* More fixes

* Bump minimum packaging

* Silence mypy

* Fix tests

* Fix tests

* Fix tests

* Improve test coverage

* Improve test coverage

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
2022-06-30 10:39:03 -07:00
Adam J. Stewart 959a23beb1
Move requirements-min.txt, split deps in multiple files (#605) 2022-06-19 09:07:42 -07:00
Adam J. Stewart 8c5e4d21cd
Test minimum version of deps (#574) 2022-06-18 08:00:45 -07:00
Ashwin Nair 433f846483
Remove esri channel (#580) 2022-06-15 10:02:07 -07:00
Adam J. Stewart 7a9a9c1d64
Resolve DeprecationWarnings (#567)
* Resolve DeprecationWarnings

* Fix PIL version check

* Add ignores, hide ignores

* Always specify max_epochs

* Re-add one of the ignores that was removed

* Silence ColorJitter behavior change warnings

* Fix num_workers warning on macOS

* Ignore coverage of lines missed by older pillow versions

* Fix support for pre/post versions of PIL

* Wordsmithing

* Remove unused imports
2022-06-13 10:38:17 -07:00
Ashwin Nair aec783da88
Pin protobuf<4 (#543) 2022-06-08 08:09:31 -07:00
remtav 60b7a3d587
environment.yml: install pytorch with gpu support by pegging cudatoolkit to max v11.5 (#545)
* environment.yml: peg cudatoolkit to max v11.5

* remove cudatoolkit

Co-authored-by: Wei Ji <23487320+weiji14@users.noreply.github.com>

Co-authored-by: Wei Ji <23487320+weiji14@users.noreply.github.com>
2022-06-06 10:34:42 -07:00
Ashwin Nair 5d2a8d1925
Update kornia version in environment.yml (#542) 2022-06-05 14:57:04 -05:00
remtav e785d81bdd
add channels to prevent conda's ResolvePackageError on Windows (#528)
* add channels to prevent conda's ResolvePackageError on Windows

* add open3d-admin channel for open3d dependency
2022-05-05 22:26:25 -05:00
Adam J. Stewart 3baf1ef7f2
Drop Python 3.6 support (#482)
* Drop Python 3.6 support

* pandas 0.23.2+ required for Python 3.7+ support

* Update environment.yml too
2022-03-29 13:58:46 -05:00
Adam J. Stewart a0f2a2dfcc
torchmetrics: IoU -> JaccardIndex (#361) 2022-01-18 20:34:15 +00:00
Adam J. Stewart f32bc0c858
extract_archive: support deflate64-compressed zip files (#282) 2022-01-14 23:14:51 -06:00
Ashwin Nair 065fd1e87e
Update min kornia version (#350) 2022-01-02 10:08:43 -06:00
Adam J. Stewart d985f31fe1
Docs: get rid of "Return type: None" for procedures with no return value (#277)
* Various improvements to API docs

* Remove setting that is already the default
2021-12-21 14:05:02 -08:00
Ashwin Nair 3900bf4c88
Replace pytorch-gpu with pytorch in environment.yml (#295)
* Replace pytorch-gpu with pytorch in environment.yml

* Add windows note
2021-12-16 16:46:59 -06:00
isaac 9a317be971
modify deps for open3d v0.14.1 (#275) 2021-12-09 19:48:32 -06:00
Caleb Robinson 48cc6c4783
Bumping torchvision dependency version to 0.10 (#272) 2021-12-08 01:58:55 +00:00
isaac 0434f3c1ce
Add IDTReeS dataset (#201)
* add IDTReeS dataset

* dataset loads data now

* add optional laspy and pandas dependencies

* fixed docs failing

* format

* refactor verify and resample chm/hsi to 200x200

* add open3d optional dep

* overhaul

* temporarily remove open3d install bc their pypi is broken

* mypy fixes

* fixes per suggestions

* general cleanup

* test passing

* add min version for laspy and pandas

* add open3d dependency

* add open3d to mypy tests

* add hard install for python 3.9 open3d to actions

* attempt #2

* I think I got it now

* updated tests.yaml

* make open3d dep require python<3.9

* open3d has issues with macos python 3.6

* same for 3.7

* skip open3d plot test for macos

* formatting

* skip open3d plot test for windows

* update per suggestions

* update test data readme for las files

* updated per suggestions

* more changes per suggestions

* last change per suggestion

* Grammar fix in pandas dep requirement comment

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
2021-12-05 22:38:50 +00:00
Adam J. Stewart 740d4f87a3
0.1.0 release (#226)
* 0.1.0 release

* Train deps needed for release testing

* Update development status

* setup.py should not be run directly

* Test more trainers

* Fix local docs build

* Update installation instructions

* Specify test data dir in config

* Fix tutorial docs

* Trainers should default to num_workers=0, download=False

* Correct location for root_dir

* Try different GDAL name

* Try again

* Various fixes to release tests

* Update pip installs in tutorials

* Fix some bugs

* Config file not being picked up

* Get back to 100% test coverage

* Added correct weight string to UCMerced

* yolo fix

* yolo fix pt 2

* yolo fix 2 pt. 1

* Simplify tests a bit

* Make the trainer notebook look stupid

* UCMerced should download by default in the trainers

* Revert

* Fix logo/author, include LICENSE in upload

Co-authored-by: Caleb Robinson <calebrob6@gmail.com>
2021-11-07 22:05:58 -06:00
Caleb Robinson 60674cc200
Adding timm models to the classification task and refactoring (#210)
* Adding support for VGG models in the classification task
Refactoring the logic for replacing the first conv layer in a network

* Fix formatting

* Testing the stuff

* mypy with torch is such a waste of time

* Update torchgeo/trainers/utils.py

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

* Update torchgeo/trainers/utils.py

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

* Adding timm dependency

* Incorporate timm into ClassificationTask

* Fix tests?

* Formatting

* Allow for overriding stride and padding in `reinit_initial_conv_layer`

* Putting back some stuff I accidentally overwrote in the rebase

* Bug

* Format

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
2021-11-03 15:34:33 -07:00
isaac c9a788a666
Indices Transforms (#127)
* draft indices transform

* import sort

* added AugmentationSequential wrapper for dicts

* updated indices

* fix dim concat bugs

* format

* add kornia dependency

* add augmentationsequenal unit tests

* add augmentationsequential support for boxes and mask dtypes

* add indices tests

* Draft indices tutorial notebook

* move notebook to tutorials folder

* mypy fixes

* fix bug when only image key used in AugmentationSequential

* Created using Colaboratory

* added tutorial to docs

* format

* added kornia master branch dependency'

* refactor notebook to use % cell magic and python to download files

* revert kornia version

* install kornia master branch for mypy checks

* update mypy github action install order

* fix divide by zero error in indices

* Created using Colaboratory

* fix nbsphinx errors

* add TODO to remove kornia in tests action

* format setup.cfg

* minor fixes to indices

* remove unecessary variable

* update mask to cast to original dtype

* removed unused ignore comment

* added gray/rgb/multispectral unit tests

* added tests with boxes

* Created using Colaboratory

* Created using Colaboratory

* fix mypy issues

* updated notebooks in docs

* Updates to tutorials

* Created using Colaboratory

* Created using Colaboratory

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
2021-09-28 17:04:56 -05:00
Adam J. Stewart 0820b2b131
Reduce number of files listing deps (#154)
* Reduce number of files listing deps

* Install cython before anything else

* Fix missing deps before install

* Fix typo in setup.cfg extra option

* Add Read the Docs config file

* nbmake only used for testing docs, not building docs
2021-09-22 09:41:00 -05:00
isaac 77094c21fa
Add ADVANCE dataset (#133)
* updated docs

* added torchaudio as optional dependency

* added sample data for tests

* added dataset

* added advance unit tests

* replaced torchaudio with scipy.io.wavefile.read

* Revert "added torchaudio as optional dependency"

This reverts commit 960d94f67533e83facc080d9a6f9b965a8820294.

* updated to lazy import scipy, updated docstring

* add pytest.importorskip check for scipy

* add sample audio wav file creation details

* add scipy dependency

* downgrading scipy dep to scipy>=1.5.4

* fix pytest.importorskip to return none

* update scipy import error message

* fixed dummy audio data dims

* downgrading scipy dep to scipy>=0.9.0

* added tests for missing h5py

* format

* fixed missing import test

* Update tests/datasets/test_advance.py

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
2021-09-19 23:00:56 +00:00
Isaac Corley 41df0b583f added einops dependency 2021-09-07 21:59:22 -05:00
Caleb Robinson 04355ecc2f Formatting 2021-09-03 17:43:41 -05:00
Caleb Robinson b8ba2ebc2b Versiuons 2021-09-03 17:43:41 -05:00
Caleb Robinson ef83f7b309 Updating versions of shapely and pyproj 2021-09-03 17:43:41 -05:00
Caleb Robinson 5ee2419d65 pyproj 3.0 to keep 3.6 support everywhere 2021-09-03 17:43:41 -05:00
Caleb Robinson e9f14a3f46 Updating versions and reasoning on shapely and pyproj 2021-09-03 17:43:41 -05:00
Caleb Robinson 50e6b3e1d3 Adding shapely dependency 2021-09-03 17:43:41 -05:00
Caleb Robinson acaf415b65 Adding pyproj dependency 2021-09-03 17:43:41 -05:00
Caleb Robinson 3e296991e2 Removing some headers 2021-08-31 13:25:05 -05:00
Adam J. Stewart da7e120350 Add license header to all files 2021-08-31 13:25:05 -05:00
Adam J. Stewart 5a80799bd4 Use nbmake to test notebooks 2021-08-25 11:19:33 -05:00
Adam J. Stewart d7d901c866 Consolidate notebooks 2021-08-25 11:19:33 -05:00
Adam J. Stewart 36c3e17154 Add tutorials to documentation 2021-08-25 11:19:33 -05:00
Adam J. Stewart d5b4a5c06e Document minimum supported dependency versions 2021-08-16 16:00:54 -05:00
Adam J. Stewart 6b00f460d2 Benin: don't hardcode tile transform 2021-08-09 21:43:35 -07:00
Adam J. Stewart 8b193d9c30 Jupyterlab needed to visualize notebooks 2021-08-04 10:10:25 -07:00