diff --git a/pyproject.toml b/pyproject.toml index 884c48b90109c7ff2d4607b2b82fe9f60e373588..e50084faff80d22bcf10abce7399d90eb9e2206d 100644 --- a/pyproject.toml +++ b/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 diff --git a/src/ptbench/configs/datasets/nih_cxr14_re/cardiomegaly_idiap.py b/src/ptbench/configs/datasets/nih_cxr14_re/cardiomegaly.py similarity index 75% rename from src/ptbench/configs/datasets/nih_cxr14_re/cardiomegaly_idiap.py rename to src/ptbench/configs/datasets/nih_cxr14_re/cardiomegaly.py index 903c767dc31ffffa77796c9db7ae39e055485efc..0a63a6fd7b00888d323b2fc6a8f68bfcd0a69f83 100644 --- a/src/ptbench/configs/datasets/nih_cxr14_re/cardiomegaly_idiap.py +++ b/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") diff --git a/src/ptbench/configs/datasets/nih_cxr14_re/idiap.py b/src/ptbench/configs/datasets/nih_cxr14_re/idiap.py deleted file mode 100644 index 6a509d9ea8791d852cc4c46742ba9da8c99068a6..0000000000000000000000000000000000000000 --- a/src/ptbench/configs/datasets/nih_cxr14_re/idiap.py +++ /dev/null @@ -1,14 +0,0 @@ -# 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") diff --git a/src/ptbench/data/nih_cxr14_re/__init__.py b/src/ptbench/data/nih_cxr14_re/__init__.py index a92b420998611466f38c6c32b13b52ab0c4b2fef..5cefea42af0e86de42991e90d90908f8756437ea 100644 --- a/src/ptbench/data/nih_cxr14_re/__init__.py +++ b/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)) diff --git a/src/ptbench/data/nih_cxr14_re/cardiomegaly.json.bz2 b/src/ptbench/data/nih_cxr14_re/cardiomegaly.json.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..13b6d810cd7bb430b332476e363970a5a728fa3e Binary files /dev/null and b/src/ptbench/data/nih_cxr14_re/cardiomegaly.json.bz2 differ diff --git a/src/ptbench/data/nih_cxr14_re/cardiomegaly_idiap.json.bz2 b/src/ptbench/data/nih_cxr14_re/cardiomegaly_idiap.json.bz2 deleted file mode 100644 index d04d80a46ffb4d83c7d83e4f6af03bae32bb86ff..0000000000000000000000000000000000000000 Binary files a/src/ptbench/data/nih_cxr14_re/cardiomegaly_idiap.json.bz2 and /dev/null differ diff --git a/src/ptbench/data/nih_cxr14_re/idiap.json.bz2 b/src/ptbench/data/nih_cxr14_re/idiap.json.bz2 deleted file mode 100644 index 1b0c2a2b7ee6b620111b681da043f5c8ee1239d5..0000000000000000000000000000000000000000 Binary files a/src/ptbench/data/nih_cxr14_re/idiap.json.bz2 and /dev/null differ