Skip to content
Snippets Groups Projects
Commit da823a05 authored by Daniel CARRON's avatar Daniel CARRON :b: Committed by André Anjos
Browse files

Fixed docstring

parent a1c3cc28
No related branches found
No related tags found
1 merge request!6Making use of LightningDataModule and simplification of data loading
......@@ -2,7 +2,8 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
"""Aggregated dataset composed of Montgomery and Shenzhen datasets."""
"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default
TBX11K-simplified datasets (cross validation fold 1, RGB)"""
from clapper.logging import setup
from torch.utils.data.dataset import ConcatDataset
......@@ -12,6 +13,7 @@ from ..base_datamodule import BaseDataModule, get_dataset_from_module
from ..indian.fold_1_rgb import datamodule as indian_datamodule
from ..montgomery.fold_1_rgb import datamodule as mc_datamodule
from ..shenzhen.fold_1_rgb import datamodule as ch_datamodule
from ..tbx11k_simplified.fold_1_rgb import datamodule as tbx11k_datamodule
logger = setup(__name__.split(".")[0], format="%(levelname)s: %(message)s")
......@@ -51,23 +53,41 @@ class DefaultModule(BaseDataModule):
indian = get_dataset_from_module(
indian_datamodule, stage, **module_args
)
tbx11k = get_dataset_from_module(
tbx11k_datamodule, stage, **module_args
)
# Combine datasets
self.dataset = {}
self.dataset["__train__"] = ConcatDataset(
[mc["__train__"], ch["__train__"], indian["__train__"]]
[
mc["__train__"],
ch["__train__"],
indian["__train__"],
tbx11k["__train__"],
]
)
self.dataset["train"] = ConcatDataset(
[mc["train"], ch["train"], indian["train"]]
[mc["train"], ch["train"], indian["train"], tbx11k["train"]]
)
self.dataset["__valid__"] = ConcatDataset(
[mc["__valid__"], ch["__valid__"], indian["__valid__"]]
[
mc["__valid__"],
ch["__valid__"],
indian["__valid__"],
tbx11k["__valid__"],
]
)
self.dataset["validation"] = ConcatDataset(
[mc["validation"], ch["validation"], indian["validation"]]
[
mc["validation"],
ch["validation"],
indian["validation"],
tbx11k["validation"],
]
)
self.dataset["test"] = ConcatDataset(
[mc["test"], ch["test"], indian["test"]]
[mc["test"], ch["test"], indian["test"], tbx11k["test"]]
)
(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment