Merge branch 'main' into add-taran-iith

microsoft · Sep 27, 2023 · 9077f1d · 9077f1d
2 parents 7565ba1 + 7f00c4d
commit 9077f1d
Show file tree

Hide file tree

Showing 266 changed files with 2,613 additions and 2,624 deletions.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -3,3 +3,6 @@ contact_links:
   - name: ❓ Questions
     url: https://github.com/microsoft/torchgeo/discussions
     about: Ask questions or discuss ideas with other TorchGeo users
+  - name: 💬 Chat
+    url: https://join.slack.com/t/torchgeo/shared_invite/zt-22rse667m-eqtCeNW0yI000Tl4B~2PIw
+    about: Chat with fellow TorchGeo users and developers on Slack
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -12,70 +12,70 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Clone repo
-      uses: actions/checkout@v3.6.0
+      uses: actions/checkout@v4.1.0
     - name: Set up python
       uses: actions/[email protected]
       with:
         python-version: '3.11'
     - name: Cache dependencies
-      uses: actions/[email protected].1
+      uses: actions/[email protected].2
       id: cache
       with:
         path: ${{ env.pythonLocation }}
         key: ${{ env.pythonLocation }}-${{ hashFiles('setup.cfg') }}
     - name: Install pip dependencies
       if: steps.cache.outputs.cache-hit != 'true'
-      run: |
-        pip install .[tests]
-        pip list
+      run: pip install .[tests]
+    - name: List pip dependencies
+      run: pip list
     - name: Run pytest checks
       run: pytest --cov=torchgeo --cov-report=xml --durations=10
   integration:
     name: integration
     runs-on: ubuntu-latest
     steps:
     - name: Clone repo
-      uses: actions/checkout@v3.6.0
+      uses: actions/checkout@v4.1.0
     - name: Set up python
       uses: actions/[email protected]
       with:
         python-version: '3.11'
     - name: Cache dependencies
-      uses: actions/[email protected].1
+      uses: actions/[email protected].2
       id: cache
       with:
         path: ${{ env.pythonLocation }}
         key: ${{ env.pythonLocation }}-${{ hashFiles('setup.cfg') }}
     - name: Install pip dependencies
       if: steps.cache.outputs.cache-hit != 'true'
-      run: |
-        pip install .[datasets,tests]
-        pip list
+      run: pip install .[datasets,tests]
+    - name: List pip dependencies
+      run: pip list
     - name: Run integration checks
       run: pytest -m slow --durations=10
   notebooks:
     name: notebooks
     runs-on: ubuntu-latest
     steps:
     - name: Clone repo
-      uses: actions/checkout@v3.6.0
+      uses: actions/checkout@v4.1.0
     - name: Set up python
       uses: actions/[email protected]
       with:
         python-version: '3.11'
     - name: Cache dependencies
-      uses: actions/[email protected].1
+      uses: actions/[email protected].2
       id: cache
       with:
         path: ${{ env.pythonLocation }}
         key: ${{ env.pythonLocation }}-${{ hashFiles('setup.cfg') }}
     - name: Install pip dependencies
       if: steps.cache.outputs.cache-hit != 'true'
-      run: |
-        pip install .[docs,tests] planetary_computer pystac pytest-rerunfailures
-        pip list
+      run: pip install .[docs,tests] planetary_computer pystac
+    - name: List pip dependencies
+      run: pip list
     - name: Run notebook checks
-      run: pytest --nbmake --durations=10 --reruns=10 docs/tutorials
+      run: pytest --nbmake --durations=10 docs/tutorials
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.head.label || github.head_ref || github.ref }}
   cancel-in-progress: true
diff --git a/.github/workflows/style.yaml b/.github/workflows/style.yaml
@@ -14,114 +14,114 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Clone repo
-      uses: actions/checkout@v3.6.0
+      uses: actions/checkout@v4.1.0
     - name: Set up python
       uses: actions/[email protected]
       with:
         python-version: '3.11'
     - name: Cache dependencies
-      uses: actions/[email protected].1
+      uses: actions/[email protected].2
       id: cache
       with:
         path: ${{ env.pythonLocation }}
         key: ${{ env.pythonLocation }}-${{ hashFiles('requirements/style.txt') }}
     - name: Install pip dependencies
       if: steps.cache.outputs.cache-hit != 'true'
-      run: |
-        pip install -r requirements/style.txt
-        pip list
+      run: pip install -r requirements/style.txt
+    - name: List pip dependencies
+      run: pip list
     - name: Run black checks
       run: black . --check --diff
   flake8:
     name: flake8
     runs-on: ubuntu-latest
     steps:
     - name: Clone repo
-      uses: actions/checkout@v3.6.0
+      uses: actions/checkout@v4.1.0
     - name: Set up python
       uses: actions/[email protected]
       with:
         python-version: '3.11'
     - name: Cache dependencies
-      uses: actions/[email protected].1
+      uses: actions/[email protected].2
       id: cache
       with:
         path: ${{ env.pythonLocation }}
         key: ${{ env.pythonLocation }}-${{ hashFiles('requirements/style.txt') }}
     - name: Install pip dependencies
       if: steps.cache.outputs.cache-hit != 'true'
-      run: |
-        pip install -r requirements/style.txt
-        pip list
+      run: pip install -r requirements/style.txt
+    - name: List pip dependencies
+      run: pip list
     - name: Run flake8 checks
       run: flake8
   isort:
     name: isort
     runs-on: ubuntu-latest
     steps:
     - name: Clone repo
-      uses: actions/checkout@v3.6.0
+      uses: actions/checkout@v4.1.0
     - name: Set up python
       uses: actions/[email protected]
       with:
         python-version: '3.11'
     - name: Cache dependencies
-      uses: actions/[email protected].1
+      uses: actions/[email protected].2
       id: cache
       with:
         path: ${{ env.pythonLocation }}
         key: ${{ env.pythonLocation }}-${{ hashFiles('requirements/style.txt') }}
     - name: Install pip dependencies
       if: steps.cache.outputs.cache-hit != 'true'
-      run: |
-        pip install -r requirements/style.txt
-        pip list
+      run: pip install -r requirements/style.txt
+    - name: List pip dependencies
+      run: pip list
     - name: Run isort checks
       run: isort . --check --diff
   pydocstyle:
     name: pydocstyle
     runs-on: ubuntu-latest
     steps:
     - name: Clone repo
-      uses: actions/checkout@v3.6.0
+      uses: actions/checkout@v4.1.0
     - name: Set up python
       uses: actions/[email protected]
       with:
         python-version: '3.11'
     - name: Cache dependencies
-      uses: actions/[email protected].1
+      uses: actions/[email protected].2
       id: cache
       with:
         path: ${{ env.pythonLocation }}
         key: ${{ env.pythonLocation }}-${{ hashFiles('requirements/style.txt') }}
     - name: Install pip dependencies
       if: steps.cache.outputs.cache-hit != 'true'
-      run: |
-        pip install -r requirements/style.txt
-        pip list
+      run: pip install -r requirements/style.txt
+    - name: List pip dependencies
+      run: pip list
     - name: Run pydocstyle checks
       run: pydocstyle
   pyupgrade:
     name: pyupgrade
     runs-on: ubuntu-latest
     steps:
     - name: Clone repo
-      uses: actions/checkout@v3.6.0
+      uses: actions/checkout@v4.1.0
     - name: Set up python
       uses: actions/[email protected]
       with:
         python-version: '3.11'
     - name: Cache dependencies
-      uses: actions/[email protected].1
+      uses: actions/[email protected].2
       id: cache
       with:
         path: ${{ env.pythonLocation }}
         key: ${{ env.pythonLocation }}-${{ hashFiles('requirements/style.txt') }}
     - name: Install pip dependencies
       if: steps.cache.outputs.cache-hit != 'true'
