From 8747acafc16e242586e0342637adbe2465bbe66a Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Tue, 17 Sep 2024 12:15:24 +0200 Subject: [PATCH 1/3] git blame: ignore prettier reformat (#2299) * git blame: ignore prettier reformat * Fix file that was merged during review process --- .git-blame-ignore-revs | 4 +++- tests/conf/landcoverai100.yaml | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index f465d76f976..2127a1d22b7 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,4 +1,6 @@ -# Double quote -> single quote +# Prettier: double quote -> single quote +6a5aaf4b93507072d40dcd78114893362c4eaf6e +# Ruff: double quote -> single quote b09122f3e4a9cb422f6747bf33eca02993f67549 # Prettier bd9c75798eede1a4b7d7ecd6203179d3cb5e54dd diff --git a/tests/conf/landcoverai100.yaml b/tests/conf/landcoverai100.yaml index 1610bb03990..f6461851fa3 100644 --- a/tests/conf/landcoverai100.yaml +++ b/tests/conf/landcoverai100.yaml @@ -1,9 +1,9 @@ model: class_path: SemanticSegmentationTask init_args: - loss: "ce" - model: "unet" - backbone: "resnet18" + loss: 'ce' + model: 'unet' + backbone: 'resnet18' in_channels: 3 num_classes: 5 num_filters: 1 @@ -13,4 +13,4 @@ data: init_args: batch_size: 1 dict_kwargs: - root: "tests/data/landcoverai" + root: 'tests/data/landcoverai' From d440c568df4d865827f594b756410421242cdb34 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Tue, 17 Sep 2024 19:41:42 +0200 Subject: [PATCH 2/3] DataModules: use persistent workers for parallel data loading (#2291) --- torchgeo/datamodules/geo.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/torchgeo/datamodules/geo.py b/torchgeo/datamodules/geo.py index 5f5ae76b939..e8e3aedd194 100644 --- a/torchgeo/datamodules/geo.py +++ b/torchgeo/datamodules/geo.py @@ -286,6 +286,7 @@ def _dataloader_factory(self, split: str) -> DataLoader[dict[str, Tensor]]: batch_sampler=batch_sampler, num_workers=self.num_workers, collate_fn=self.collate_fn, + persistent_workers=self.num_workers > 0, ) def train_dataloader(self) -> DataLoader[dict[str, Tensor]]: @@ -429,6 +430,7 @@ def _dataloader_factory(self, split: str) -> DataLoader[dict[str, Tensor]]: shuffle=split == 'train', num_workers=self.num_workers, collate_fn=self.collate_fn, + persistent_workers=self.num_workers > 0, ) def train_dataloader(self) -> DataLoader[dict[str, Tensor]]: From 43d0d94f3f6919eb62b33018f7621ffedcee0315 Mon Sep 17 00:00:00 2001 From: Sieger Falkena Date: Fri, 20 Sep 2024 13:37:12 +0200 Subject: [PATCH 3/3] GH actions tutorials - Install TorchGeo from checked out repo (#2306) * Remove required.txt and install torchgeo from checked-out repo * keep required.txt --- .github/workflows/tutorials.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tutorials.yaml b/.github/workflows/tutorials.yaml index 67accad5e2c..f3e746499ee 100644 --- a/.github/workflows/tutorials.yaml +++ b/.github/workflows/tutorials.yaml @@ -33,7 +33,7 @@ jobs: - name: Install pip dependencies if: steps.cache.outputs.cache-hit != 'true' run: | - pip install -r requirements/required.txt -r requirements/docs.txt -r requirements/tests.txt planetary_computer pystac + pip install -r requirements/required.txt -r requirements/docs.txt -r requirements/tests.txt planetary_computer pystac . pip cache purge - name: List pip dependencies run: pip list