Moved mc_ch_in_11kv2 configs to data

pyproject.toml

@@ -365,28 +365,28 @@ mc_ch_in_11k_rs_f7 = "ptbench.configs.datasets.mc_ch_in_11k_RS.fold_7"
 mc_ch_in_11k_rs_f8 = "ptbench.configs.datasets.mc_ch_in_11k_RS.fold_8"
 mc_ch_in_11k_rs_f9 = "ptbench.configs.datasets.mc_ch_in_11k_RS.fold_9"
 # montgomery-shenzhen-indian-tbx11kv2 aggregated dataset
-mc_ch_in_11kv2 = "ptbench.configs.datasets.mc_ch_in_11kv2.default"
-mc_ch_in_11kv2_rgb = "ptbench.configs.datasets.mc_ch_in_11kv2.rgb"
-mc_ch_in_11kv2_f0 = "ptbench.configs.datasets.mc_ch_in_11kv2.fold_0"
-mc_ch_in_11kv2_f1 = "ptbench.configs.datasets.mc_ch_in_11kv2.fold_1"
-mc_ch_in_11kv2_f2 = "ptbench.configs.datasets.mc_ch_in_11kv2.fold_2"
-mc_ch_in_11kv2_f3 = "ptbench.configs.datasets.mc_ch_in_11kv2.fold_3"
-mc_ch_in_11kv2_f4 = "ptbench.configs.datasets.mc_ch_in_11kv2.fold_4"
-mc_ch_in_11kv2_f5 = "ptbench.configs.datasets.mc_ch_in_11kv2.fold_5"
-mc_ch_in_11kv2_f6 = "ptbench.configs.datasets.mc_ch_in_11kv2.fold_6"
-mc_ch_in_11kv2_f7 = "ptbench.configs.datasets.mc_ch_in_11kv2.fold_7"
-mc_ch_in_11kv2_f8 = "ptbench.configs.datasets.mc_ch_in_11kv2.fold_8"
-mc_ch_in_11kv2_f9 = "ptbench.configs.datasets.mc_ch_in_11kv2.fold_9"
-mc_ch_in_11kv2_f0_rgb = "ptbench.configs.datasets.mc_ch_in_11kv2.fold_0_rgb"
-mc_ch_in_11kv2_f1_rgb = "ptbench.configs.datasets.mc_ch_in_11kv2.fold_1_rgb"
-mc_ch_in_11kv2_f2_rgb = "ptbench.configs.datasets.mc_ch_in_11kv2.fold_2_rgb"
-mc_ch_in_11kv2_f3_rgb = "ptbench.configs.datasets.mc_ch_in_11kv2.fold_3_rgb"
-mc_ch_in_11kv2_f4_rgb = "ptbench.configs.datasets.mc_ch_in_11kv2.fold_4_rgb"
-mc_ch_in_11kv2_f5_rgb = "ptbench.configs.datasets.mc_ch_in_11kv2.fold_5_rgb"
-mc_ch_in_11kv2_f6_rgb = "ptbench.configs.datasets.mc_ch_in_11kv2.fold_6_rgb"
-mc_ch_in_11kv2_f7_rgb = "ptbench.configs.datasets.mc_ch_in_11kv2.fold_7_rgb"
-mc_ch_in_11kv2_f8_rgb = "ptbench.configs.datasets.mc_ch_in_11kv2.fold_8_rgb"
-mc_ch_in_11kv2_f9_rgb = "ptbench.configs.datasets.mc_ch_in_11kv2.fold_9_rgb"
+mc_ch_in_11kv2 = "ptbench.data.mc_ch_in_11kv2.default"
+mc_ch_in_11kv2_rgb = "ptbench.data.mc_ch_in_11kv2.rgb"
+mc_ch_in_11kv2_f0 = "ptbench.data.mc_ch_in_11kv2.fold_0"
+mc_ch_in_11kv2_f1 = "ptbench.data.mc_ch_in_11kv2.fold_1"
+mc_ch_in_11kv2_f2 = "ptbench.data.mc_ch_in_11kv2.fold_2"
+mc_ch_in_11kv2_f3 = "ptbench.data.mc_ch_in_11kv2.fold_3"
+mc_ch_in_11kv2_f4 = "ptbench.data.mc_ch_in_11kv2.fold_4"
+mc_ch_in_11kv2_f5 = "ptbench.data.mc_ch_in_11kv2.fold_5"
+mc_ch_in_11kv2_f6 = "ptbench.data.mc_ch_in_11kv2.fold_6"
+mc_ch_in_11kv2_f7 = "ptbench.data.mc_ch_in_11kv2.fold_7"
+mc_ch_in_11kv2_f8 = "ptbench.data.mc_ch_in_11kv2.fold_8"
+mc_ch_in_11kv2_f9 = "ptbench.data.mc_ch_in_11kv2.fold_9"
+mc_ch_in_11kv2_f0_rgb = "ptbench.data.mc_ch_in_11kv2.fold_0_rgb"
+mc_ch_in_11kv2_f1_rgb = "ptbench.data.mc_ch_in_11kv2.fold_1_rgb"
+mc_ch_in_11kv2_f2_rgb = "ptbench.data.mc_ch_in_11kv2.fold_2_rgb"
+mc_ch_in_11kv2_f3_rgb = "ptbench.data.mc_ch_in_11kv2.fold_3_rgb"
+mc_ch_in_11kv2_f4_rgb = "ptbench.data.mc_ch_in_11kv2.fold_4_rgb"
+mc_ch_in_11kv2_f5_rgb = "ptbench.data.mc_ch_in_11kv2.fold_5_rgb"
+mc_ch_in_11kv2_f6_rgb = "ptbench.data.mc_ch_in_11kv2.fold_6_rgb"
+mc_ch_in_11kv2_f7_rgb = "ptbench.data.mc_ch_in_11kv2.fold_7_rgb"
+mc_ch_in_11kv2_f8_rgb = "ptbench.data.mc_ch_in_11kv2.fold_8_rgb"
+mc_ch_in_11kv2_f9_rgb = "ptbench.data.mc_ch_in_11kv2.fold_9_rgb"
 # extended montgomery-shenzhen-indian-tbx11kv2 aggregated dataset
 # (with radiological signs)
 mc_ch_in_11kv2_rs = "ptbench.configs.datasets.mc_ch_in_11kv2_RS.default"

src/ptbench/configs/datasets/mc_ch_in_11kv2/__init__.py

-# SPDX-FileCopyrightText: Copyright © 2023 Idiap Research Institute <contact@idiap.ch>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from torch.utils.data.dataset import ConcatDataset
-
-
-def _maker(protocol):
-    if protocol == "default":
-        from ..indian import default as indian
-        from ..montgomery import default as mc
-        from ..shenzhen import default as ch
-        from ..tbx11k_simplified_v2 import default as tbx11kv2
-    elif protocol == "rgb":
-        from ..indian import rgb as indian
-        from ..montgomery import rgb as mc
-        from ..shenzhen import rgb as ch
-        from ..tbx11k_simplified_v2 import rgb as tbx11kv2
-    elif protocol == "fold_0":
-        from ..indian import fold_0 as indian
-        from ..montgomery import fold_0 as mc
-        from ..shenzhen import fold_0 as ch
-        from ..tbx11k_simplified_v2 import fold_0 as tbx11kv2
-    elif protocol == "fold_1":
-        from ..indian import fold_1 as indian
-        from ..montgomery import fold_1 as mc
-        from ..shenzhen import fold_1 as ch
-        from ..tbx11k_simplified_v2 import fold_1 as tbx11kv2
-    elif protocol == "fold_2":
-        from ..indian import fold_2 as indian
-        from ..montgomery import fold_2 as mc
-        from ..shenzhen import fold_2 as ch
-        from ..tbx11k_simplified_v2 import fold_2 as tbx11kv2
-    elif protocol == "fold_3":
-        from ..indian import fold_3 as indian
-        from ..montgomery import fold_3 as mc
-        from ..shenzhen import fold_3 as ch
-        from ..tbx11k_simplified_v2 import fold_3 as tbx11kv2
-    elif protocol == "fold_4":
-        from ..indian import fold_4 as indian
-        from ..montgomery import fold_4 as mc
-        from ..shenzhen import fold_4 as ch
-        from ..tbx11k_simplified_v2 import fold_4 as tbx11kv2
-    elif protocol == "fold_5":
-        from ..indian import fold_5 as indian
-        from ..montgomery import fold_5 as mc
-        from ..shenzhen import fold_5 as ch
-        from ..tbx11k_simplified_v2 import fold_5 as tbx11kv2
-    elif protocol == "fold_6":
-        from ..indian import fold_6 as indian
-        from ..montgomery import fold_6 as mc
-        from ..shenzhen import fold_6 as ch
-        from ..tbx11k_simplified_v2 import fold_6 as tbx11kv2
-    elif protocol == "fold_7":
-        from ..indian import fold_7 as indian
-        from ..montgomery import fold_7 as mc
-        from ..shenzhen import fold_7 as ch
-        from ..tbx11k_simplified_v2 import fold_7 as tbx11kv2
-    elif protocol == "fold_8":
-        from ..indian import fold_8 as indian
-        from ..montgomery import fold_8 as mc
-        from ..shenzhen import fold_8 as ch
-        from ..tbx11k_simplified_v2 import fold_8 as tbx11kv2
-    elif protocol == "fold_9":
-        from ..indian import fold_9 as indian
-        from ..montgomery import fold_9 as mc
-        from ..shenzhen import fold_9 as ch
-        from ..tbx11k_simplified_v2 import fold_9 as tbx11kv2
-    elif protocol == "fold_0_rgb":
-        from ..indian import fold_0_rgb as indian
-        from ..montgomery import fold_0_rgb as mc
-        from ..shenzhen import fold_0_rgb as ch
-        from ..tbx11k_simplified_v2 import fold_0_rgb as tbx11kv2
-    elif protocol == "fold_1_rgb":
-        from ..indian import fold_1_rgb as indian
-        from ..montgomery import fold_1_rgb as mc
-        from ..shenzhen import fold_1_rgb as ch
-        from ..tbx11k_simplified_v2 import fold_1_rgb as tbx11kv2
-    elif protocol == "fold_2_rgb":
-        from ..indian import fold_2_rgb as indian
-        from ..montgomery import fold_2_rgb as mc
-        from ..shenzhen import fold_2_rgb as ch
-        from ..tbx11k_simplified_v2 import fold_2_rgb as tbx11kv2
-    elif protocol == "fold_3_rgb":
-        from ..indian import fold_3_rgb as indian
-        from ..montgomery import fold_3_rgb as mc
-        from ..shenzhen import fold_3_rgb as ch
-        from ..tbx11k_simplified_v2 import fold_3_rgb as tbx11kv2
-    elif protocol == "fold_4_rgb":
-        from ..indian import fold_4_rgb as indian
-        from ..montgomery import fold_4_rgb as mc
-        from ..shenzhen import fold_4_rgb as ch
-        from ..tbx11k_simplified_v2 import fold_4_rgb as tbx11kv2
-    elif protocol == "fold_5_rgb":
-        from ..indian import fold_5_rgb as indian
-        from ..montgomery import fold_5_rgb as mc
-        from ..shenzhen import fold_5_rgb as ch
-        from ..tbx11k_simplified_v2 import fold_5_rgb as tbx11kv2
-    elif protocol == "fold_6_rgb":
-        from ..indian import fold_6_rgb as indian
-        from ..montgomery import fold_6_rgb as mc
-        from ..shenzhen import fold_6_rgb as ch
-        from ..tbx11k_simplified_v2 import fold_6_rgb as tbx11kv2
-    elif protocol == "fold_7_rgb":
-        from ..indian import fold_7_rgb as indian
-        from ..montgomery import fold_7_rgb as mc
-        from ..shenzhen import fold_7_rgb as ch
-        from ..tbx11k_simplified_v2 import fold_7_rgb as tbx11kv2
-    elif protocol == "fold_8_rgb":
-        from ..indian import fold_8_rgb as indian
-        from ..montgomery import fold_8_rgb as mc
-        from ..shenzhen import fold_8_rgb as ch
-        from ..tbx11k_simplified_v2 import fold_8_rgb as tbx11kv2
-    elif protocol == "fold_9_rgb":
-        from ..indian import fold_9_rgb as indian
-        from ..montgomery import fold_9_rgb as mc
-        from ..shenzhen import fold_9_rgb as ch
-        from ..tbx11k_simplified_v2 import fold_9_rgb as tbx11kv2
-
-    mc = mc.dataset
-    ch = ch.dataset
-    indian = indian.dataset
-    tbx11kv2 = tbx11kv2.dataset
-
-    dataset = {}
-    dataset["__train__"] = ConcatDataset(
-        [
-            mc["__train__"],
-            ch["__train__"],
-            indian["__train__"],
-            tbx11kv2["__train__"],
-        ]
-    )
-    dataset["train"] = ConcatDataset(
-        [mc["train"], ch["train"], indian["train"], tbx11kv2["train"]]
-    )
-    dataset["__valid__"] = ConcatDataset(
-        [
-            mc["__valid__"],
-            ch["__valid__"],
-            indian["__valid__"],
-            tbx11kv2["__valid__"],
-        ]
-    )
-    dataset["validation"] = ConcatDataset(
-        [
-            mc["validation"],
-            ch["validation"],
-            indian["validation"],
-            tbx11kv2["validation"],
-        ]
-    )
-    dataset["test"] = ConcatDataset(
-        [mc["test"], ch["test"], indian["test"], tbx11kv2["test"]]
-    )
-
-    return dataset

src/ptbench/configs/datasets/mc_ch_in_11kv2/default.py

-# SPDX-FileCopyrightText: Copyright © 2023 Idiap Research Institute <contact@idiap.ch>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default
-TBX11K-simplified datasets."""
-
-from . import _maker
-
-dataset = _maker("default")

src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_0.py

-# SPDX-FileCopyrightText: Copyright © 2023 Idiap Research Institute <contact@idiap.ch>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default
-TBX11K-simplified datasets (cross validation fold 0)"""
-
-from . import _maker
-
-dataset = _maker("fold_0")

src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_0_rgb.py

-# SPDX-FileCopyrightText: Copyright © 2023 Idiap Research Institute <contact@idiap.ch>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default
-TBX11K-simplified datasets (cross validation fold 0, RGB)"""
-
-from . import _maker
-
-dataset = _maker("fold_0_rgb")

src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_1.py

-# SPDX-FileCopyrightText: Copyright © 2023 Idiap Research Institute <contact@idiap.ch>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default
-TBX11K-simplified datasets (cross validation fold 1)"""
-
-from . import _maker
-
-dataset = _maker("fold_1")

src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_1_rgb.py

-# SPDX-FileCopyrightText: Copyright © 2023 Idiap Research Institute <contact@idiap.ch>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default
-TBX11K-simplified datasets (cross validation fold 1, RGB)"""
-
-from . import _maker
-
-dataset = _maker("fold_1_rgb")

src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_2.py

-# SPDX-FileCopyrightText: Copyright © 2023 Idiap Research Institute <contact@idiap.ch>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default
-TBX11K-simplified datasets (cross validation fold 2)"""
-
-from . import _maker
-
-dataset = _maker("fold_2")

src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_2_rgb.py

-# SPDX-FileCopyrightText: Copyright © 2023 Idiap Research Institute <contact@idiap.ch>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default
-TBX11K-simplified datasets (cross validation fold 2, RGB)"""
-
-from . import _maker
-
-dataset = _maker("fold_2_rgb")

src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_3.py

-# SPDX-FileCopyrightText: Copyright © 2023 Idiap Research Institute <contact@idiap.ch>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default
-TBX11K-simplified datasets (cross validation fold 3)"""
-
-from . import _maker
-
-dataset = _maker("fold_3")

src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_3_rgb.py

-# SPDX-FileCopyrightText: Copyright © 2023 Idiap Research Institute <contact@idiap.ch>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default
-TBX11K-simplified datasets (cross validation fold 3, RGB)"""
-
-from . import _maker
-
-dataset = _maker("fold_3_rgb")

src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_4.py

-# SPDX-FileCopyrightText: Copyright © 2023 Idiap Research Institute <contact@idiap.ch>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default
-TBX11K-simplified datasets (cross validation fold 4)"""
-
-from . import _maker
-
-dataset = _maker("fold_4")

src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_4_rgb.py

-# SPDX-FileCopyrightText: Copyright © 2023 Idiap Research Institute <contact@idiap.ch>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default
-TBX11K-simplified datasets (cross validation fold 4, RGB)"""
-
-from . import _maker
-
-dataset = _maker("fold_4_rgb")

src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_5.py

-# SPDX-FileCopyrightText: Copyright © 2023 Idiap Research Institute <contact@idiap.ch>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default
-TBX11K-simplified datasets (cross validation fold 5)"""
-
-from . import _maker
-
-dataset = _maker("fold_5")

src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_5_rgb.py

-# SPDX-FileCopyrightText: Copyright © 2023 Idiap Research Institute <contact@idiap.ch>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default
-TBX11K-simplified datasets (cross validation fold 5, RGB)"""
-
-from . import _maker
-
-dataset = _maker("fold_5_rgb")

src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_6.py

-# SPDX-FileCopyrightText: Copyright © 2023 Idiap Research Institute <contact@idiap.ch>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default
-TBX11K-simplified datasets (cross validation fold 6)"""
-
-from . import _maker
-
-dataset = _maker("fold_6")

src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_6_rgb.py

-# SPDX-FileCopyrightText: Copyright © 2023 Idiap Research Institute <contact@idiap.ch>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default
-TBX11K-simplified datasets (cross validation fold 6, RGB)"""
-
-from . import _maker
-
-dataset = _maker("fold_6_rgb")

src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_7.py

-# SPDX-FileCopyrightText: Copyright © 2023 Idiap Research Institute <contact@idiap.ch>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default
-TBX11K-simplified datasets (cross validation fold 7)"""
-
-from . import _maker
-
-dataset = _maker("fold_7")

src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_7_rgb.py

-# SPDX-FileCopyrightText: Copyright © 2023 Idiap Research Institute <contact@idiap.ch>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default
-TBX11K-simplified datasets (cross validation fold 7, RGB)"""
-
-from . import _maker
-
-dataset = _maker("fold_7_rgb")

src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_8.py

-# SPDX-FileCopyrightText: Copyright © 2023 Idiap Research Institute <contact@idiap.ch>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default
-TBX11K-simplified datasets (cross validation fold 8)"""
-
-from . import _maker
-
-dataset = _maker("fold_8")