-      run: |
-        pip install -r requirements/style.txt
-        pip list
+      run: pip install -r requirements/style.txt
+    - name: List pip dependencies
+      run: pip list
     - name: Run pyupgrade checks
       run: pyupgrade --py39-plus $(find . -path ./docs/src -prune -o -name "*.py" -print)
 concurrency:

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -14,22 +14,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Clone repo
-      uses: actions/checkout@v3.6.0
+      uses: actions/checkout@v4.1.0
     - name: Set up python
       uses: actions/[email protected]
       with:
         python-version: '3.11'
     - name: Cache dependencies
-      uses: actions/[email protected].1
+      uses: actions/[email protected].2
       id: cache
       with:
         path: ${{ env.pythonLocation }}
         key: ${{ env.pythonLocation }}-${{ hashFiles('requirements/required.txt') }}-${{ hashFiles('requirements/datasets.txt') }}-${{ hashFiles('requirements/tests.txt') }}
     - name: Install pip dependencies
       if: steps.cache.outputs.cache-hit != 'true'
-      run: |
-        pip install -r requirements/required.txt -r requirements/datasets.txt -r requirements/tests.txt
-        pip list
+      run: pip install -r requirements/required.txt -r requirements/datasets.txt -r requirements/tests.txt
+    - name: List pip dependencies
+      run: pip list
     - name: Run mypy checks
       run: mypy .
   pytest:
@@ -43,13 +43,13 @@ jobs:
         python-version: ['3.9', '3.10', '3.11']
     steps:
     - name: Clone repo
-      uses: actions/checkout@v3.6.0
+      uses: actions/checkout@v4.1.0
     - name: Set up python
       uses: actions/[email protected]
       with:
         python-version: ${{ matrix.python-version }}
     - name: Cache dependencies
-      uses: actions/[email protected].1
+      uses: actions/[email protected].2
       id: cache
       with:
         path: ${{ env.pythonLocation }}
@@ -70,9 +70,9 @@ jobs:
       if: ${{ runner.os == 'Windows' }}
     - name: Install pip dependencies
       if: steps.cache.outputs.cache-hit != 'true'
-      run: |
-        pip install -r requirements/required.txt -r requirements/datasets.txt -r requirements/tests.txt
-        pip list
+      run: pip install -r requirements/required.txt -r requirements/datasets.txt -r requirements/tests.txt
+    - name: List pip dependencies
+      run: pip list
     - name: Run pytest checks
       run: pytest --cov=torchgeo --cov-report=xml --durations=10
     - name: Report coverage
@@ -86,13 +86,13 @@ jobs:
       MPLBACKEND: Agg
     steps:
     - name: Clone repo
-      uses: actions/checkout@v3.6.0
+      uses: actions/checkout@v4.1.0
     - name: Set up python
       uses: actions/[email protected]
       with:
         python-version: '3.9'
     - name: Cache dependencies
-      uses: actions/[email protected].1
+      uses: actions/[email protected].2
       id: cache
       with:
         path: ${{ env.pythonLocation }}
@@ -105,9 +105,9 @@ jobs:
         sudo apt-get install unrar
     - name: Install pip dependencies
       if: steps.cache.outputs.cache-hit != 'true'
-      run: |
-        pip install -r requirements/min-reqs.old -c requirements/min-cons.old
-        pip list
+      run: pip install -r requirements/min-reqs.old -c requirements/min-cons.old
+    - name: List pip dependencies
+      run: pip list
     - name: Run pytest checks
       run: pytest --cov=torchgeo --cov-report=xml --durations=10
     - name: Report coverage

diff --git a/.github/workflows/tutorials.yaml b/.github/workflows/tutorials.yaml
@@ -16,24 +16,24 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Clone repo
-      uses: actions/checkout@v3.6.0
+      uses: actions/checkout@v4.1.0
     - name: Set up python
       uses: actions/[email protected]
       with:
         python-version: '3.11'
     - name: Cache dependencies
-      uses: actions/[email protected].1
+      uses: actions/[email protected].2
       id: cache
       with:
         path: ${{ env.pythonLocation }}
         key: ${{ env.pythonLocation }}-${{ hashFiles('setup.cfg') }}
     - name: Install pip dependencies
       if: steps.cache.outputs.cache-hit != 'true'
