Skip to content
Snippets Groups Projects
Commit 27712a65 authored by Daniel CARRON's avatar Daniel CARRON :b:
Browse files

[indian] Specify Indian configuration key in aggregated datamodules

parent 0b81d69f
No related branches found
No related tags found
1 merge request!22Fix db path issues when reusing DataLoaders from other Datamodules
Pipeline #84495 passed
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
"""Aggregated DataModule composed of Montgomery, Shenzhen and Indian datasets.""" """Aggregated DataModule composed of Montgomery, Shenzhen and Indian datasets."""
from ....data.datamodule import ConcatDataModule from ....data.datamodule import ConcatDataModule
from ..indian.datamodule import CONFIGURATION_KEY_DATADIR as INDIAN_KEY_DATADIR
from ..indian.datamodule import RawDataLoader as IndianLoader from ..indian.datamodule import RawDataLoader as IndianLoader
from ..indian.datamodule import make_split as make_indian_split from ..indian.datamodule import make_split as make_indian_split
from ..montgomery.datamodule import RawDataLoader as MontgomeryLoader from ..montgomery.datamodule import RawDataLoader as MontgomeryLoader
...@@ -26,7 +27,7 @@ class DataModule(ConcatDataModule): ...@@ -26,7 +27,7 @@ class DataModule(ConcatDataModule):
montgomery_split = make_montgomery_split(split_filename) montgomery_split = make_montgomery_split(split_filename)
shenzhen_loader = ShenzhenLoader() shenzhen_loader = ShenzhenLoader()
shenzhen_split = make_shenzhen_split(split_filename) shenzhen_split = make_shenzhen_split(split_filename)
indian_loader = IndianLoader() indian_loader = IndianLoader(INDIAN_KEY_DATADIR)
indian_split = make_indian_split(split_filename) indian_split = make_indian_split(split_filename)
super().__init__( super().__init__(
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
"""Aggregated DataModule composed of Montgomery, Shenzhen, Indian, and PadChest datasets.""" """Aggregated DataModule composed of Montgomery, Shenzhen, Indian, and PadChest datasets."""
from ....data.datamodule import ConcatDataModule from ....data.datamodule import ConcatDataModule
from ..indian.datamodule import CONFIGURATION_KEY_DATADIR as INDIAN_KEY_DATADIR
from ..indian.datamodule import RawDataLoader as IndianLoader from ..indian.datamodule import RawDataLoader as IndianLoader
from ..indian.datamodule import make_split as make_indian_split from ..indian.datamodule import make_split as make_indian_split
from ..montgomery.datamodule import RawDataLoader as MontgomeryLoader from ..montgomery.datamodule import RawDataLoader as MontgomeryLoader
...@@ -31,7 +32,7 @@ class DataModule(ConcatDataModule): ...@@ -31,7 +32,7 @@ class DataModule(ConcatDataModule):
montgomery_split = make_montgomery_split(split_filename) montgomery_split = make_montgomery_split(split_filename)
shenzhen_loader = ShenzhenLoader() shenzhen_loader = ShenzhenLoader()
shenzhen_split = make_shenzhen_split(split_filename) shenzhen_split = make_shenzhen_split(split_filename)
indian_loader = IndianLoader() indian_loader = IndianLoader(INDIAN_KEY_DATADIR)
indian_split = make_indian_split(split_filename) indian_split = make_indian_split(split_filename)
padchest_loader = PadchestLoader() padchest_loader = PadchestLoader()
padchest_split = make_padchest_split(padchest_split_filename) padchest_split = make_padchest_split(padchest_split_filename)
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
"""Aggregated DataModule composed of Montgomery, Shenzhen, Indian, and TBX11k datasets.""" """Aggregated DataModule composed of Montgomery, Shenzhen, Indian, and TBX11k datasets."""
from ....data.datamodule import ConcatDataModule from ....data.datamodule import ConcatDataModule
from ..indian.datamodule import CONFIGURATION_KEY_DATADIR as INDIAN_KEY_DATADIR
from ..indian.datamodule import RawDataLoader as IndianLoader from ..indian.datamodule import RawDataLoader as IndianLoader
from ..indian.datamodule import make_split as make_indian_split from ..indian.datamodule import make_split as make_indian_split
from ..montgomery.datamodule import RawDataLoader as MontgomeryLoader from ..montgomery.datamodule import RawDataLoader as MontgomeryLoader
...@@ -31,7 +32,7 @@ class DataModule(ConcatDataModule): ...@@ -31,7 +32,7 @@ class DataModule(ConcatDataModule):
montgomery_split = make_montgomery_split(split_filename) montgomery_split = make_montgomery_split(split_filename)
shenzhen_loader = ShenzhenLoader() shenzhen_loader = ShenzhenLoader()
shenzhen_split = make_shenzhen_split(split_filename) shenzhen_split = make_shenzhen_split(split_filename)
indian_loader = IndianLoader() indian_loader = IndianLoader(INDIAN_KEY_DATADIR)
indian_split = make_indian_split(split_filename) indian_split = make_indian_split(split_filename)
tbx11k_loader = TBX11kLoader() tbx11k_loader = TBX11kLoader()
tbx11k_split = make_tbx11k_split(tbx11k_split_filename) tbx11k_split = make_tbx11k_split(tbx11k_split_filename)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment