[data] Remove special idiap protocol and use config option instead

pyproject.toml

@@ -330,8 +330,7 @@ mc_ch_in_pc_rgb = "ptbench.configs.datasets.mc_ch_in_pc.rgb"
 mc_ch_in_pc_rs = "ptbench.configs.datasets.mc_ch_in_pc_RS.default"
 # NIH CXR14 (relabeled)
 nih_cxr14 = "ptbench.configs.datasets.nih_cxr14_re.default"
-nih_cxr14_idiap = "ptbench.configs.datasets.nih_cxr14_re.idiap"
-nih_cxr14_cm_idiap = "ptbench.configs.datasets.nih_cxr14_re.cardiomegaly_idiap"
+nih_cxr14_cm = "ptbench.configs.datasets.nih_cxr14_re.cardiomegaly"
 # NIH CXR14 / PadChest aggregated dataset
 nih_cxr14_pc_idiap = "ptbench.configs.datasets.nih_cxr14_re_pc.idiap"
 # PadChest

src/ptbench/configs/datasets/nih_cxr14_re/cardiomegaly_idiap.py → src/ptbench/configs/datasets/nih_cxr14_re/cardiomegaly.py

@@ -2,9 +2,10 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-"""NIH CXR14 (relabeled, idiap protocol) dataset for computer-aided diagnosis.
+"""NIH CXR14 dataset for computer-aided diagnosis.
 
 First 40 images with cardiomegaly.
+
 * See :py:mod:`ptbench.data.nih_cxr14_re` for split details
 * This configuration resolution: 512 x 512 (default)
 * See :py:mod:`ptbench.data.nih_cxr14_re` for dataset details
@@ -12,4 +13,4 @@ First 40 images with cardiomegaly.
 
 from . import _maker
 
-dataset = _maker("cardiomegaly_idiap")
+dataset = _maker("cardiomegaly")

src/ptbench/configs/datasets/nih_cxr14_re/idiap.py

-# SPDX-FileCopyrightText: Copyright © 2023 Idiap Research Institute <contact@idiap.ch>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-"""NIH CXR14 (relabeled, idiap protocol) dataset for computer-aided diagnosis.
-
-* See :py:mod:`ptbench.data.nih_cxr14_re` for split details
-* This configuration resolution: 512 x 512 (default)
-* See :py:mod:`ptbench.data.nih_cxr14_re` for dataset details
-"""
-
-from . import _maker
-
-dataset = _maker("idiap")

src/ptbench/data/nih_cxr14_re/__init__.py

@@ -35,8 +35,7 @@ from ..loader import load_pil_rgb, make_delayed
 
 _protocols = [
     importlib.resources.files(__name__).joinpath("default.json.bz2"),
-    importlib.resources.files(__name__).joinpath("idiap.json.bz2"),
-    importlib.resources.files(__name__).joinpath("cardiomegaly_idiap.json.bz2"),
+    importlib.resources.files(__name__).joinpath("cardiomegaly.json.bz2"),
 ]
 
 _root_path = load_rc().get("datadir.nih_cxr14_re", os.path.realpath(os.curdir))