Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replacing the field output_bands with input_bands to avoid misunderstanding. #19

Closed
wants to merge 1 commit into from
Closed

Replacing the field output_bands with input_bands to avoid misunderstanding. #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/confs/burn_scars.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ data:
- NIR_NARROW
- SWIR_1
- SWIR_2
output_bands:
input_bands:
- BLUE
- GREEN
- RED
Expand Down
2 changes: 1 addition & 1 deletion examples/confs/multi_temporal_crop.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ data:
- NIR_NARROW
- SWIR_1
- SWIR_2
output_bands:
input_bands:
- BLUE
- GREEN
- RED
Expand Down
2 changes: 1 addition & 1 deletion examples/confs/sen1floods11_vit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ data:
- NIR_NARROW
- SWIR_1
- SWIR_2
output_bands:
input_bands:
- BLUE
- GREEN
- RED
Expand Down
2 changes: 1 addition & 1 deletion examples/confs/sen1floods11_vit_local_ckpt.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ data:
- NIR_NARROW
- SWIR_1
- SWIR_2
output_bands:
input_bands:
- BLUE
- GREEN
- RED
Expand Down
6 changes: 3 additions & 3 deletions examples/notebooks/Tutorial.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@
" HLSBands.SWIR_1,\n",
" HLSBands.SWIR_2,\n",
" ],\n",
" output_bands=[\n",
" input_bands=[\n",
" HLSBands.BLUE,\n",
" HLSBands.GREEN,\n",
" HLSBands.RED,\n",
Expand Down Expand Up @@ -871,7 +871,7 @@
],
"metadata": {
"kernelspec": {
"display_name": "terratorch_os",
"display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "python3"
},
Expand All @@ -885,7 +885,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.14"
"version": "3.10.8"
}
},
"nbformat": 4,
Expand Down
28 changes: 14 additions & 14 deletions src/terratorch/datamodules/generic_pixel_wise_data_module.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def __init__(
allow_substring_split_file: bool = True,
dataset_bands: list[HLSBands | int] | None = None,
predict_dataset_bands: list[HLSBands | int] | None = None,
output_bands: list[HLSBands | int] | None = None,
input_bands: list[HLSBands | int] | None = None,
constant_scale: float = 1,
rgb_indices: list[int] | None = None,
train_transform: A.Compose | None | list[A.BasicTransform] = None,
Expand Down Expand Up @@ -133,7 +133,7 @@ def __init__(
matches (e.g. eurosat). Defaults to True.
dataset_bands (list[HLSBands | int] | None, optional): _description_. Defaults to None.
predict_dataset_bands (list[HLSBands | int] | None, optional): _description_. Defaults to None.
output_bands (list[HLSBands | int] | None, optional): _description_. Defaults to None.
input_bands (list[HLSBands | int] | None, optional): _description_. Defaults to None.
constant_scale (float, optional): _description_. Defaults to 1.
rgb_indices (list[int] | None, optional): _description_. Defaults to None.
train_transform (Albumentations.Compose | None): Albumentations transform
Expand Down Expand Up @@ -183,7 +183,7 @@ def __init__(

self.dataset_bands = dataset_bands
self.predict_dataset_bands = predict_dataset_bands if predict_dataset_bands else dataset_bands
self.output_bands = output_bands
self.input_bands = input_bands
self.rgb_indices = rgb_indices
self.expand_temporal_dimension = expand_temporal_dimension
self.reduce_zero_label = reduce_zero_label
Expand Down Expand Up @@ -213,7 +213,7 @@ def setup(self, stage: str) -> None:
ignore_split_file_extensions=self.ignore_split_file_extensions,
allow_substring_split_file=self.allow_substring_split_file,
dataset_bands=self.dataset_bands,
output_bands=self.output_bands,
input_bands=self.input_bands,
constant_scale=self.constant_scale,
rgb_indices=self.rgb_indices,
transform=self.train_transform,
Expand All @@ -233,7 +233,7 @@ def setup(self, stage: str) -> None:
ignore_split_file_extensions=self.ignore_split_file_extensions,
allow_substring_split_file=self.allow_substring_split_file,
dataset_bands=self.dataset_bands,
output_bands=self.output_bands,
input_bands=self.input_bands,
constant_scale=self.constant_scale,
rgb_indices=self.rgb_indices,
transform=self.val_transform,
Expand All @@ -253,7 +253,7 @@ def setup(self, stage: str) -> None:
ignore_split_file_extensions=self.ignore_split_file_extensions,
allow_substring_split_file=self.allow_substring_split_file,
dataset_bands=self.dataset_bands,
output_bands=self.output_bands,
input_bands=self.input_bands,
constant_scale=self.constant_scale,
rgb_indices=self.rgb_indices,
transform=self.test_transform,
Expand All @@ -267,7 +267,7 @@ def setup(self, stage: str) -> None:
self.predict_root,
self.num_classes,
dataset_bands=self.predict_dataset_bands,
output_bands=self.output_bands,
input_bands=self.input_bands,
constant_scale=self.constant_scale,
rgb_indices=self.rgb_indices,
transform=self.test_transform,
Expand Down Expand Up @@ -330,7 +330,7 @@ def __init__(
allow_substring_split_file: bool = True,
dataset_bands: list[HLSBands | int] | None = None,
predict_dataset_bands: list[HLSBands | int] | None = None,
output_bands: list[HLSBands | int] | None = None,
input_bands: list[HLSBands | int] | None = None,
constant_scale: float = 1,
rgb_indices: list[int] | None = None,
train_transform: A.Compose | None | list[A.BasicTransform] = None,
Expand Down Expand Up @@ -371,7 +371,7 @@ def __init__(
matches (e.g. eurosat). Defaults to True.
dataset_bands (list[HLSBands | int] | None, optional): _description_. Defaults to None.
predict_dataset_bands (list[HLSBands | int] | None, optional): _description_. Defaults to None.
output_bands (list[HLSBands | int] | None, optional): _description_. Defaults to None.
input_bands (list[HLSBands | int] | None, optional): _description_. Defaults to None.
constant_scale (float, optional): _description_. Defaults to 1.
rgb_indices (list[int] | None, optional): _description_. Defaults to None.
train_transform (Albumentations.Compose | None): Albumentations transform
Expand Down Expand Up @@ -421,7 +421,7 @@ def __init__(

self.dataset_bands = dataset_bands
self.predict_dataset_bands = predict_dataset_bands if predict_dataset_bands else dataset_bands
self.output_bands = output_bands
self.input_bands = input_bands
self.rgb_indices = rgb_indices

# self.aug = AugmentationSequential(
Expand All @@ -447,7 +447,7 @@ def setup(self, stage: str) -> None:
ignore_split_file_extensions=self.ignore_split_file_extensions,
allow_substring_split_file=self.allow_substring_split_file,
dataset_bands=self.dataset_bands,
output_bands=self.output_bands,
input_bands=self.input_bands,
constant_scale=self.constant_scale,
rgb_indices=self.rgb_indices,
transform=self.train_transform,
Expand All @@ -466,7 +466,7 @@ def setup(self, stage: str) -> None:
ignore_split_file_extensions=self.ignore_split_file_extensions,
allow_substring_split_file=self.allow_substring_split_file,
dataset_bands=self.dataset_bands,
output_bands=self.output_bands,
input_bands=self.input_bands,
constant_scale=self.constant_scale,
rgb_indices=self.rgb_indices,
transform=self.val_transform,
Expand All @@ -485,7 +485,7 @@ def setup(self, stage: str) -> None:
ignore_split_file_extensions=self.ignore_split_file_extensions,
allow_substring_split_file=self.allow_substring_split_file,
dataset_bands=self.dataset_bands,
output_bands=self.output_bands,
input_bands=self.input_bands,
constant_scale=self.constant_scale,
rgb_indices=self.rgb_indices,
transform=self.test_transform,
Expand All @@ -499,7 +499,7 @@ def setup(self, stage: str) -> None:
self.predict_dataset = self.dataset_class(
self.predict_root,
dataset_bands=self.predict_dataset_bands,
output_bands=self.output_bands,
input_bands=self.input_bands,
constant_scale=self.constant_scale,
rgb_indices=self.rgb_indices,
transform=self.test_transform,
Expand Down
28 changes: 14 additions & 14 deletions src/terratorch/datamodules/generic_scalar_label_data_module.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def __init__(
allow_substring_split_file: bool = True,
dataset_bands: list[HLSBands | int] | None = None,
predict_dataset_bands: list[HLSBands | int] | None = None,
output_bands: list[HLSBands | int] | None = None,
input_bands: list[HLSBands | int] | None = None,
constant_scale: float = 1,
rgb_indices: list[int] | None = None,
train_transform: A.Compose | None | list[A.BasicTransform] = None,
Expand Down Expand Up @@ -112,7 +112,7 @@ def __init__(
matches (e.g. eurosat). Defaults to True.
dataset_bands (list[HLSBands | int] | None, optional): _description_. Defaults to None.
predict_dataset_bands (list[HLSBands | int] | None, optional): _description_. Defaults to None.
output_bands (list[HLSBands | int] | None, optional): _description_. Defaults to None.
input_bands (list[HLSBands | int] | None, optional): _description_. Defaults to None.
constant_scale (float, optional): _description_. Defaults to 1.
rgb_indices (list[int] | None, optional): _description_. Defaults to None.
train_transform (Albumentations.Compose | None): Albumentations transform
Expand Down Expand Up @@ -152,7 +152,7 @@ def __init__(

self.dataset_bands = dataset_bands
self.predict_dataset_bands = predict_dataset_bands if predict_dataset_bands else dataset_bands
self.output_bands = output_bands
self.input_bands = input_bands
self.rgb_indices = rgb_indices
self.expand_temporal_dimension = expand_temporal_dimension

Expand All @@ -178,7 +178,7 @@ def setup(self, stage: str) -> None:
ignore_split_file_extensions=self.ignore_split_file_extensions,
allow_substring_split_file=self.allow_substring_split_file,
dataset_bands=self.dataset_bands,
output_bands=self.output_bands,
input_bands=self.input_bands,
constant_scale=self.constant_scale,
rgb_indices=self.rgb_indices,
transform=self.train_transform,
Expand All @@ -193,7 +193,7 @@ def setup(self, stage: str) -> None:
ignore_split_file_extensions=self.ignore_split_file_extensions,
allow_substring_split_file=self.allow_substring_split_file,
dataset_bands=self.dataset_bands,
output_bands=self.output_bands,
input_bands=self.input_bands,
constant_scale=self.constant_scale,
rgb_indices=self.rgb_indices,
transform=self.val_transform,
Expand All @@ -208,7 +208,7 @@ def setup(self, stage: str) -> None:
ignore_split_file_extensions=self.ignore_split_file_extensions,
allow_substring_split_file=self.allow_substring_split_file,
dataset_bands=self.dataset_bands,
output_bands=self.output_bands,
input_bands=self.input_bands,
constant_scale=self.constant_scale,
rgb_indices=self.rgb_indices,
transform=self.test_transform,
Expand All @@ -220,7 +220,7 @@ def setup(self, stage: str) -> None:
self.predict_root,
self.num_classes,
dataset_bands=self.predict_dataset_bands,
output_bands=self.output_bands,
input_bands=self.input_bands,
constant_scale=self.constant_scale,
rgb_indices=self.rgb_indices,
transform=self.test_transform,
Expand Down Expand Up @@ -277,7 +277,7 @@ def _dataloader_factory(self, split: str) -> DataLoader[dict[str, Tensor]]:
# allow_substring_split_file: bool = True,
# dataset_bands: list[HLSBands | int] | None = None,
# predict_dataset_bands: list[HLSBands | int] | None = None,
# output_bands: list[HLSBands | int] | None = None,
# input_bands: list[HLSBands | int] | None = None,
# constant_scale: float = 1,
# rgb_indices: list[int] | None = None,
# train_transform: A.Compose | None | list[A.BasicTransform] = None,
Expand Down Expand Up @@ -311,7 +311,7 @@ def _dataloader_factory(self, split: str) -> DataLoader[dict[str, Tensor]]:
# matches (e.g. eurosat). Defaults to True.
# dataset_bands (list[HLSBands | int] | None, optional): _description_. Defaults to None.
# predict_dataset_bands (list[HLSBands | int] | None, optional): _description_. Defaults to None.
# output_bands (list[HLSBands | int] | None, optional): _description_. Defaults to None.
# input_bands (list[HLSBands | int] | None, optional): _description_. Defaults to None.
# constant_scale (float, optional): _description_. Defaults to 1.
# rgb_indices (list[int] | None, optional): _description_. Defaults to None.
# train_transform (Albumentations.Compose | None): Albumentations transform
Expand Down Expand Up @@ -350,7 +350,7 @@ def _dataloader_factory(self, split: str) -> DataLoader[dict[str, Tensor]]:
# self.constant_scale = constant_scale
# self.dataset_bands = dataset_bands
# self.predict_dataset_bands = predict_dataset_bands if predict_dataset_bands else dataset_bands
# self.output_bands = output_bands
# self.input_bands = input_bands
# self.rgb_indices = rgb_indices

# # self.aug = AugmentationSequential(
Expand All @@ -372,7 +372,7 @@ def _dataloader_factory(self, split: str) -> DataLoader[dict[str, Tensor]]:
# ignore_split_file_extensions=self.ignore_split_file_extensions,
# allow_substring_split_file=self.allow_substring_split_file,
# dataset_bands=self.dataset_bands,
# output_bands=self.output_bands,
# input_bands=self.input_bands,
# constant_scale=self.constant_scale,
# rgb_indices=self.rgb_indices,
# transform=self.train_transform,
Expand All @@ -386,7 +386,7 @@ def _dataloader_factory(self, split: str) -> DataLoader[dict[str, Tensor]]:
# ignore_split_file_extensions=self.ignore_split_file_extensions,
# allow_substring_split_file=self.allow_substring_split_file,
# dataset_bands=self.dataset_bands,
# output_bands=self.output_bands,
# input_bands=self.input_bands,
# constant_scale=self.constant_scale,
# rgb_indices=self.rgb_indices,
# transform=self.val_transform,
Expand All @@ -400,7 +400,7 @@ def _dataloader_factory(self, split: str) -> DataLoader[dict[str, Tensor]]:
# ignore_split_file_extensions=self.ignore_split_file_extensions,
# allow_substring_split_file=self.allow_substring_split_file,
# dataset_bands=self.dataset_bands,
# output_bands=self.output_bands,
# input_bands=self.input_bands,
# constant_scale=self.constant_scale,
# rgb_indices=self.rgb_indices,
# transform=self.test_transform,
Expand All @@ -412,7 +412,7 @@ def _dataloader_factory(self, split: str) -> DataLoader[dict[str, Tensor]]:
# self.predict_dataset = self.dataset_class(
# self.predict_root,
# dataset_bands=self.predict_dataset_bands,
# output_bands=self.output_bands,
# input_bands=self.input_bands,
# constant_scale=self.constant_scale,
# rgb_indices=self.rgb_indices,
# transform=self.test_transform,
Expand Down
Loading
Loading