diff --git a/README.md b/README.md index 16cc6285e67..0c68e5ae495 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ for batch in dataloader: # train a model, or make predictions using a pre-trained model ``` -Example predictions from a Mask R-CNN model trained on the NWPU VHR-10 dataset +Example predictions from a Mask R-CNN model trained on the VHR-10 dataset All TorchGeo datasets are compatible with PyTorch data loaders, making them easy to integrate into existing training workflows. The only difference between a benchmark dataset in TorchGeo and a similar dataset in torchvision is that each dataset returns a dictionary with keys for each PyTorch `Tensor`. diff --git a/docs/api/datasets.rst b/docs/api/datasets.rst index 7991fbabc49..af761f33d90 100644 --- a/docs/api/datasets.rst +++ b/docs/api/datasets.rst @@ -312,8 +312,8 @@ Vaihingen .. autoclass:: Vaihingen2D -NWPU VHR-10 -^^^^^^^^^^^ +VHR-10 +^^^^^^ .. autoclass:: VHR10 diff --git a/docs/api/non_geo_datasets.csv b/docs/api/non_geo_datasets.csv index d8002401eab..035c8cba9d7 100644 --- a/docs/api/non_geo_datasets.csv +++ b/docs/api/non_geo_datasets.csv @@ -32,6 +32,6 @@ Dataset,Task,Source,# Samples,# Classes,Size (px),Resolution (m),Bands `UC Merced`_,C,USGS National Map,"21,000",21,256x256,0.3,RGB `USAVars`_,R,NAIP Aerial,100K,-,-,4,"RGB, NIR" `Vaihingen`_,S,Aerial,33,6,"1,281--3,816",0.09,RGB -`NWPU VHR-10`_,I,"Google Earth, Vaihingen",800,10,"358--1,728",0.08--2,RGB +`VHR-10`_,I,"Google Earth, Vaihingen",800,10,"358--1,728",0.08--2,RGB `xView2`_,CD,Maxar,"3,732",4,"1,024x1,024",0.8,RGB `ZueriCrop`_,"I, T",Sentinel-2,116K,48,24x24,10,MSI diff --git a/tests/data/nwpu/NWPU VHR-10 dataset.rar b/tests/data/vhr10/NWPU VHR-10 dataset.rar similarity index 100% rename from tests/data/nwpu/NWPU VHR-10 dataset.rar rename to tests/data/vhr10/NWPU VHR-10 dataset.rar diff --git a/tests/data/nwpu/annotations.json b/tests/data/vhr10/annotations.json similarity index 100% rename from tests/data/nwpu/annotations.json rename to tests/data/vhr10/annotations.json diff --git a/tests/data/nwpu/data.py b/tests/data/vhr10/data.py similarity index 100% rename from tests/data/nwpu/data.py rename to tests/data/vhr10/data.py diff --git a/tests/datasets/test_utils.py b/tests/datasets/test_utils.py index 4dff844ca31..abd37ce6930 100644 --- a/tests/datasets/test_utils.py +++ b/tests/datasets/test_utils.py @@ -87,7 +87,7 @@ def test_mock_missing_module(mock_missing_module: None) -> None: [ os.path.join("cowc_detection", "COWC_Detection_Columbus_CSUAV_AFRL.tbz"), os.path.join("cowc_detection", "COWC_test_list_detection.txt.bz2"), - os.path.join("nwpu", "NWPU VHR-10 dataset.rar"), + os.path.join("vhr10", "NWPU VHR-10 dataset.rar"), os.path.join("landcoverai", "landcover.ai.v1.zip"), os.path.join("chesapeake", "BAYWIDE", "Baywide_13Class_20132014.zip"), os.path.join("sen12ms", "ROIs1158_spring_lc.tar.gz"), @@ -107,7 +107,7 @@ def test_missing_rarfile(mock_missing_module: None) -> None: match="rarfile is not installed and is required to extract this dataset", ): extract_archive( - os.path.join("tests", "data", "nwpu", "NWPU VHR-10 dataset.rar") + os.path.join("tests", "data", "vhr10", "NWPU VHR-10 dataset.rar") ) diff --git a/tests/datasets/test_nwpu.py b/tests/datasets/test_vhr10.py similarity index 95% rename from tests/datasets/test_nwpu.py rename to tests/datasets/test_vhr10.py index 717e09be0b3..6147c0bb9d5 100644 --- a/tests/datasets/test_nwpu.py +++ b/tests/datasets/test_vhr10.py @@ -31,13 +31,13 @@ def dataset( self, monkeypatch: MonkeyPatch, tmp_path: Path, request: SubRequest ) -> VHR10: pytest.importorskip("rarfile", minversion="3") - monkeypatch.setattr(torchgeo.datasets.nwpu, "download_url", download_url) + monkeypatch.setattr(torchgeo.datasets.vhr10, "download_url", download_url) monkeypatch.setattr(torchgeo.datasets.utils, "download_url", download_url) - url = os.path.join("tests", "data", "nwpu", "NWPU VHR-10 dataset.rar") + url = os.path.join("tests", "data", "vhr10", "NWPU VHR-10 dataset.rar") monkeypatch.setitem(VHR10.image_meta, "url", url) md5 = "5fddb0dfd56a80638831df9f90cbf37a" monkeypatch.setitem(VHR10.image_meta, "md5", md5) - url = os.path.join("tests", "data", "nwpu", "annotations.json") + url = os.path.join("tests", "data", "vhr10", "annotations.json") monkeypatch.setitem(VHR10.target_meta, "url", url) md5 = "833899cce369168e0d4ee420dac326dc" monkeypatch.setitem(VHR10.target_meta, "md5", md5) diff --git a/torchgeo/datasets/__init__.py b/torchgeo/datasets/__init__.py index 05f5c7ca124..ea3c5988e2c 100644 --- a/torchgeo/datasets/__init__.py +++ b/torchgeo/datasets/__init__.py @@ -74,7 +74,6 @@ from .millionaid import MillionAID from .naip import NAIP from .nasa_marine_debris import NASAMarineDebris -from .nwpu import VHR10 from .openbuildings import OpenBuildings from .oscd import OSCD from .patternnet import PatternNet @@ -105,6 +104,7 @@ unbind_samples, ) from .vaihingen import Vaihingen2D +from .vhr10 import VHR10 from .xview import XView2 from .zuericrop import ZueriCrop diff --git a/torchgeo/datasets/resisc45.py b/torchgeo/datasets/resisc45.py index 8e06b58bac8..85b782d7bf1 100644 --- a/torchgeo/datasets/resisc45.py +++ b/torchgeo/datasets/resisc45.py @@ -15,7 +15,7 @@ class RESISC45(NonGeoClassificationDataset): - """RESISC45 dataset. + """NWPU-RESISC45 dataset. The `RESISC45 `__ dataset is a dataset for remote sensing image scene classification. diff --git a/torchgeo/datasets/nwpu.py b/torchgeo/datasets/vhr10.py similarity index 100% rename from torchgeo/datasets/nwpu.py rename to torchgeo/datasets/vhr10.py