-      run: |
-        pip install .[docs,tests] planetary_computer pystac pytest-rerunfailures
-        pip list
+      run: pip install .[docs,tests] planetary_computer pystac
+    - name: List pip dependencies
+      run: pip list
     - name: Run notebook checks
-      run: pytest --nbmake --durations=10 --reruns=10 docs/tutorials
+      run: pytest --nbmake --durations=10 docs/tutorials
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.head.label || github.head_ref || github.ref }}
   cancel-in-progress: true
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -34,5 +34,5 @@ repos:
         hooks:
         -   id: mypy
             args: [--strict, --ignore-missing-imports, --show-error-codes]
-            additional_dependencies: [torch>=2, torchmetrics>=0.10, lightning>=2.0.3, pytest>=6.1.2, pyvista>=0.29, omegaconf>=2.0.1, hydra-core>=1, kornia>=0.6.5, numpy>=1.22]
+            additional_dependencies: [torch>=2, torchmetrics>=0.10, lightning>=2.0.9, pytest>=6.1.2, pyvista>=0.34.2, omegaconf>=2.0.1, hydra-core>=1, kornia>=0.6.5, numpy>=1.22]
             exclude: (build|data|dist|logo|logs|output)/
diff --git a/README.md b/README.md
@@ -7,17 +7,20 @@ The goal of this library is to make it simple:
 1. for machine learning experts to work with geospatial data, and
 2. for remote sensing experts to explore machine learning solutions.
 
-Testing:
-[![docs](https://readthedocs.org/projects/torchgeo/badge/?version=latest)](https://torchgeo.readthedocs.io/en/stable/)
-[![style](https://github.com/microsoft/torchgeo/actions/workflows/style.yaml/badge.svg)](https://github.com/microsoft/torchgeo/actions/workflows/style.yaml)
-[![tests](https://github.com/microsoft/torchgeo/actions/workflows/tests.yaml/badge.svg)](https://github.com/microsoft/torchgeo/actions/workflows/tests.yaml)
-[![codecov](https://codecov.io/gh/microsoft/torchgeo/branch/main/graph/badge.svg?token=oa3Z3PMVOg)](https://codecov.io/gh/microsoft/torchgeo)
+Community:
+[![slack](https://img.shields.io/badge/slack-join-purple?logo=slack)](https://join.slack.com/t/torchgeo/shared_invite/zt-22rse667m-eqtCeNW0yI000Tl4B~2PIw)
 
 Packaging:
 [![pypi](https://badge.fury.io/py/torchgeo.svg)](https://pypi.org/project/torchgeo/)
 [![conda](https://anaconda.org/conda-forge/torchgeo/badges/version.svg)](https://anaconda.org/conda-forge/torchgeo)
 [![spack](https://img.shields.io/spack/v/py-torchgeo)](https://spack.readthedocs.io/en/latest/package_list.html#py-torchgeo)
 
+Testing:
+[![docs](https://readthedocs.org/projects/torchgeo/badge/?version=latest)](https://torchgeo.readthedocs.io/en/stable/)
+[![style](https://github.com/microsoft/torchgeo/actions/workflows/style.yaml/badge.svg)](https://github.com/microsoft/torchgeo/actions/workflows/style.yaml)
+[![tests](https://github.com/microsoft/torchgeo/actions/workflows/tests.yaml/badge.svg)](https://github.com/microsoft/torchgeo/actions/workflows/tests.yaml)
+[![codecov](https://codecov.io/gh/microsoft/torchgeo/branch/main/graph/badge.svg?token=oa3Z3PMVOg)](https://codecov.io/gh/microsoft/torchgeo)
+
 ## Installation
 
 The recommended way to install TorchGeo is with [pip](https://pip.pypa.io/):

diff --git a/conf/bigearthnet.yaml b/conf/bigearthnet.yaml
@@ -2,8 +2,8 @@ module:
   _target_: torchgeo.trainers.MultiLabelClassificationTask
   loss: "bce"
   model: "resnet18"
-  learning_rate: 1e-3
-  learning_rate_schedule_patience: 6
+  lr: 1e-3
+  patience: 6
   weights: null
   in_channels: 14
   num_classes: 19