diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k/__init__.py b/src/ptbench/configs/datasets/mc_ch_in_11k/__init__.py index df4ac6bb453bc5c2da648e44b9fa4e7dc290ea55..e8970bd744280c9fb07f6f09d5b4b844a9f57993 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k/__init__.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k/__init__.py @@ -124,17 +124,34 @@ def _maker(protocol): dataset = {} dataset["__train__"] = ConcatDataset( - [mc["__train__"], ch["__train__"], indian["__train__"], tbx11k["__train__"]] + [ + mc["__train__"], + ch["__train__"], + indian["__train__"], + tbx11k["__train__"], + ] ) dataset["train"] = ConcatDataset( [mc["train"], ch["train"], indian["train"], tbx11k["train"]] ) dataset["__valid__"] = ConcatDataset( - [mc["__valid__"], ch["__valid__"], indian["__valid__"], tbx11k["__valid__"]] + [ + mc["__valid__"], + ch["__valid__"], + indian["__valid__"], + tbx11k["__valid__"], + ] ) dataset["validation"] = ConcatDataset( - [mc["validation"], ch["validation"], indian["validation"], tbx11k["validation"]] + [ + mc["validation"], + ch["validation"], + indian["validation"], + tbx11k["validation"], + ] + ) + dataset["test"] = ConcatDataset( + [mc["test"], ch["test"], indian["test"], tbx11k["test"]] ) - dataset["test"] = ConcatDataset([mc["test"], ch["test"], indian["test"], tbx11k["test"]]) return dataset diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k/default.py b/src/ptbench/configs/datasets/mc_ch_in_11k/default.py index 224d3acabe7597385b3bdd86195e55aeddbf0610..7d4f16bda48b05e7e9302ffc9c689d8393b3e495 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k/default.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k/default.py @@ -2,8 +2,8 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and -the default TBX11K-simplified datasets.""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets.""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_0.py b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_0.py index eeb11f2c7d114b7a2c2020a0ab23df3efdd38a75..757a0eb98214ba020d76095363d424b9209540e7 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_0.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_0.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 0)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_0_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_0_rgb.py index d65df7b5be88653ed816136d2370e4eb197fd8d0..48e05ff3f71f13976190d04cfaf59c5c36996bac 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_0_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_0_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 0, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_1.py b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_1.py index 6cb3cf8101aaabb31d09b47e34a29e4f830d79b8..5657958934b926879bd26503c9b383e775bc724d 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_1.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_1.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 1)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_1_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_1_rgb.py index 548fdbf2668e1201ab2a16249ed94e29960a1fd6..c782d68de247c876ddd6826100cbb7908342b928 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_1_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_1_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 1, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_2.py b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_2.py index 474c3f15129ea0c7ce0d1f10b77d6d1a137917cb..10a597bcb8e0485db63f0d7500b15b3e78877066 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_2.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_2.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 2)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_2_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_2_rgb.py index c303c093275f14818095c35eebb68eabd7c495d3..d624f3af53abcf053c7bf17a9822a86cb53e2923 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_2_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_2_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 2, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_3.py b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_3.py index b2b4d9ce0fa9353c2c38be10592a653439eb8f9e..39bee4fec99e81eecc22a365183283bcd2ec3d98 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_3.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_3.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 3)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_3_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_3_rgb.py index 4c7f0865190bdc8038bd3518acc02e82f8525889..7b26e4257e61013843e3a62c3bc419003e23b645 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_3_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_3_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 3, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_4.py b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_4.py index bc39e7a36e06d1bda4b4d88f524923c04bcd3717..5fb56292fd97636f452cde06c87bb34c89f01b1c 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_4.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_4.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 4)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_4_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_4_rgb.py index cf86e9416ae363554eb6753a2384691f812e0020..fbc4f0cfd9edc602fbe5665aca0465b29c5183b5 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_4_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_4_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 4, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_5.py b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_5.py index 1ca82222c81d3fdfff1d1144f0530efab171213f..679bb9b3cbbdede06cd87834239609720f439296 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_5.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_5.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 5)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_5_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_5_rgb.py index d28210151b9f46905f68d55fbf6991cd79099eab..747d510ecd1c7bd2f32ab7b139a53603d5bbee88 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_5_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_5_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 5, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_6.py b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_6.py index d40c95f64dc0ca6b0522d849bff6dbf82eb561f7..cd8e4cd571b8c796bad3221584870888c5186d3d 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_6.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_6.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 6)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_6_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_6_rgb.py index 42c0b193dbade22ad2fa104587a42c6ab2fb8ec2..86f112c3aae0c1c1dd48002347f78ce565797d47 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_6_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_6_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 6, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_7.py b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_7.py index 2b3d9b44ef872ae031e34b35ebffedadfbedb736..98241531d3e15720f07ef9174687c47db7d737f1 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_7.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_7.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 7)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_7_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_7_rgb.py index c32c4b258ceffefa1841f09d5b7640e3a7f06eff..981fe19180e0d8d4e1b21653f52a92a567723a63 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_7_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_7_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 7, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_8.py b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_8.py index 2ccfbafe36a4e6c73b6a4639d1602b1663ef4e70..dab1a234a3842ab450706d86060651d4383ddbfc 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_8.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_8.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 8)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_8_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_8_rgb.py index c1dfad049dd31cc2367ac0017ca465b14d7b3b77..798b8de64761ef0d87f491ef08b43426f55898f2 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_8_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_8_rgb.py @@ -2,8 +2,8 @@ # # 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, RGB)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 8, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_9.py b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_9.py index 07068cb8662f3bcb4098827e948d21b563cdc74e..097724b9446c4c2f0bef8ee6f838c1c11ff627a5 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_9.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_9.py @@ -2,8 +2,8 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and -the default TBX11K-simplified datasets (cross validation fold 9)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 9)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_9_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_9_rgb.py index fba36c4b9efd3629f5f0ce4bc9e684324d549cd0..c6c564a40b957b562a37bb30b5809f7cf680e896 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k/fold_9_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k/fold_9_rgb.py @@ -2,8 +2,8 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and -the default TBX11K-simplified datasets (cross validation fold 9, RGB)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 9, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k/rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11k/rgb.py index 656a8c0ff0337da1a2037a6cb00db0c0f4fdbe64..f47796a89c31a5a31c0f972d81b5d97c7f8742b4 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k/rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k/rgb.py @@ -2,8 +2,8 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and -the default TBX11K-simplified datasets (RGB)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/__init__.py b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/__init__.py index 3a0c447890cd30d1a7a5a3c0f5582366103a8a51..7fa4f30799fd886ca7f792acb51d77870bede69c 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/__init__.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/__init__.py @@ -124,17 +124,34 @@ def _maker(protocol): dataset = {} dataset["__train__"] = ConcatDataset( - [mc["__train__"], ch["__train__"], indian["__train__"], tbx11k["__train__"]] + [ + mc["__train__"], + ch["__train__"], + indian["__train__"], + tbx11k["__train__"], + ] ) dataset["train"] = ConcatDataset( [mc["train"], ch["train"], indian["train"], tbx11k["train"]] ) dataset["__valid__"] = ConcatDataset( - [mc["__valid__"], ch["__valid__"], indian["__valid__"], tbx11k["__valid__"]] + [ + mc["__valid__"], + ch["__valid__"], + indian["__valid__"], + tbx11k["__valid__"], + ] ) dataset["validation"] = ConcatDataset( - [mc["validation"], ch["validation"], indian["validation"], tbx11k["validation"]] + [ + mc["validation"], + ch["validation"], + indian["validation"], + tbx11k["validation"], + ] + ) + dataset["test"] = ConcatDataset( + [mc["test"], ch["test"], indian["test"], tbx11k["test"]] ) - dataset["test"] = ConcatDataset([mc["test"], ch["test"], indian["test"], tbx11k["test"]]) return dataset diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/default.py b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/default.py index 224d3acabe7597385b3bdd86195e55aeddbf0610..7d4f16bda48b05e7e9302ffc9c689d8393b3e495 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/default.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/default.py @@ -2,8 +2,8 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and -the default TBX11K-simplified datasets.""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets.""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_0.py b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_0.py index eeb11f2c7d114b7a2c2020a0ab23df3efdd38a75..757a0eb98214ba020d76095363d424b9209540e7 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_0.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_0.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 0)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_0_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_0_rgb.py index d65df7b5be88653ed816136d2370e4eb197fd8d0..48e05ff3f71f13976190d04cfaf59c5c36996bac 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_0_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_0_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 0, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_1.py b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_1.py index 6cb3cf8101aaabb31d09b47e34a29e4f830d79b8..5657958934b926879bd26503c9b383e775bc724d 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_1.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_1.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 1)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_1_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_1_rgb.py index 548fdbf2668e1201ab2a16249ed94e29960a1fd6..c782d68de247c876ddd6826100cbb7908342b928 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_1_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_1_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 1, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_2.py b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_2.py index 474c3f15129ea0c7ce0d1f10b77d6d1a137917cb..10a597bcb8e0485db63f0d7500b15b3e78877066 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_2.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_2.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 2)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_2_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_2_rgb.py index c303c093275f14818095c35eebb68eabd7c495d3..d624f3af53abcf053c7bf17a9822a86cb53e2923 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_2_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_2_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 2, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_3.py b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_3.py index b2b4d9ce0fa9353c2c38be10592a653439eb8f9e..39bee4fec99e81eecc22a365183283bcd2ec3d98 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_3.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_3.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 3)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_3_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_3_rgb.py index 4c7f0865190bdc8038bd3518acc02e82f8525889..7b26e4257e61013843e3a62c3bc419003e23b645 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_3_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_3_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 3, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_4.py b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_4.py index bc39e7a36e06d1bda4b4d88f524923c04bcd3717..5fb56292fd97636f452cde06c87bb34c89f01b1c 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_4.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_4.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 4)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_4_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_4_rgb.py index cf86e9416ae363554eb6753a2384691f812e0020..fbc4f0cfd9edc602fbe5665aca0465b29c5183b5 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_4_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_4_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 4, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_5.py b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_5.py index 1ca82222c81d3fdfff1d1144f0530efab171213f..679bb9b3cbbdede06cd87834239609720f439296 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_5.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_5.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 5)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_5_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_5_rgb.py index d28210151b9f46905f68d55fbf6991cd79099eab..747d510ecd1c7bd2f32ab7b139a53603d5bbee88 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_5_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_5_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 5, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_6.py b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_6.py index d40c95f64dc0ca6b0522d849bff6dbf82eb561f7..cd8e4cd571b8c796bad3221584870888c5186d3d 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_6.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_6.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 6)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_6_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_6_rgb.py index 42c0b193dbade22ad2fa104587a42c6ab2fb8ec2..86f112c3aae0c1c1dd48002347f78ce565797d47 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_6_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_6_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 6, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_7.py b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_7.py index 2b3d9b44ef872ae031e34b35ebffedadfbedb736..98241531d3e15720f07ef9174687c47db7d737f1 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_7.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_7.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 7)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_7_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_7_rgb.py index c32c4b258ceffefa1841f09d5b7640e3a7f06eff..981fe19180e0d8d4e1b21653f52a92a567723a63 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_7_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_7_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 7, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_8.py b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_8.py index 2ccfbafe36a4e6c73b6a4639d1602b1663ef4e70..dab1a234a3842ab450706d86060651d4383ddbfc 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_8.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_8.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 8)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_8_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_8_rgb.py index c1dfad049dd31cc2367ac0017ca465b14d7b3b77..798b8de64761ef0d87f491ef08b43426f55898f2 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_8_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_8_rgb.py @@ -2,8 +2,8 @@ # # 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, RGB)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 8, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_9.py b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_9.py index 07068cb8662f3bcb4098827e948d21b563cdc74e..097724b9446c4c2f0bef8ee6f838c1c11ff627a5 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_9.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_9.py @@ -2,8 +2,8 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and -the default TBX11K-simplified datasets (cross validation fold 9)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 9)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_9_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_9_rgb.py index fba36c4b9efd3629f5f0ce4bc9e684324d549cd0..c6c564a40b957b562a37bb30b5809f7cf680e896 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_9_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/fold_9_rgb.py @@ -2,8 +2,8 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and -the default TBX11K-simplified datasets (cross validation fold 9, RGB)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 9, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/rgb.py index 656a8c0ff0337da1a2037a6cb00db0c0f4fdbe64..f47796a89c31a5a31c0f972d81b5d97c7f8742b4 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11k_RS/rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11k_RS/rgb.py @@ -2,8 +2,8 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and -the default TBX11K-simplified datasets (RGB)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2/__init__.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2/__init__.py index 0789abe72d5bc5d4dd2773bdd4cf3e93ca6a9e01..c36f7f60c8d1111baa7f3559c419e134b7ece62f 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2/__init__.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2/__init__.py @@ -124,17 +124,34 @@ def _maker(protocol): dataset = {} dataset["__train__"] = ConcatDataset( - [mc["__train__"], ch["__train__"], indian["__train__"], tbx11kv2["__train__"]] + [ + 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__"]] + [ + mc["__valid__"], + ch["__valid__"], + indian["__valid__"], + tbx11kv2["__valid__"], + ] ) dataset["validation"] = ConcatDataset( - [mc["validation"], ch["validation"], indian["validation"], tbx11kv2["validation"]] + [ + mc["validation"], + ch["validation"], + indian["validation"], + tbx11kv2["validation"], + ] + ) + dataset["test"] = ConcatDataset( + [mc["test"], ch["test"], indian["test"], tbx11kv2["test"]] ) - dataset["test"] = ConcatDataset([mc["test"], ch["test"], indian["test"], tbx11kv2["test"]]) return dataset diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2/default.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2/default.py index 224d3acabe7597385b3bdd86195e55aeddbf0610..7d4f16bda48b05e7e9302ffc9c689d8393b3e495 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2/default.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2/default.py @@ -2,8 +2,8 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and -the default TBX11K-simplified datasets.""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets.""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_0.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_0.py index eeb11f2c7d114b7a2c2020a0ab23df3efdd38a75..757a0eb98214ba020d76095363d424b9209540e7 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_0.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_0.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 0)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_0_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_0_rgb.py index d65df7b5be88653ed816136d2370e4eb197fd8d0..48e05ff3f71f13976190d04cfaf59c5c36996bac 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_0_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_0_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 0, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_1.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_1.py index 6cb3cf8101aaabb31d09b47e34a29e4f830d79b8..5657958934b926879bd26503c9b383e775bc724d 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_1.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_1.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 1)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_1_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_1_rgb.py index 548fdbf2668e1201ab2a16249ed94e29960a1fd6..c782d68de247c876ddd6826100cbb7908342b928 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_1_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_1_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 1, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_2.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_2.py index 474c3f15129ea0c7ce0d1f10b77d6d1a137917cb..10a597bcb8e0485db63f0d7500b15b3e78877066 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_2.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_2.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 2)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_2_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_2_rgb.py index c303c093275f14818095c35eebb68eabd7c495d3..d624f3af53abcf053c7bf17a9822a86cb53e2923 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_2_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_2_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 2, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_3.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_3.py index b2b4d9ce0fa9353c2c38be10592a653439eb8f9e..39bee4fec99e81eecc22a365183283bcd2ec3d98 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_3.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_3.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 3)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_3_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_3_rgb.py index 4c7f0865190bdc8038bd3518acc02e82f8525889..7b26e4257e61013843e3a62c3bc419003e23b645 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_3_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_3_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 3, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_4.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_4.py index bc39e7a36e06d1bda4b4d88f524923c04bcd3717..5fb56292fd97636f452cde06c87bb34c89f01b1c 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_4.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_4.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 4)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_4_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_4_rgb.py index cf86e9416ae363554eb6753a2384691f812e0020..fbc4f0cfd9edc602fbe5665aca0465b29c5183b5 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_4_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_4_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 4, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_5.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_5.py index 1ca82222c81d3fdfff1d1144f0530efab171213f..679bb9b3cbbdede06cd87834239609720f439296 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_5.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_5.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 5)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_5_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_5_rgb.py index d28210151b9f46905f68d55fbf6991cd79099eab..747d510ecd1c7bd2f32ab7b139a53603d5bbee88 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_5_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_5_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 5, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_6.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_6.py index d40c95f64dc0ca6b0522d849bff6dbf82eb561f7..cd8e4cd571b8c796bad3221584870888c5186d3d 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_6.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_6.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 6)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_6_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_6_rgb.py index 42c0b193dbade22ad2fa104587a42c6ab2fb8ec2..86f112c3aae0c1c1dd48002347f78ce565797d47 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_6_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_6_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 6, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_7.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_7.py index 2b3d9b44ef872ae031e34b35ebffedadfbedb736..98241531d3e15720f07ef9174687c47db7d737f1 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_7.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_7.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 7)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_7_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_7_rgb.py index c32c4b258ceffefa1841f09d5b7640e3a7f06eff..981fe19180e0d8d4e1b21653f52a92a567723a63 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_7_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_7_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 7, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_8.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_8.py index 2ccfbafe36a4e6c73b6a4639d1602b1663ef4e70..dab1a234a3842ab450706d86060651d4383ddbfc 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_8.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_8.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 8)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_8_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_8_rgb.py index c1dfad049dd31cc2367ac0017ca465b14d7b3b77..798b8de64761ef0d87f491ef08b43426f55898f2 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_8_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_8_rgb.py @@ -2,8 +2,8 @@ # # 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, RGB)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 8, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_9.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_9.py index 07068cb8662f3bcb4098827e948d21b563cdc74e..097724b9446c4c2f0bef8ee6f838c1c11ff627a5 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_9.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_9.py @@ -2,8 +2,8 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and -the default TBX11K-simplified datasets (cross validation fold 9)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 9)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_9_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_9_rgb.py index fba36c4b9efd3629f5f0ce4bc9e684324d549cd0..c6c564a40b957b562a37bb30b5809f7cf680e896 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_9_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2/fold_9_rgb.py @@ -2,8 +2,8 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and -the default TBX11K-simplified datasets (cross validation fold 9, RGB)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 9, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2/rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2/rgb.py index 656a8c0ff0337da1a2037a6cb00db0c0f4fdbe64..f47796a89c31a5a31c0f972d81b5d97c7f8742b4 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2/rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2/rgb.py @@ -2,8 +2,8 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and -the default TBX11K-simplified datasets (RGB)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/__init__.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/__init__.py index 06725740978efa4f64f583e755cf66e6f12924fd..5e4b82769c73b5b89c8841990b33c7acc2014fed 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/__init__.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/__init__.py @@ -124,17 +124,34 @@ def _maker(protocol): dataset = {} dataset["__train__"] = ConcatDataset( - [mc["__train__"], ch["__train__"], indian["__train__"], tbx11kv2["__train__"]] + [ + 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__"]] + [ + mc["__valid__"], + ch["__valid__"], + indian["__valid__"], + tbx11kv2["__valid__"], + ] ) dataset["validation"] = ConcatDataset( - [mc["validation"], ch["validation"], indian["validation"], tbx11kv2["validation"]] + [ + mc["validation"], + ch["validation"], + indian["validation"], + tbx11kv2["validation"], + ] + ) + dataset["test"] = ConcatDataset( + [mc["test"], ch["test"], indian["test"], tbx11kv2["test"]] ) - dataset["test"] = ConcatDataset([mc["test"], ch["test"], indian["test"], tbx11kv2["test"]]) return dataset diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/default.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/default.py index 224d3acabe7597385b3bdd86195e55aeddbf0610..7d4f16bda48b05e7e9302ffc9c689d8393b3e495 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/default.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/default.py @@ -2,8 +2,8 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and -the default TBX11K-simplified datasets.""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets.""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_0.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_0.py index eeb11f2c7d114b7a2c2020a0ab23df3efdd38a75..757a0eb98214ba020d76095363d424b9209540e7 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_0.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_0.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 0)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_0_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_0_rgb.py index d65df7b5be88653ed816136d2370e4eb197fd8d0..48e05ff3f71f13976190d04cfaf59c5c36996bac 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_0_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_0_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 0, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_1.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_1.py index 6cb3cf8101aaabb31d09b47e34a29e4f830d79b8..5657958934b926879bd26503c9b383e775bc724d 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_1.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_1.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 1)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_1_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_1_rgb.py index 548fdbf2668e1201ab2a16249ed94e29960a1fd6..c782d68de247c876ddd6826100cbb7908342b928 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_1_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_1_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 1, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_2.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_2.py index 474c3f15129ea0c7ce0d1f10b77d6d1a137917cb..10a597bcb8e0485db63f0d7500b15b3e78877066 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_2.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_2.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 2)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_2_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_2_rgb.py index c303c093275f14818095c35eebb68eabd7c495d3..d624f3af53abcf053c7bf17a9822a86cb53e2923 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_2_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_2_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 2, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_3.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_3.py index b2b4d9ce0fa9353c2c38be10592a653439eb8f9e..39bee4fec99e81eecc22a365183283bcd2ec3d98 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_3.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_3.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 3)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_3_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_3_rgb.py index 4c7f0865190bdc8038bd3518acc02e82f8525889..7b26e4257e61013843e3a62c3bc419003e23b645 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_3_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_3_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 3, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_4.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_4.py index bc39e7a36e06d1bda4b4d88f524923c04bcd3717..5fb56292fd97636f452cde06c87bb34c89f01b1c 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_4.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_4.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 4)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_4_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_4_rgb.py index cf86e9416ae363554eb6753a2384691f812e0020..fbc4f0cfd9edc602fbe5665aca0465b29c5183b5 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_4_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_4_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 4, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_5.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_5.py index 1ca82222c81d3fdfff1d1144f0530efab171213f..679bb9b3cbbdede06cd87834239609720f439296 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_5.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_5.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 5)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_5_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_5_rgb.py index d28210151b9f46905f68d55fbf6991cd79099eab..747d510ecd1c7bd2f32ab7b139a53603d5bbee88 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_5_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_5_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 5, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_6.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_6.py index d40c95f64dc0ca6b0522d849bff6dbf82eb561f7..cd8e4cd571b8c796bad3221584870888c5186d3d 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_6.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_6.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 6)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_6_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_6_rgb.py index 42c0b193dbade22ad2fa104587a42c6ab2fb8ec2..86f112c3aae0c1c1dd48002347f78ce565797d47 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_6_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_6_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 6, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_7.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_7.py index 2b3d9b44ef872ae031e34b35ebffedadfbedb736..98241531d3e15720f07ef9174687c47db7d737f1 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_7.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_7.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 7)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_7_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_7_rgb.py index c32c4b258ceffefa1841f09d5b7640e3a7f06eff..981fe19180e0d8d4e1b21653f52a92a567723a63 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_7_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_7_rgb.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 7, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_8.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_8.py index 2ccfbafe36a4e6c73b6a4639d1602b1663ef4e70..dab1a234a3842ab450706d86060651d4383ddbfc 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_8.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_8.py @@ -2,8 +2,8 @@ # # 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)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 8)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_8_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_8_rgb.py index c1dfad049dd31cc2367ac0017ca465b14d7b3b77..798b8de64761ef0d87f491ef08b43426f55898f2 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_8_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_8_rgb.py @@ -2,8 +2,8 @@ # # 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, RGB)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 8, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_9.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_9.py index 07068cb8662f3bcb4098827e948d21b563cdc74e..097724b9446c4c2f0bef8ee6f838c1c11ff627a5 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_9.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_9.py @@ -2,8 +2,8 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and -the default TBX11K-simplified datasets (cross validation fold 9)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 9)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_9_rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_9_rgb.py index fba36c4b9efd3629f5f0ce4bc9e684324d549cd0..c6c564a40b957b562a37bb30b5809f7cf680e896 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_9_rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/fold_9_rgb.py @@ -2,8 +2,8 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and -the default TBX11K-simplified datasets (cross validation fold 9, RGB)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (cross validation fold 9, RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/rgb.py b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/rgb.py index 656a8c0ff0337da1a2037a6cb00db0c0f4fdbe64..f47796a89c31a5a31c0f972d81b5d97c7f8742b4 100644 --- a/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/rgb.py +++ b/src/ptbench/configs/datasets/mc_ch_in_11kv2_RS/rgb.py @@ -2,8 +2,8 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and -the default TBX11K-simplified datasets (RGB)""" +"""Aggregated dataset composed of Montgomery, Shenzhen, Indian and the default +TBX11K-simplified datasets (RGB)""" from . import _maker diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v2/rgb.py b/src/ptbench/configs/datasets/tbx11k_simplified_v2/rgb.py index 1af86d940eb0c89639abacf5379f0374431c93cf..9614b847162f30a91083c12c9b736cc0a0b21126 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v2/rgb.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v2/rgb.py @@ -2,7 +2,8 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -"""TBX11k simplified dataset for TB detection (default protocol, converted in RGB) +"""TBX11k simplified dataset for TB detection (default protocol, converted in +RGB) * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3/default.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3/default.py index 7208fc7d89144fe610fe4084fc04af25e4880043..3805a14219167fbcc1cd0becfa28d592c422813d 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3/default.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3/default.py @@ -6,7 +6,7 @@ * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_0.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_0.py index 20c7316f0a8a71864e10f9c5bcc99bb2eab32795..bed7342dd6f28a83ca3c5a4e7984551a153344d7 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_0.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_0.py @@ -6,7 +6,7 @@ * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_0_rgb.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_0_rgb.py index ce57f3bc6c965074283372cc625771810edced67..ed2f6d174d87521d3fe2ad12e211e0e32bab68e2 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_0_rgb.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_0_rgb.py @@ -6,7 +6,7 @@ * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_1.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_1.py index 4d3c1961cb323f47d8422fb2b1b1183140208022..92cc9ce31f3f296a52d9ba51eae87d39740cb160 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_1.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_1.py @@ -6,7 +6,7 @@ * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_1_rgb.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_1_rgb.py index 227af63411e06c4a55231742a1dc8b42d227a042..9380ec5b3910f463fea0cab48ea3cdb738647302 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_1_rgb.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_1_rgb.py @@ -6,7 +6,7 @@ * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_2.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_2.py index bc8088a01469bca888bc3b3a4ec5a94a42e33851..460c96df367fa982dad4dca111c41ad5118f11f1 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_2.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_2.py @@ -6,7 +6,7 @@ * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_2_rgb.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_2_rgb.py index 1ee2b3304a9dd4d2b025872f6a5d59a367e67be7..69641e3acc24e1de79b09832eb7b8340879cfc4a 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_2_rgb.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_2_rgb.py @@ -6,7 +6,7 @@ * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_3.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_3.py index 3fba1cda757a7d84f16b9b6b69c072fa59fef2b6..c799c7cb54044be807bc3cc615658c39ca47667c 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_3.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_3.py @@ -6,7 +6,7 @@ * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_3_rgb.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_3_rgb.py index 75ac8cd374c11becbee1a3cb44321b7b64cd79e8..816eeca4c7eeae7ffc30bd58c6f527aec999b179 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_3_rgb.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_3_rgb.py @@ -6,7 +6,7 @@ * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_4.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_4.py index d5917fefec6682c5d10066fa9a75fef9afd6a899..acceda91f4caa5773b5f0b478bfc5c1e9e4dc1d8 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_4.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_4.py @@ -6,7 +6,7 @@ * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_4_rgb.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_4_rgb.py index 130539f97a62a0bd94b5ae4895578d2b589e26fb..07811e9c185f2c8165cc0e156dce5bb3292656c1 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_4_rgb.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_4_rgb.py @@ -6,7 +6,7 @@ * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_5.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_5.py index 2cf02786cbc0d4efc2fed4bd01d23d747d5fb33e..20b048d5be87e947db7622ed34c1aaa30f166084 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_5.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_5.py @@ -6,7 +6,7 @@ * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_5_rgb.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_5_rgb.py index ab5dc438c29d3582211563d6214688995ecc8afd..6b851bdcdffb0029b2dd70fe74a4c9afffaff826 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_5_rgb.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_5_rgb.py @@ -6,7 +6,7 @@ * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_6.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_6.py index c11e5b2f1b677145512fd6e13262018252d1420d..e99afb4c0ab99ac8de31522181910e89b6f61b3e 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_6.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_6.py @@ -6,7 +6,7 @@ * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_6_rgb.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_6_rgb.py index 4785cfc3aedb75fc2580bbf98e8050550bc97fba..01a94e08e348358983eb9bdd40f155818733555e 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_6_rgb.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_6_rgb.py @@ -6,7 +6,7 @@ * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_7.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_7.py index d9cbb56661ac46c1b54dbd980bebbf922abbfd61..53e5af59d4bc1cdc145af9756c9a8f494f2519cb 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_7.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_7.py @@ -6,7 +6,7 @@ * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_7_rgb.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_7_rgb.py index 6d914cee001d07aac35c63af97ff1e19256b4f10..546d63584886094cf6bd7a5267e0e131197faa3a 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_7_rgb.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_7_rgb.py @@ -6,7 +6,7 @@ * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_8.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_8.py index 5592912a4a8fbb96498d984e0640b32e198332dd..d59887df9ce9849fca1483d8c3c4adb97bf7d0b5 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_8.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_8.py @@ -6,7 +6,7 @@ * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_8_rgb.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_8_rgb.py index 6db0e80294fb0e5cea97c32cb61497ce9d81fe47..243c1455a3d2a06e14b535b303b8a7bbfe70e8fa 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_8_rgb.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_8_rgb.py @@ -6,7 +6,7 @@ * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_9.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_9.py index 79410450c17a194d70572ddb2c72590ae91b536e..2f9a45f01f31a9f1c87d8b70aa9e5859cee83b04 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_9.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_9.py @@ -6,7 +6,7 @@ * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_9_rgb.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_9_rgb.py index 82af3049c91c52479876228ceaea230460634cd6..ef3d504550a094970ad49d16b307e1d0ae0782db 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_9_rgb.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3/fold_9_rgb.py @@ -6,7 +6,7 @@ * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3/rgb.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3/rgb.py index 9729d5100fe03ca7befc900892485bf5c9220ed7..1c274f79252bff0a06bc52edff8e1590b265fccd 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3/rgb.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3/rgb.py @@ -2,11 +2,12 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -"""TBX11k simplified dataset for TB detection (default protocol, converted in RGB) +"""TBX11k simplified dataset for TB detection (default protocol, converted in +RGB) * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/default.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/default.py index 088f9186c589017e1dcf6305cb50aa350eacc399..7c62887d8a4eb2d66e9ad287cfa0fb20020c97b3 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/default.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/default.py @@ -7,7 +7,7 @@ DensenetRS predictions) * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_0.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_0.py index 20c7316f0a8a71864e10f9c5bcc99bb2eab32795..bed7342dd6f28a83ca3c5a4e7984551a153344d7 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_0.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_0.py @@ -6,7 +6,7 @@ * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_1.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_1.py index 4d3c1961cb323f47d8422fb2b1b1183140208022..92cc9ce31f3f296a52d9ba51eae87d39740cb160 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_1.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_1.py @@ -6,7 +6,7 @@ * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_2.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_2.py index bc8088a01469bca888bc3b3a4ec5a94a42e33851..460c96df367fa982dad4dca111c41ad5118f11f1 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_2.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_2.py @@ -6,7 +6,7 @@ * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_3.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_3.py index 3fba1cda757a7d84f16b9b6b69c072fa59fef2b6..c799c7cb54044be807bc3cc615658c39ca47667c 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_3.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_3.py @@ -6,7 +6,7 @@ * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_4.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_4.py index d5917fefec6682c5d10066fa9a75fef9afd6a899..acceda91f4caa5773b5f0b478bfc5c1e9e4dc1d8 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_4.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_4.py @@ -6,7 +6,7 @@ * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_5.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_5.py index 2cf02786cbc0d4efc2fed4bd01d23d747d5fb33e..20b048d5be87e947db7622ed34c1aaa30f166084 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_5.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_5.py @@ -6,7 +6,7 @@ * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_6.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_6.py index c11e5b2f1b677145512fd6e13262018252d1420d..e99afb4c0ab99ac8de31522181910e89b6f61b3e 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_6.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_6.py @@ -6,7 +6,7 @@ * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_7.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_7.py index d9cbb56661ac46c1b54dbd980bebbf922abbfd61..53e5af59d4bc1cdc145af9756c9a8f494f2519cb 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_7.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_7.py @@ -6,7 +6,7 @@ * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_8.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_8.py index 5592912a4a8fbb96498d984e0640b32e198332dd..d59887df9ce9849fca1483d8c3c4adb97bf7d0b5 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_8.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_8.py @@ -6,7 +6,7 @@ * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_9.py b/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_9.py index 79410450c17a194d70572ddb2c72590ae91b536e..2f9a45f01f31a9f1c87d8b70aa9e5859cee83b04 100644 --- a/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_9.py +++ b/src/ptbench/configs/datasets/tbx11k_simplified_v3_RS/fold_9.py @@ -6,7 +6,7 @@ * Split reference: first 62.6% of CXR for "train", 16% for "validation", * 21.4% for "test" -* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", +* This split consists of the 4 labels "healthy", "latent TB", "sick & non-TB", * and "active TB" * This configuration resolution: 512 x 512 (default) * See :py:mod:`ptbench.data.tbx11k_v3` for dataset details diff --git a/src/ptbench/data/loader.py b/src/ptbench/data/loader.py index 0ee253a7ef8d5cb3106b8f958bcf872deb3e91bf..12a7517e9249c61fcbe58ea7339258e095feb3d0 100644 --- a/src/ptbench/data/loader.py +++ b/src/ptbench/data/loader.py @@ -102,6 +102,7 @@ def make_delayed(sample, loader, key=None): label=sample["label"], ) + def make_delayed_bbox(sample, loader, key=None): """Returns a delayed-loading Sample object. diff --git a/src/ptbench/data/tbx11k_simplified/__init__.py b/src/ptbench/data/tbx11k_simplified/__init__.py index 4652058176e7a63a724df9a8242ca5fd34adfb97..dd2be35dc4d7992a66a101ad5dcc00ceb127c082 100644 --- a/src/ptbench/data/tbx11k_simplified/__init__.py +++ b/src/ptbench/data/tbx11k_simplified/__init__.py @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -"""TBX11K simplified dataset for computer-aided diagnosis +"""TBX11K simplified dataset for computer-aided diagnosis. The TBX11K database has been established to foster research in computer-aided diagnosis of pulmonary diseases with a special @@ -48,12 +48,14 @@ _datadir = load_rc().get( "datadir.tbx11k_simplified", os.path.realpath(os.curdir) ) + def _raw_data_loader(sample): return dict( data=load_pil_baw(os.path.join(_datadir, sample["data"])), # type: ignore label=sample["label"], ) + def _raw_data_loader_bbox(sample): return dict( data=load_pil_baw(os.path.join(_datadir, sample["data"])), # type: ignore @@ -61,16 +63,19 @@ def _raw_data_loader_bbox(sample): bboxes=sample["bboxes"], ) + def _loader(context, sample): # "context" is ignored in this case - database is homogeneous # we return delayed samples to avoid loading all images at once return make_delayed(sample, _raw_data_loader) + def _loader_bbox(context, sample): # "context" is ignored in this case - database is homogeneous # we return delayed samples to avoid loading all images at once return make_delayed_bbox(sample, _raw_data_loader_bbox) + dataset = JSONDataset( protocols=_protocols, fieldnames=("data", "label"), diff --git a/src/ptbench/data/tbx11k_simplified_RS/__init__.py b/src/ptbench/data/tbx11k_simplified_RS/__init__.py index 1f328703dbb13e77983e761c2dad35c7aac276c2..5a7aa0d765d80e48506fd7e59b2bbdf476a59880 100644 --- a/src/ptbench/data/tbx11k_simplified_RS/__init__.py +++ b/src/ptbench/data/tbx11k_simplified_RS/__init__.py @@ -47,6 +47,7 @@ _protocols = [ def _raw_data_loader(sample): return dict(data=sample["data"], label=sample["label"]) + def _raw_data_loader_bbox(sample): return dict( data=sample["data"], @@ -54,15 +55,20 @@ def _raw_data_loader_bbox(sample): bboxes=sample["bboxes"], ) + def _loader(context, sample): # "context" is ignored in this case - database is homogeneous # we returned delayed samples to avoid loading all images at once return make_delayed(sample, _raw_data_loader, key=sample["filename"]) + def _loader_bbox(context, sample): # "context" is ignored in this case - database is homogeneous # we return delayed samples to avoid loading all images at once - return make_delayed_bbox(sample, _raw_data_loader_bbox, key=sample["filename"]) + return make_delayed_bbox( + sample, _raw_data_loader_bbox, key=sample["filename"] + ) + dataset = JSONDataset( protocols=_protocols, diff --git a/src/ptbench/data/tbx11k_simplified_v2/__init__.py b/src/ptbench/data/tbx11k_simplified_v2/__init__.py index 9cb5b281b0646060f8c614b7f3e012e1d7d0bc36..7cf676b00d4570c8b2f6b42724f55eeb0eab2fc4 100644 --- a/src/ptbench/data/tbx11k_simplified_v2/__init__.py +++ b/src/ptbench/data/tbx11k_simplified_v2/__init__.py @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -"""TBX11K simplified dataset for computer-aided diagnosis +"""TBX11K simplified dataset for computer-aided diagnosis. The TBX11K database has been established to foster research in computer-aided diagnosis of pulmonary diseases with a special @@ -48,12 +48,14 @@ _datadir = load_rc().get( "datadir.tbx11k_simplified", os.path.realpath(os.curdir) ) + def _raw_data_loader(sample): return dict( data=load_pil_baw(os.path.join(_datadir, sample["data"])), # type: ignore label=sample["label"], ) + def _raw_data_loader_bbox(sample): return dict( data=load_pil_baw(os.path.join(_datadir, sample["data"])), # type: ignore @@ -61,16 +63,19 @@ def _raw_data_loader_bbox(sample): bboxes=sample["bboxes"], ) + def _loader(context, sample): # "context" is ignored in this case - database is homogeneous # we return delayed samples to avoid loading all images at once return make_delayed(sample, _raw_data_loader) + def _loader_bbox(context, sample): # "context" is ignored in this case - database is homogeneous # we return delayed samples to avoid loading all images at once return make_delayed_bbox(sample, _raw_data_loader_bbox) + dataset = JSONDataset( protocols=_protocols, fieldnames=("data", "label"), diff --git a/src/ptbench/data/tbx11k_simplified_v2_RS/__init__.py b/src/ptbench/data/tbx11k_simplified_v2_RS/__init__.py index 23dd76b7e83a049040fae0fe111c3f187c2275dc..31c0a4a5521a6825a494ecd5df737622c7c2bd8f 100644 --- a/src/ptbench/data/tbx11k_simplified_v2_RS/__init__.py +++ b/src/ptbench/data/tbx11k_simplified_v2_RS/__init__.py @@ -47,6 +47,7 @@ _protocols = [ def _raw_data_loader(sample): return dict(data=sample["data"], label=sample["label"]) + def _raw_data_loader_bbox(sample): return dict( data=sample["data"], @@ -54,15 +55,20 @@ def _raw_data_loader_bbox(sample): bboxes=sample["bboxes"], ) + def _loader(context, sample): # "context" is ignored in this case - database is homogeneous # we returned delayed samples to avoid loading all images at once return make_delayed(sample, _raw_data_loader, key=sample["filename"]) + def _loader_bbox(context, sample): # "context" is ignored in this case - database is homogeneous # we return delayed samples to avoid loading all images at once - return make_delayed_bbox(sample, _raw_data_loader_bbox, key=sample["filename"]) + return make_delayed_bbox( + sample, _raw_data_loader_bbox, key=sample["filename"] + ) + dataset = JSONDataset( protocols=_protocols, diff --git a/src/ptbench/data/tbx11k_simplified_v3/__init__.py b/src/ptbench/data/tbx11k_simplified_v3/__init__.py index 9cb5b281b0646060f8c614b7f3e012e1d7d0bc36..7cf676b00d4570c8b2f6b42724f55eeb0eab2fc4 100644 --- a/src/ptbench/data/tbx11k_simplified_v3/__init__.py +++ b/src/ptbench/data/tbx11k_simplified_v3/__init__.py @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -"""TBX11K simplified dataset for computer-aided diagnosis +"""TBX11K simplified dataset for computer-aided diagnosis. The TBX11K database has been established to foster research in computer-aided diagnosis of pulmonary diseases with a special @@ -48,12 +48,14 @@ _datadir = load_rc().get( "datadir.tbx11k_simplified", os.path.realpath(os.curdir) ) + def _raw_data_loader(sample): return dict( data=load_pil_baw(os.path.join(_datadir, sample["data"])), # type: ignore label=sample["label"], ) + def _raw_data_loader_bbox(sample): return dict( data=load_pil_baw(os.path.join(_datadir, sample["data"])), # type: ignore @@ -61,16 +63,19 @@ def _raw_data_loader_bbox(sample): bboxes=sample["bboxes"], ) + def _loader(context, sample): # "context" is ignored in this case - database is homogeneous # we return delayed samples to avoid loading all images at once return make_delayed(sample, _raw_data_loader) + def _loader_bbox(context, sample): # "context" is ignored in this case - database is homogeneous # we return delayed samples to avoid loading all images at once return make_delayed_bbox(sample, _raw_data_loader_bbox) + dataset = JSONDataset( protocols=_protocols, fieldnames=("data", "label"), diff --git a/src/ptbench/data/tbx11k_simplified_v3_RS/__init__.py b/src/ptbench/data/tbx11k_simplified_v3_RS/__init__.py index 23dd76b7e83a049040fae0fe111c3f187c2275dc..31c0a4a5521a6825a494ecd5df737622c7c2bd8f 100644 --- a/src/ptbench/data/tbx11k_simplified_v3_RS/__init__.py +++ b/src/ptbench/data/tbx11k_simplified_v3_RS/__init__.py @@ -47,6 +47,7 @@ _protocols = [ def _raw_data_loader(sample): return dict(data=sample["data"], label=sample["label"]) + def _raw_data_loader_bbox(sample): return dict( data=sample["data"], @@ -54,15 +55,20 @@ def _raw_data_loader_bbox(sample): bboxes=sample["bboxes"], ) + def _loader(context, sample): # "context" is ignored in this case - database is homogeneous # we returned delayed samples to avoid loading all images at once return make_delayed(sample, _raw_data_loader, key=sample["filename"]) + def _loader_bbox(context, sample): # "context" is ignored in this case - database is homogeneous # we return delayed samples to avoid loading all images at once - return make_delayed_bbox(sample, _raw_data_loader_bbox, key=sample["filename"]) + return make_delayed_bbox( + sample, _raw_data_loader_bbox, key=sample["filename"] + ) + dataset = JSONDataset( protocols=_protocols, diff --git a/tests/test_11k.py b/tests/test_11k.py index c8d7405c63308f3e0b04b6e8145740143a3a6b8a..ad7c0935a2f05f0768427c5588f73ca4fe13e23b 100644 --- a/tests/test_11k.py +++ b/tests/test_11k.py @@ -69,6 +69,7 @@ def test_protocol_consistency(): for s in subset["test"]: assert s.label in [0.0, 1.0] + def test_protocol_consistency_bbox(): from ptbench.data.tbx11k_simplified import dataset_with_bboxes @@ -139,6 +140,7 @@ def test_protocol_consistency_bbox(): for s in subset["train"]: assert s.bboxes == "none" or s.bboxes[0].startswith("{'xmin':") + @pytest.mark.skip_if_rc_var_not_set("datadir.tbx11k_simplified") def test_loading(): from ptbench.data.tbx11k_simplified import dataset @@ -162,6 +164,7 @@ def test_loading(): for s in subset["train"][:limit]: _check_sample(s) + @pytest.mark.skip_if_rc_var_not_set("datadir.tbx11k_simplified") def test_loading_bbox(): from ptbench.data.tbx11k_simplified import dataset_with_bboxes @@ -180,7 +183,9 @@ def test_loading_bbox(): assert data["label"] in [0, 1] # Check labels assert "bboxes" in data - assert data["bboxes"] == "none" or data["bboxes"][0].startswith("{'xmin':") + assert data["bboxes"] == "none" or data["bboxes"][0].startswith( + "{'xmin':" + ) limit = 30 # use this to limit testing to first images only, else None @@ -188,12 +193,14 @@ def test_loading_bbox(): for s in subset["train"][:limit]: _check_sample(s) + @pytest.mark.skip_if_rc_var_not_set("datadir.tbx11k_simplified") def test_check(): from ptbench.data.tbx11k_simplified import dataset assert dataset.check() == 0 + @pytest.mark.skip_if_rc_var_not_set("datadir.tbx11k_simplified") def test_check_bbox(): from ptbench.data.tbx11k_simplified import dataset_with_bboxes diff --git a/tests/test_11k_v2.py b/tests/test_11k_v2.py index cef3df72c5f91c9f3767f50d13382903049aa56e..48bc68233f5a9d03710d82510b4cf2b36eb88ac7 100644 --- a/tests/test_11k_v2.py +++ b/tests/test_11k_v2.py @@ -69,6 +69,7 @@ def test_protocol_consistency(): for s in subset["test"]: assert s.label in [0.0, 1.0] + def test_protocol_consistency_bbox(): from ptbench.data.tbx11k_simplified_v2 import dataset_with_bboxes @@ -139,6 +140,7 @@ def test_protocol_consistency_bbox(): for s in subset["train"]: assert s.bboxes == "none" or s.bboxes[0].startswith("{'xmin':") + @pytest.mark.skip_if_rc_var_not_set("datadir.tbx11k_simplified_v2") def test_loading(): from ptbench.data.tbx11k_simplified_v2 import dataset @@ -162,6 +164,7 @@ def test_loading(): for s in subset["train"][:limit]: _check_sample(s) + @pytest.mark.skip_if_rc_var_not_set("datadir.tbx11k_simplified_v2") def test_loading_bbox(): from ptbench.data.tbx11k_simplified_v2 import dataset_with_bboxes @@ -180,7 +183,9 @@ def test_loading_bbox(): assert data["label"] in [0, 1] # Check labels assert "bboxes" in data - assert data["bboxes"] == "none" or data["bboxes"][0].startswith("{'xmin':") + assert data["bboxes"] == "none" or data["bboxes"][0].startswith( + "{'xmin':" + ) limit = 30 # use this to limit testing to first images only, else None @@ -188,12 +193,14 @@ def test_loading_bbox(): for s in subset["train"][:limit]: _check_sample(s) + @pytest.mark.skip_if_rc_var_not_set("datadir.tbx11k_simplified_v2") def test_check(): from ptbench.data.tbx11k_simplified_v2 import dataset assert dataset.check() == 0 + @pytest.mark.skip_if_rc_var_not_set("datadir.tbx11k_simplified_v2") def test_check_bbox(): from ptbench.data.tbx11k_simplified_v2 import dataset_with_bboxes diff --git a/tests/test_11k_v3.py b/tests/test_11k_v3.py index f659c4082a55f7eec66bd5dfd336fa1f4c6d5bed..a81af2012ef625fe3ceaaf289d353794877ede15 100644 --- a/tests/test_11k_v3.py +++ b/tests/test_11k_v3.py @@ -69,6 +69,7 @@ def test_protocol_consistency(): for s in subset["test"]: assert s.label in [0.0, 1.0] + def test_protocol_consistency_bbox(): from ptbench.data.tbx11k_simplified_v3 import dataset_with_bboxes @@ -139,6 +140,7 @@ def test_protocol_consistency_bbox(): for s in subset["train"]: assert s.bboxes == "none" or s.bboxes[0].startswith("{'xmin':") + @pytest.mark.skip_if_rc_var_not_set("datadir.tbx11k_simplified_v3") def test_loading(): from ptbench.data.tbx11k_simplified_v3 import dataset @@ -162,6 +164,7 @@ def test_loading(): for s in subset["train"][:limit]: _check_sample(s) + @pytest.mark.skip_if_rc_var_not_set("datadir.tbx11k_simplified_v3") def test_loading_bbox(): from ptbench.data.tbx11k_simplified_v3 import dataset_with_bboxes @@ -180,7 +183,9 @@ def test_loading_bbox(): assert data["label"] in [0, 1] # Check labels assert "bboxes" in data - assert data["bboxes"] == "none" or data["bboxes"][0].startswith("{'xmin':") + assert data["bboxes"] == "none" or data["bboxes"][0].startswith( + "{'xmin':" + ) limit = 30 # use this to limit testing to first images only, else None @@ -188,12 +193,14 @@ def test_loading_bbox(): for s in subset["train"][:limit]: _check_sample(s) + @pytest.mark.skip_if_rc_var_not_set("datadir.tbx11k_simplified_v3") def test_check(): from ptbench.data.tbx11k_simplified_v3 import dataset assert dataset.check() == 0 + @pytest.mark.skip_if_rc_var_not_set("datadir.tbx11k_simplified_v3") def test_check_bbox(): from ptbench.data.tbx11k_simplified_v3 import dataset_with_bboxes diff --git a/tests/test_mc_ch_in_11k.py b/tests/test_mc_ch_in_11k.py index a2ede3d9249e5667d87784db2bda941d1eeb2f25..9aeb0c36951d1383cd758fb5bcd2172a2426411a 100644 --- a/tests/test_mc_ch_in_11k.py +++ b/tests/test_mc_ch_in_11k.py @@ -29,25 +29,45 @@ def test_dataset_consistency(): from ptbench.configs.datasets.indian import fold_9_rgb as indian_f9_rgb from ptbench.configs.datasets.mc_ch_in_11k import default as mc_ch_in_11k from ptbench.configs.datasets.mc_ch_in_11k import fold_0 as mc_ch_in_11k_f0 - from ptbench.configs.datasets.mc_ch_in_11k import fold_0_rgb as mc_ch_in_11k_f0_rgb + from ptbench.configs.datasets.mc_ch_in_11k import ( + fold_0_rgb as mc_ch_in_11k_f0_rgb, + ) from ptbench.configs.datasets.mc_ch_in_11k import fold_1 as mc_ch_in_11k_f1 - from ptbench.configs.datasets.mc_ch_in_11k import fold_1_rgb as mc_ch_in_11k_f1_rgb + from ptbench.configs.datasets.mc_ch_in_11k import ( + fold_1_rgb as mc_ch_in_11k_f1_rgb, + ) from ptbench.configs.datasets.mc_ch_in_11k import fold_2 as mc_ch_in_11k_f2 - from ptbench.configs.datasets.mc_ch_in_11k import fold_2_rgb as mc_ch_in_11k_f2_rgb + from ptbench.configs.datasets.mc_ch_in_11k import ( + fold_2_rgb as mc_ch_in_11k_f2_rgb, + ) from ptbench.configs.datasets.mc_ch_in_11k import fold_3 as mc_ch_in_11k_f3 - from ptbench.configs.datasets.mc_ch_in_11k import fold_3_rgb as mc_ch_in_11k_f3_rgb + from ptbench.configs.datasets.mc_ch_in_11k import ( + fold_3_rgb as mc_ch_in_11k_f3_rgb, + ) from ptbench.configs.datasets.mc_ch_in_11k import fold_4 as mc_ch_in_11k_f4 - from ptbench.configs.datasets.mc_ch_in_11k import fold_4_rgb as mc_ch_in_11k_f4_rgb + from ptbench.configs.datasets.mc_ch_in_11k import ( + fold_4_rgb as mc_ch_in_11k_f4_rgb, + ) from ptbench.configs.datasets.mc_ch_in_11k import fold_5 as mc_ch_in_11k_f5 - from ptbench.configs.datasets.mc_ch_in_11k import fold_5_rgb as mc_ch_in_11k_f5_rgb + from ptbench.configs.datasets.mc_ch_in_11k import ( + fold_5_rgb as mc_ch_in_11k_f5_rgb, + ) from ptbench.configs.datasets.mc_ch_in_11k import fold_6 as mc_ch_in_11k_f6 - from ptbench.configs.datasets.mc_ch_in_11k import fold_6_rgb as mc_ch_in_11k_f6_rgb + from ptbench.configs.datasets.mc_ch_in_11k import ( + fold_6_rgb as mc_ch_in_11k_f6_rgb, + ) from ptbench.configs.datasets.mc_ch_in_11k import fold_7 as mc_ch_in_11k_f7 - from ptbench.configs.datasets.mc_ch_in_11k import fold_7_rgb as mc_ch_in_11k_f7_rgb + from ptbench.configs.datasets.mc_ch_in_11k import ( + fold_7_rgb as mc_ch_in_11k_f7_rgb, + ) from ptbench.configs.datasets.mc_ch_in_11k import fold_8 as mc_ch_in_11k_f8 - from ptbench.configs.datasets.mc_ch_in_11k import fold_8_rgb as mc_ch_in_11k_f8_rgb + from ptbench.configs.datasets.mc_ch_in_11k import ( + fold_8_rgb as mc_ch_in_11k_f8_rgb, + ) from ptbench.configs.datasets.mc_ch_in_11k import fold_9 as mc_ch_in_11k_f9 - from ptbench.configs.datasets.mc_ch_in_11k import fold_9_rgb as mc_ch_in_11k_f9_rgb + from ptbench.configs.datasets.mc_ch_in_11k import ( + fold_9_rgb as mc_ch_in_11k_f9_rgb, + ) from ptbench.configs.datasets.montgomery import default as mc from ptbench.configs.datasets.montgomery import fold_0 as mc_f0 from ptbench.configs.datasets.montgomery import fold_0_rgb as mc_f0_rgb @@ -92,25 +112,45 @@ def test_dataset_consistency(): from ptbench.configs.datasets.shenzhen import fold_9_rgb as ch_f9_rgb from ptbench.configs.datasets.tbx11k_simplified import default as tbx11k from ptbench.configs.datasets.tbx11k_simplified import fold_0 as tbx11k_f0 - from ptbench.configs.datasets.tbx11k_simplified import fold_0_rgb as tbx11k_f0_rgb + from ptbench.configs.datasets.tbx11k_simplified import ( + fold_0_rgb as tbx11k_f0_rgb, + ) from ptbench.configs.datasets.tbx11k_simplified import fold_1 as tbx11k_f1 - from ptbench.configs.datasets.tbx11k_simplified import fold_1_rgb as tbx11k_f1_rgb + from ptbench.configs.datasets.tbx11k_simplified import ( + fold_1_rgb as tbx11k_f1_rgb, + ) from ptbench.configs.datasets.tbx11k_simplified import fold_2 as tbx11k_f2 - from ptbench.configs.datasets.tbx11k_simplified import fold_2_rgb as tbx11k_f2_rgb + from ptbench.configs.datasets.tbx11k_simplified import ( + fold_2_rgb as tbx11k_f2_rgb, + ) from ptbench.configs.datasets.tbx11k_simplified import fold_3 as tbx11k_f3 - from ptbench.configs.datasets.tbx11k_simplified import fold_3_rgb as tbx11k_f3_rgb + from ptbench.configs.datasets.tbx11k_simplified import ( + fold_3_rgb as tbx11k_f3_rgb, + ) from ptbench.configs.datasets.tbx11k_simplified import fold_4 as tbx11k_f4 - from ptbench.configs.datasets.tbx11k_simplified import fold_4_rgb as tbx11k_f4_rgb + from ptbench.configs.datasets.tbx11k_simplified import ( + fold_4_rgb as tbx11k_f4_rgb, + ) from ptbench.configs.datasets.tbx11k_simplified import fold_5 as tbx11k_f5 - from ptbench.configs.datasets.tbx11k_simplified import fold_5_rgb as tbx11k_f5_rgb + from ptbench.configs.datasets.tbx11k_simplified import ( + fold_5_rgb as tbx11k_f5_rgb, + ) from ptbench.configs.datasets.tbx11k_simplified import fold_6 as tbx11k_f6 - from ptbench.configs.datasets.tbx11k_simplified import fold_6_rgb as tbx11k_f6_rgb + from ptbench.configs.datasets.tbx11k_simplified import ( + fold_6_rgb as tbx11k_f6_rgb, + ) from ptbench.configs.datasets.tbx11k_simplified import fold_7 as tbx11k_f7 - from ptbench.configs.datasets.tbx11k_simplified import fold_7_rgb as tbx11k_f7_rgb + from ptbench.configs.datasets.tbx11k_simplified import ( + fold_7_rgb as tbx11k_f7_rgb, + ) from ptbench.configs.datasets.tbx11k_simplified import fold_8 as tbx11k_f8 - from ptbench.configs.datasets.tbx11k_simplified import fold_8_rgb as tbx11k_f8_rgb + from ptbench.configs.datasets.tbx11k_simplified import ( + fold_8_rgb as tbx11k_f8_rgb, + ) from ptbench.configs.datasets.tbx11k_simplified import fold_9 as tbx11k_f9 - from ptbench.configs.datasets.tbx11k_simplified import fold_9_rgb as tbx11k_f9_rgb + from ptbench.configs.datasets.tbx11k_simplified import ( + fold_9_rgb as tbx11k_f9_rgb, + ) # Default protocol mc_ch_in_11k_dataset = mc_ch_in_11k.dataset @@ -130,7 +170,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -155,7 +196,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -180,7 +222,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -205,7 +248,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -230,7 +274,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -255,7 +300,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -280,7 +326,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -305,7 +352,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -330,7 +378,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -355,7 +404,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -380,7 +430,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -405,7 +456,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -430,7 +482,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -455,7 +508,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -480,7 +534,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -505,7 +560,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -530,7 +586,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -555,7 +612,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -580,7 +638,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -605,7 +664,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -630,7 +690,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( diff --git a/tests/test_mc_ch_in_11k_RS.py b/tests/test_mc_ch_in_11k_RS.py index a453a55d45dc243d94b33810aa466e9567922a43..35fc4d88063afaab607d67a24228ce44a9ab8f2e 100644 --- a/tests/test_mc_ch_in_11k_RS.py +++ b/tests/test_mc_ch_in_11k_RS.py @@ -17,17 +17,39 @@ def test_dataset_consistency(): from ptbench.configs.datasets.indian_RS import fold_7 as indian_f7 from ptbench.configs.datasets.indian_RS import fold_8 as indian_f8 from ptbench.configs.datasets.indian_RS import fold_9 as indian_f9 - from ptbench.configs.datasets.mc_ch_in_11k_RS import default as mc_ch_in_11k_RS - from ptbench.configs.datasets.mc_ch_in_11k_RS import fold_0 as mc_ch_in_11k_f0 - from ptbench.configs.datasets.mc_ch_in_11k_RS import fold_1 as mc_ch_in_11k_f1 - from ptbench.configs.datasets.mc_ch_in_11k_RS import fold_2 as mc_ch_in_11k_f2 - from ptbench.configs.datasets.mc_ch_in_11k_RS import fold_3 as mc_ch_in_11k_f3 - from ptbench.configs.datasets.mc_ch_in_11k_RS import fold_4 as mc_ch_in_11k_f4 - from ptbench.configs.datasets.mc_ch_in_11k_RS import fold_5 as mc_ch_in_11k_f5 - from ptbench.configs.datasets.mc_ch_in_11k_RS import fold_6 as mc_ch_in_11k_f6 - from ptbench.configs.datasets.mc_ch_in_11k_RS import fold_7 as mc_ch_in_11k_f7 - from ptbench.configs.datasets.mc_ch_in_11k_RS import fold_8 as mc_ch_in_11k_f8 - from ptbench.configs.datasets.mc_ch_in_11k_RS import fold_9 as mc_ch_in_11k_f9 + from ptbench.configs.datasets.mc_ch_in_11k_RS import ( + default as mc_ch_in_11k_RS, + ) + from ptbench.configs.datasets.mc_ch_in_11k_RS import ( + fold_0 as mc_ch_in_11k_f0, + ) + from ptbench.configs.datasets.mc_ch_in_11k_RS import ( + fold_1 as mc_ch_in_11k_f1, + ) + from ptbench.configs.datasets.mc_ch_in_11k_RS import ( + fold_2 as mc_ch_in_11k_f2, + ) + from ptbench.configs.datasets.mc_ch_in_11k_RS import ( + fold_3 as mc_ch_in_11k_f3, + ) + from ptbench.configs.datasets.mc_ch_in_11k_RS import ( + fold_4 as mc_ch_in_11k_f4, + ) + from ptbench.configs.datasets.mc_ch_in_11k_RS import ( + fold_5 as mc_ch_in_11k_f5, + ) + from ptbench.configs.datasets.mc_ch_in_11k_RS import ( + fold_6 as mc_ch_in_11k_f6, + ) + from ptbench.configs.datasets.mc_ch_in_11k_RS import ( + fold_7 as mc_ch_in_11k_f7, + ) + from ptbench.configs.datasets.mc_ch_in_11k_RS import ( + fold_8 as mc_ch_in_11k_f8, + ) + from ptbench.configs.datasets.mc_ch_in_11k_RS import ( + fold_9 as mc_ch_in_11k_f9, + ) from ptbench.configs.datasets.montgomery_RS import default as mc_RS from ptbench.configs.datasets.montgomery_RS import fold_0 as mc_f0 from ptbench.configs.datasets.montgomery_RS import fold_1 as mc_f1 @@ -50,17 +72,39 @@ def test_dataset_consistency(): from ptbench.configs.datasets.shenzhen_RS import fold_7 as ch_f7 from ptbench.configs.datasets.shenzhen_RS import fold_8 as ch_f8 from ptbench.configs.datasets.shenzhen_RS import fold_9 as ch_f9 - from ptbench.configs.datasets.tbx11k_simplified_RS import default as tbx11k_RS - from ptbench.configs.datasets.tbx11k_simplified_RS import fold_0 as tbx11k_f0 - from ptbench.configs.datasets.tbx11k_simplified_RS import fold_1 as tbx11k_f1 - from ptbench.configs.datasets.tbx11k_simplified_RS import fold_2 as tbx11k_f2 - from ptbench.configs.datasets.tbx11k_simplified_RS import fold_3 as tbx11k_f3 - from ptbench.configs.datasets.tbx11k_simplified_RS import fold_4 as tbx11k_f4 - from ptbench.configs.datasets.tbx11k_simplified_RS import fold_5 as tbx11k_f5 - from ptbench.configs.datasets.tbx11k_simplified_RS import fold_6 as tbx11k_f6 - from ptbench.configs.datasets.tbx11k_simplified_RS import fold_7 as tbx11k_f7 - from ptbench.configs.datasets.tbx11k_simplified_RS import fold_8 as tbx11k_f8 - from ptbench.configs.datasets.tbx11k_simplified_RS import fold_9 as tbx11k_f9 + from ptbench.configs.datasets.tbx11k_simplified_RS import ( + default as tbx11k_RS, + ) + from ptbench.configs.datasets.tbx11k_simplified_RS import ( + fold_0 as tbx11k_f0, + ) + from ptbench.configs.datasets.tbx11k_simplified_RS import ( + fold_1 as tbx11k_f1, + ) + from ptbench.configs.datasets.tbx11k_simplified_RS import ( + fold_2 as tbx11k_f2, + ) + from ptbench.configs.datasets.tbx11k_simplified_RS import ( + fold_3 as tbx11k_f3, + ) + from ptbench.configs.datasets.tbx11k_simplified_RS import ( + fold_4 as tbx11k_f4, + ) + from ptbench.configs.datasets.tbx11k_simplified_RS import ( + fold_5 as tbx11k_f5, + ) + from ptbench.configs.datasets.tbx11k_simplified_RS import ( + fold_6 as tbx11k_f6, + ) + from ptbench.configs.datasets.tbx11k_simplified_RS import ( + fold_7 as tbx11k_f7, + ) + from ptbench.configs.datasets.tbx11k_simplified_RS import ( + fold_8 as tbx11k_f8, + ) + from ptbench.configs.datasets.tbx11k_simplified_RS import ( + fold_9 as tbx11k_f9, + ) # Default protocol mc_ch_in_11k_RS_dataset = mc_ch_in_11k_RS.dataset @@ -74,19 +118,23 @@ def test_dataset_consistency(): assert "train" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["train"]) == len( mc_RS_dataset["train"] - ) + len(ch_RS_dataset["train"]) + len(in_RS_dataset["train"] + len( - tbx11k_RS_dataset["train"])) + ) + len(ch_RS_dataset["train"]) + len( + in_RS_dataset["train"] + len(tbx11k_RS_dataset["train"]) + ) assert "validation" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["validation"]) == len( mc_RS_dataset["validation"] - ) + len(ch_RS_dataset["validation"]) + len(in_RS_dataset["validation"] + len( - tbx11k_RS_dataset["validation"])) + ) + len(ch_RS_dataset["validation"]) + len( + in_RS_dataset["validation"] + len(tbx11k_RS_dataset["validation"]) + ) assert "test" in mc_ch_in_11k_RS_dataset - assert len(mc_ch_in_11k_RS_dataset["test"]) == len(mc_RS_dataset["test"]) + len( - ch_RS_dataset["test"] - ) + len(in_RS_dataset["test"] + len(tbx11k_RS_dataset["test"])) + assert len(mc_ch_in_11k_RS_dataset["test"]) == len( + mc_RS_dataset["test"] + ) + len(ch_RS_dataset["test"]) + len( + in_RS_dataset["test"] + len(tbx11k_RS_dataset["test"]) + ) # Fold 0 mc_ch_in_11k_RS_dataset = mc_ch_in_11k_f0.dataset @@ -100,19 +148,23 @@ def test_dataset_consistency(): assert "train" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["train"]) == len( mc_dataset["train"] - ) + len(ch_dataset["train"]) + len(in_dataset["train"] + len( - tbx11k_dataset["train"])) + ) + len(ch_dataset["train"]) + len( + in_dataset["train"] + len(tbx11k_dataset["train"]) + ) assert "validation" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["validation"]) == len( mc_dataset["validation"] - ) + len(ch_dataset["validation"]) + len(in_dataset["validation"] + len( - tbx11k_dataset["validation"])) + ) + len(ch_dataset["validation"]) + len( + in_dataset["validation"] + len(tbx11k_dataset["validation"]) + ) assert "test" in mc_ch_in_11k_RS_dataset - assert len(mc_ch_in_11k_RS_dataset["test"]) == len(mc_dataset["test"]) + len( - ch_dataset["test"] - ) + len(in_dataset["test"] + len(tbx11k_dataset["test"])) + assert len(mc_ch_in_11k_RS_dataset["test"]) == len( + mc_dataset["test"] + ) + len(ch_dataset["test"]) + len( + in_dataset["test"] + len(tbx11k_dataset["test"]) + ) # Fold 1 mc_ch_in_11k_RS_dataset = mc_ch_in_11k_f1.dataset @@ -126,19 +178,23 @@ def test_dataset_consistency(): assert "train" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["train"]) == len( mc_dataset["train"] - ) + len(ch_dataset["train"]) + len(in_dataset["train"] + len( - tbx11k_dataset["train"])) + ) + len(ch_dataset["train"]) + len( + in_dataset["train"] + len(tbx11k_dataset["train"]) + ) assert "validation" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["validation"]) == len( mc_dataset["validation"] - ) + len(ch_dataset["validation"]) + len(in_dataset["validation"] + len( - tbx11k_dataset["validation"])) + ) + len(ch_dataset["validation"]) + len( + in_dataset["validation"] + len(tbx11k_dataset["validation"]) + ) assert "test" in mc_ch_in_11k_RS_dataset - assert len(mc_ch_in_11k_RS_dataset["test"]) == len(mc_dataset["test"]) + len( - ch_dataset["test"] - ) + len(in_dataset["test"] + len(tbx11k_dataset["test"])) + assert len(mc_ch_in_11k_RS_dataset["test"]) == len( + mc_dataset["test"] + ) + len(ch_dataset["test"]) + len( + in_dataset["test"] + len(tbx11k_dataset["test"]) + ) # Fold 2 mc_ch_in_11k_RS_dataset = mc_ch_in_11k_f2.dataset @@ -152,19 +208,23 @@ def test_dataset_consistency(): assert "train" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["train"]) == len( mc_dataset["train"] - ) + len(ch_dataset["train"]) + len(in_dataset["train"] + len( - tbx11k_dataset["train"])) + ) + len(ch_dataset["train"]) + len( + in_dataset["train"] + len(tbx11k_dataset["train"]) + ) assert "validation" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["validation"]) == len( mc_dataset["validation"] - ) + len(ch_dataset["validation"]) + len(in_dataset["validation"] + len( - tbx11k_dataset["validation"])) + ) + len(ch_dataset["validation"]) + len( + in_dataset["validation"] + len(tbx11k_dataset["validation"]) + ) assert "test" in mc_ch_in_11k_RS_dataset - assert len(mc_ch_in_11k_RS_dataset["test"]) == len(mc_dataset["test"]) + len( - ch_dataset["test"] - ) + len(in_dataset["test"] + len(tbx11k_dataset["test"])) + assert len(mc_ch_in_11k_RS_dataset["test"]) == len( + mc_dataset["test"] + ) + len(ch_dataset["test"]) + len( + in_dataset["test"] + len(tbx11k_dataset["test"]) + ) # Fold 3 mc_ch_in_11k_RS_dataset = mc_ch_in_11k_f3.dataset @@ -178,19 +238,23 @@ def test_dataset_consistency(): assert "train" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["train"]) == len( mc_dataset["train"] - ) + len(ch_dataset["train"]) + len(in_dataset["train"] + len( - tbx11k_dataset["train"])) + ) + len(ch_dataset["train"]) + len( + in_dataset["train"] + len(tbx11k_dataset["train"]) + ) assert "validation" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["validation"]) == len( mc_dataset["validation"] - ) + len(ch_dataset["validation"]) + len(in_dataset["validation"] + len( - tbx11k_dataset["validation"])) + ) + len(ch_dataset["validation"]) + len( + in_dataset["validation"] + len(tbx11k_dataset["validation"]) + ) assert "test" in mc_ch_in_11k_RS_dataset - assert len(mc_ch_in_11k_RS_dataset["test"]) == len(mc_dataset["test"]) + len( - ch_dataset["test"] - ) + len(in_dataset["test"] + len(tbx11k_dataset["test"])) + assert len(mc_ch_in_11k_RS_dataset["test"]) == len( + mc_dataset["test"] + ) + len(ch_dataset["test"]) + len( + in_dataset["test"] + len(tbx11k_dataset["test"]) + ) # Fold 4 mc_ch_in_11k_RS_dataset = mc_ch_in_11k_f4.dataset @@ -204,19 +268,23 @@ def test_dataset_consistency(): assert "train" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["train"]) == len( mc_dataset["train"] - ) + len(ch_dataset["train"]) + len(in_dataset["train"] + len( - tbx11k_dataset["train"])) + ) + len(ch_dataset["train"]) + len( + in_dataset["train"] + len(tbx11k_dataset["train"]) + ) assert "validation" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["validation"]) == len( mc_dataset["validation"] - ) + len(ch_dataset["validation"]) + len(in_dataset["validation"] + len( - tbx11k_dataset["validation"])) + ) + len(ch_dataset["validation"]) + len( + in_dataset["validation"] + len(tbx11k_dataset["validation"]) + ) assert "test" in mc_ch_in_11k_RS_dataset - assert len(mc_ch_in_11k_RS_dataset["test"]) == len(mc_dataset["test"]) + len( - ch_dataset["test"] - ) + len(in_dataset["test"] + len(tbx11k_dataset["test"])) + assert len(mc_ch_in_11k_RS_dataset["test"]) == len( + mc_dataset["test"] + ) + len(ch_dataset["test"]) + len( + in_dataset["test"] + len(tbx11k_dataset["test"]) + ) # Fold 5 mc_ch_in_11k_RS_dataset = mc_ch_in_11k_f5.dataset @@ -230,19 +298,23 @@ def test_dataset_consistency(): assert "train" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["train"]) == len( mc_dataset["train"] - ) + len(ch_dataset["train"]) + len(in_dataset["train"] + len( - tbx11k_dataset["train"])) + ) + len(ch_dataset["train"]) + len( + in_dataset["train"] + len(tbx11k_dataset["train"]) + ) assert "validation" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["validation"]) == len( mc_dataset["validation"] - ) + len(ch_dataset["validation"]) + len(in_dataset["validation"] + len( - tbx11k_dataset["validation"])) + ) + len(ch_dataset["validation"]) + len( + in_dataset["validation"] + len(tbx11k_dataset["validation"]) + ) assert "test" in mc_ch_in_11k_RS_dataset - assert len(mc_ch_in_11k_RS_dataset["test"]) == len(mc_dataset["test"]) + len( - ch_dataset["test"] - ) + len(in_dataset["test"] + len(tbx11k_dataset["test"])) + assert len(mc_ch_in_11k_RS_dataset["test"]) == len( + mc_dataset["test"] + ) + len(ch_dataset["test"]) + len( + in_dataset["test"] + len(tbx11k_dataset["test"]) + ) # Fold 6 mc_ch_in_11k_RS_dataset = mc_ch_in_11k_f6.dataset @@ -256,19 +328,23 @@ def test_dataset_consistency(): assert "train" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["train"]) == len( mc_dataset["train"] - ) + len(ch_dataset["train"]) + len(in_dataset["train"] + len( - tbx11k_dataset["train"])) + ) + len(ch_dataset["train"]) + len( + in_dataset["train"] + len(tbx11k_dataset["train"]) + ) assert "validation" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["validation"]) == len( mc_dataset["validation"] - ) + len(ch_dataset["validation"]) + len(in_dataset["validation"] + len( - tbx11k_dataset["validation"])) + ) + len(ch_dataset["validation"]) + len( + in_dataset["validation"] + len(tbx11k_dataset["validation"]) + ) assert "test" in mc_ch_in_11k_RS_dataset - assert len(mc_ch_in_11k_RS_dataset["test"]) == len(mc_dataset["test"]) + len( - ch_dataset["test"] - ) + len(in_dataset["test"] + len(tbx11k_dataset["test"])) + assert len(mc_ch_in_11k_RS_dataset["test"]) == len( + mc_dataset["test"] + ) + len(ch_dataset["test"]) + len( + in_dataset["test"] + len(tbx11k_dataset["test"]) + ) # Fold 7 mc_ch_in_11k_RS_dataset = mc_ch_in_11k_f7.dataset @@ -282,19 +358,23 @@ def test_dataset_consistency(): assert "train" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["train"]) == len( mc_dataset["train"] - ) + len(ch_dataset["train"]) + len(in_dataset["train"] + len( - tbx11k_dataset["train"])) + ) + len(ch_dataset["train"]) + len( + in_dataset["train"] + len(tbx11k_dataset["train"]) + ) assert "validation" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["validation"]) == len( mc_dataset["validation"] - ) + len(ch_dataset["validation"]) + len(in_dataset["validation"] + len( - tbx11k_dataset["validation"])) + ) + len(ch_dataset["validation"]) + len( + in_dataset["validation"] + len(tbx11k_dataset["validation"]) + ) assert "test" in mc_ch_in_11k_RS_dataset - assert len(mc_ch_in_11k_RS_dataset["test"]) == len(mc_dataset["test"]) + len( - ch_dataset["test"] - ) + len(in_dataset["test"] + len(tbx11k_dataset["test"])) + assert len(mc_ch_in_11k_RS_dataset["test"]) == len( + mc_dataset["test"] + ) + len(ch_dataset["test"]) + len( + in_dataset["test"] + len(tbx11k_dataset["test"]) + ) # Fold 8 mc_ch_in_11k_RS_dataset = mc_ch_in_11k_f8.dataset @@ -308,19 +388,23 @@ def test_dataset_consistency(): assert "train" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["train"]) == len( mc_dataset["train"] - ) + len(ch_dataset["train"]) + len(in_dataset["train"] + len( - tbx11k_dataset["train"])) + ) + len(ch_dataset["train"]) + len( + in_dataset["train"] + len(tbx11k_dataset["train"]) + ) assert "validation" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["validation"]) == len( mc_dataset["validation"] - ) + len(ch_dataset["validation"]) + len(in_dataset["validation"] + len( - tbx11k_dataset["validation"])) + ) + len(ch_dataset["validation"]) + len( + in_dataset["validation"] + len(tbx11k_dataset["validation"]) + ) assert "test" in mc_ch_in_11k_RS_dataset - assert len(mc_ch_in_11k_RS_dataset["test"]) == len(mc_dataset["test"]) + len( - ch_dataset["test"] - ) + len(in_dataset["test"] + len(tbx11k_dataset["test"])) + assert len(mc_ch_in_11k_RS_dataset["test"]) == len( + mc_dataset["test"] + ) + len(ch_dataset["test"]) + len( + in_dataset["test"] + len(tbx11k_dataset["test"]) + ) # Fold 9 mc_ch_in_11k_RS_dataset = mc_ch_in_11k_f9.dataset @@ -334,16 +418,20 @@ def test_dataset_consistency(): assert "train" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["train"]) == len( mc_dataset["train"] - ) + len(ch_dataset["train"]) + len(in_dataset["train"] + len( - tbx11k_dataset["train"])) + ) + len(ch_dataset["train"]) + len( + in_dataset["train"] + len(tbx11k_dataset["train"]) + ) assert "validation" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["validation"]) == len( mc_dataset["validation"] - ) + len(ch_dataset["validation"]) + len(in_dataset["validation"] + len( - tbx11k_dataset["validation"])) + ) + len(ch_dataset["validation"]) + len( + in_dataset["validation"] + len(tbx11k_dataset["validation"]) + ) assert "test" in mc_ch_in_11k_RS_dataset - assert len(mc_ch_in_11k_RS_dataset["test"]) == len(mc_dataset["test"]) + len( - ch_dataset["test"] - ) + len(in_dataset["test"] + len(tbx11k_dataset["test"])) + assert len(mc_ch_in_11k_RS_dataset["test"]) == len( + mc_dataset["test"] + ) + len(ch_dataset["test"]) + len( + in_dataset["test"] + len(tbx11k_dataset["test"]) + ) diff --git a/tests/test_mc_ch_in_11kv2.py b/tests/test_mc_ch_in_11kv2.py index 8b09f8f867fca96acfa9aaf380be496dfeec095b..c923a9f54240dbe240ca9682d3ac8e53933b0549 100644 --- a/tests/test_mc_ch_in_11kv2.py +++ b/tests/test_mc_ch_in_11kv2.py @@ -28,26 +28,66 @@ def test_dataset_consistency(): from ptbench.configs.datasets.indian import fold_9 as indian_f9 from ptbench.configs.datasets.indian import fold_9_rgb as indian_f9_rgb from ptbench.configs.datasets.mc_ch_in_11kv2 import default as mc_ch_in_11k - from ptbench.configs.datasets.mc_ch_in_11kv2 import fold_0 as mc_ch_in_11k_f0 - from ptbench.configs.datasets.mc_ch_in_11kv2 import fold_0_rgb as mc_ch_in_11k_f0_rgb - from ptbench.configs.datasets.mc_ch_in_11kv2 import fold_1 as mc_ch_in_11k_f1 - from ptbench.configs.datasets.mc_ch_in_11kv2 import fold_1_rgb as mc_ch_in_11k_f1_rgb - from ptbench.configs.datasets.mc_ch_in_11kv2 import fold_2 as mc_ch_in_11k_f2 - from ptbench.configs.datasets.mc_ch_in_11kv2 import fold_2_rgb as mc_ch_in_11k_f2_rgb - from ptbench.configs.datasets.mc_ch_in_11kv2 import fold_3 as mc_ch_in_11k_f3 - from ptbench.configs.datasets.mc_ch_in_11kv2 import fold_3_rgb as mc_ch_in_11k_f3_rgb - from ptbench.configs.datasets.mc_ch_in_11kv2 import fold_4 as mc_ch_in_11k_f4 - from ptbench.configs.datasets.mc_ch_in_11kv2 import fold_4_rgb as mc_ch_in_11k_f4_rgb - from ptbench.configs.datasets.mc_ch_in_11kv2 import fold_5 as mc_ch_in_11k_f5 - from ptbench.configs.datasets.mc_ch_in_11kv2 import fold_5_rgb as mc_ch_in_11k_f5_rgb - from ptbench.configs.datasets.mc_ch_in_11kv2 import fold_6 as mc_ch_in_11k_f6 - from ptbench.configs.datasets.mc_ch_in_11kv2 import fold_6_rgb as mc_ch_in_11k_f6_rgb - from ptbench.configs.datasets.mc_ch_in_11kv2 import fold_7 as mc_ch_in_11k_f7 - from ptbench.configs.datasets.mc_ch_in_11kv2 import fold_7_rgb as mc_ch_in_11k_f7_rgb - from ptbench.configs.datasets.mc_ch_in_11kv2 import fold_8 as mc_ch_in_11k_f8 - from ptbench.configs.datasets.mc_ch_in_11kv2 import fold_8_rgb as mc_ch_in_11k_f8_rgb - from ptbench.configs.datasets.mc_ch_in_11kv2 import fold_9 as mc_ch_in_11k_f9 - from ptbench.configs.datasets.mc_ch_in_11kv2 import fold_9_rgb as mc_ch_in_11k_f9_rgb + from ptbench.configs.datasets.mc_ch_in_11kv2 import ( + fold_0 as mc_ch_in_11k_f0, + ) + from ptbench.configs.datasets.mc_ch_in_11kv2 import ( + fold_0_rgb as mc_ch_in_11k_f0_rgb, + ) + from ptbench.configs.datasets.mc_ch_in_11kv2 import ( + fold_1 as mc_ch_in_11k_f1, + ) + from ptbench.configs.datasets.mc_ch_in_11kv2 import ( + fold_1_rgb as mc_ch_in_11k_f1_rgb, + ) + from ptbench.configs.datasets.mc_ch_in_11kv2 import ( + fold_2 as mc_ch_in_11k_f2, + ) + from ptbench.configs.datasets.mc_ch_in_11kv2 import ( + fold_2_rgb as mc_ch_in_11k_f2_rgb, + ) + from ptbench.configs.datasets.mc_ch_in_11kv2 import ( + fold_3 as mc_ch_in_11k_f3, + ) + from ptbench.configs.datasets.mc_ch_in_11kv2 import ( + fold_3_rgb as mc_ch_in_11k_f3_rgb, + ) + from ptbench.configs.datasets.mc_ch_in_11kv2 import ( + fold_4 as mc_ch_in_11k_f4, + ) + from ptbench.configs.datasets.mc_ch_in_11kv2 import ( + fold_4_rgb as mc_ch_in_11k_f4_rgb, + ) + from ptbench.configs.datasets.mc_ch_in_11kv2 import ( + fold_5 as mc_ch_in_11k_f5, + ) + from ptbench.configs.datasets.mc_ch_in_11kv2 import ( + fold_5_rgb as mc_ch_in_11k_f5_rgb, + ) + from ptbench.configs.datasets.mc_ch_in_11kv2 import ( + fold_6 as mc_ch_in_11k_f6, + ) + from ptbench.configs.datasets.mc_ch_in_11kv2 import ( + fold_6_rgb as mc_ch_in_11k_f6_rgb, + ) + from ptbench.configs.datasets.mc_ch_in_11kv2 import ( + fold_7 as mc_ch_in_11k_f7, + ) + from ptbench.configs.datasets.mc_ch_in_11kv2 import ( + fold_7_rgb as mc_ch_in_11k_f7_rgb, + ) + from ptbench.configs.datasets.mc_ch_in_11kv2 import ( + fold_8 as mc_ch_in_11k_f8, + ) + from ptbench.configs.datasets.mc_ch_in_11kv2 import ( + fold_8_rgb as mc_ch_in_11k_f8_rgb, + ) + from ptbench.configs.datasets.mc_ch_in_11kv2 import ( + fold_9 as mc_ch_in_11k_f9, + ) + from ptbench.configs.datasets.mc_ch_in_11kv2 import ( + fold_9_rgb as mc_ch_in_11k_f9_rgb, + ) from ptbench.configs.datasets.montgomery import default as mc from ptbench.configs.datasets.montgomery import fold_0 as mc_f0 from ptbench.configs.datasets.montgomery import fold_0_rgb as mc_f0_rgb @@ -91,26 +131,66 @@ def test_dataset_consistency(): from ptbench.configs.datasets.shenzhen import fold_9 as ch_f9 from ptbench.configs.datasets.shenzhen import fold_9_rgb as ch_f9_rgb from ptbench.configs.datasets.tbx11k_simplified_v2 import default as tbx11k - from ptbench.configs.datasets.tbx11k_simplified_v2 import fold_0 as tbx11k_f0 - from ptbench.configs.datasets.tbx11k_simplified_v2 import fold_0_rgb as tbx11k_f0_rgb - from ptbench.configs.datasets.tbx11k_simplified_v2 import fold_1 as tbx11k_f1 - from ptbench.configs.datasets.tbx11k_simplified_v2 import fold_1_rgb as tbx11k_f1_rgb - from ptbench.configs.datasets.tbx11k_simplified_v2 import fold_2 as tbx11k_f2 - from ptbench.configs.datasets.tbx11k_simplified_v2 import fold_2_rgb as tbx11k_f2_rgb - from ptbench.configs.datasets.tbx11k_simplified_v2 import fold_3 as tbx11k_f3 - from ptbench.configs.datasets.tbx11k_simplified_v2 import fold_3_rgb as tbx11k_f3_rgb - from ptbench.configs.datasets.tbx11k_simplified_v2 import fold_4 as tbx11k_f4 - from ptbench.configs.datasets.tbx11k_simplified_v2 import fold_4_rgb as tbx11k_f4_rgb - from ptbench.configs.datasets.tbx11k_simplified_v2 import fold_5 as tbx11k_f5 - from ptbench.configs.datasets.tbx11k_simplified_v2 import fold_5_rgb as tbx11k_f5_rgb - from ptbench.configs.datasets.tbx11k_simplified_v2 import fold_6 as tbx11k_f6 - from ptbench.configs.datasets.tbx11k_simplified_v2 import fold_6_rgb as tbx11k_f6_rgb - from ptbench.configs.datasets.tbx11k_simplified_v2 import fold_7 as tbx11k_f7 - from ptbench.configs.datasets.tbx11k_simplified_v2 import fold_7_rgb as tbx11k_f7_rgb - from ptbench.configs.datasets.tbx11k_simplified_v2 import fold_8 as tbx11k_f8 - from ptbench.configs.datasets.tbx11k_simplified_v2 import fold_8_rgb as tbx11k_f8_rgb - from ptbench.configs.datasets.tbx11k_simplified_v2 import fold_9 as tbx11k_f9 - from ptbench.configs.datasets.tbx11k_simplified_v2 import fold_9_rgb as tbx11k_f9_rgb + from ptbench.configs.datasets.tbx11k_simplified_v2 import ( + fold_0 as tbx11k_f0, + ) + from ptbench.configs.datasets.tbx11k_simplified_v2 import ( + fold_0_rgb as tbx11k_f0_rgb, + ) + from ptbench.configs.datasets.tbx11k_simplified_v2 import ( + fold_1 as tbx11k_f1, + ) + from ptbench.configs.datasets.tbx11k_simplified_v2 import ( + fold_1_rgb as tbx11k_f1_rgb, + ) + from ptbench.configs.datasets.tbx11k_simplified_v2 import ( + fold_2 as tbx11k_f2, + ) + from ptbench.configs.datasets.tbx11k_simplified_v2 import ( + fold_2_rgb as tbx11k_f2_rgb, + ) + from ptbench.configs.datasets.tbx11k_simplified_v2 import ( + fold_3 as tbx11k_f3, + ) + from ptbench.configs.datasets.tbx11k_simplified_v2 import ( + fold_3_rgb as tbx11k_f3_rgb, + ) + from ptbench.configs.datasets.tbx11k_simplified_v2 import ( + fold_4 as tbx11k_f4, + ) + from ptbench.configs.datasets.tbx11k_simplified_v2 import ( + fold_4_rgb as tbx11k_f4_rgb, + ) + from ptbench.configs.datasets.tbx11k_simplified_v2 import ( + fold_5 as tbx11k_f5, + ) + from ptbench.configs.datasets.tbx11k_simplified_v2 import ( + fold_5_rgb as tbx11k_f5_rgb, + ) + from ptbench.configs.datasets.tbx11k_simplified_v2 import ( + fold_6 as tbx11k_f6, + ) + from ptbench.configs.datasets.tbx11k_simplified_v2 import ( + fold_6_rgb as tbx11k_f6_rgb, + ) + from ptbench.configs.datasets.tbx11k_simplified_v2 import ( + fold_7 as tbx11k_f7, + ) + from ptbench.configs.datasets.tbx11k_simplified_v2 import ( + fold_7_rgb as tbx11k_f7_rgb, + ) + from ptbench.configs.datasets.tbx11k_simplified_v2 import ( + fold_8 as tbx11k_f8, + ) + from ptbench.configs.datasets.tbx11k_simplified_v2 import ( + fold_8_rgb as tbx11k_f8_rgb, + ) + from ptbench.configs.datasets.tbx11k_simplified_v2 import ( + fold_9 as tbx11k_f9, + ) + from ptbench.configs.datasets.tbx11k_simplified_v2 import ( + fold_9_rgb as tbx11k_f9_rgb, + ) # Default protocol mc_ch_in_11k_dataset = mc_ch_in_11k.dataset @@ -130,7 +210,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -155,7 +236,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -180,7 +262,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -205,7 +288,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -230,7 +314,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -255,7 +340,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -280,7 +366,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -305,7 +392,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -330,7 +418,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -355,7 +444,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -380,7 +470,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -405,7 +496,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -430,7 +522,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -455,7 +548,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -480,7 +574,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -505,7 +600,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -530,7 +626,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -555,7 +652,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -580,7 +678,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -605,7 +704,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( @@ -630,7 +730,8 @@ def test_dataset_consistency(): assert len(mc_ch_in_11k_dataset["validation"]) == len( mc_dataset["validation"] ) + len(ch_dataset["validation"]) + len(in_dataset["validation"]) + len( - tbx11k_dataset["validation"]) + tbx11k_dataset["validation"] + ) assert "test" in mc_ch_in_11k_dataset assert len(mc_ch_in_11k_dataset["test"]) == len(mc_dataset["test"]) + len( diff --git a/tests/test_mc_ch_in_11kv2_RS.py b/tests/test_mc_ch_in_11kv2_RS.py index f2223948b16dfd1056b70558ee7f4e878d4d4e7c..3ee663f292a323bbcca34c1a1a280cd3f560c2dd 100644 --- a/tests/test_mc_ch_in_11kv2_RS.py +++ b/tests/test_mc_ch_in_11kv2_RS.py @@ -17,17 +17,39 @@ def test_dataset_consistency(): from ptbench.configs.datasets.indian_RS import fold_7 as indian_f7 from ptbench.configs.datasets.indian_RS import fold_8 as indian_f8 from ptbench.configs.datasets.indian_RS import fold_9 as indian_f9 - from ptbench.configs.datasets.mc_ch_in_11kv2_RS import default as mc_ch_in_11k_RS - from ptbench.configs.datasets.mc_ch_in_11kv2_RS import fold_0 as mc_ch_in_11k_f0 - from ptbench.configs.datasets.mc_ch_in_11kv2_RS import fold_1 as mc_ch_in_11k_f1 - from ptbench.configs.datasets.mc_ch_in_11kv2_RS import fold_2 as mc_ch_in_11k_f2 - from ptbench.configs.datasets.mc_ch_in_11kv2_RS import fold_3 as mc_ch_in_11k_f3 - from ptbench.configs.datasets.mc_ch_in_11kv2_RS import fold_4 as mc_ch_in_11k_f4 - from ptbench.configs.datasets.mc_ch_in_11kv2_RS import fold_5 as mc_ch_in_11k_f5 - from ptbench.configs.datasets.mc_ch_in_11kv2_RS import fold_6 as mc_ch_in_11k_f6 - from ptbench.configs.datasets.mc_ch_in_11kv2_RS import fold_7 as mc_ch_in_11k_f7 - from ptbench.configs.datasets.mc_ch_in_11kv2_RS import fold_8 as mc_ch_in_11k_f8 - from ptbench.configs.datasets.mc_ch_in_11kv2_RS import fold_9 as mc_ch_in_11k_f9 + from ptbench.configs.datasets.mc_ch_in_11kv2_RS import ( + default as mc_ch_in_11k_RS, + ) + from ptbench.configs.datasets.mc_ch_in_11kv2_RS import ( + fold_0 as mc_ch_in_11k_f0, + ) + from ptbench.configs.datasets.mc_ch_in_11kv2_RS import ( + fold_1 as mc_ch_in_11k_f1, + ) + from ptbench.configs.datasets.mc_ch_in_11kv2_RS import ( + fold_2 as mc_ch_in_11k_f2, + ) + from ptbench.configs.datasets.mc_ch_in_11kv2_RS import ( + fold_3 as mc_ch_in_11k_f3, + ) + from ptbench.configs.datasets.mc_ch_in_11kv2_RS import ( + fold_4 as mc_ch_in_11k_f4, + ) + from ptbench.configs.datasets.mc_ch_in_11kv2_RS import ( + fold_5 as mc_ch_in_11k_f5, + ) + from ptbench.configs.datasets.mc_ch_in_11kv2_RS import ( + fold_6 as mc_ch_in_11k_f6, + ) + from ptbench.configs.datasets.mc_ch_in_11kv2_RS import ( + fold_7 as mc_ch_in_11k_f7, + ) + from ptbench.configs.datasets.mc_ch_in_11kv2_RS import ( + fold_8 as mc_ch_in_11k_f8, + ) + from ptbench.configs.datasets.mc_ch_in_11kv2_RS import ( + fold_9 as mc_ch_in_11k_f9, + ) from ptbench.configs.datasets.montgomery_RS import default as mc_RS from ptbench.configs.datasets.montgomery_RS import fold_0 as mc_f0 from ptbench.configs.datasets.montgomery_RS import fold_1 as mc_f1 @@ -50,17 +72,39 @@ def test_dataset_consistency(): from ptbench.configs.datasets.shenzhen_RS import fold_7 as ch_f7 from ptbench.configs.datasets.shenzhen_RS import fold_8 as ch_f8 from ptbench.configs.datasets.shenzhen_RS import fold_9 as ch_f9 - from ptbench.configs.datasets.tbx11k_simplified_v2_RS import default as tbx11k_RS - from ptbench.configs.datasets.tbx11k_simplified_v2_RS import fold_0 as tbx11k_f0 - from ptbench.configs.datasets.tbx11k_simplified_v2_RS import fold_1 as tbx11k_f1 - from ptbench.configs.datasets.tbx11k_simplified_v2_RS import fold_2 as tbx11k_f2 - from ptbench.configs.datasets.tbx11k_simplified_v2_RS import fold_3 as tbx11k_f3 - from ptbench.configs.datasets.tbx11k_simplified_v2_RS import fold_4 as tbx11k_f4 - from ptbench.configs.datasets.tbx11k_simplified_v2_RS import fold_5 as tbx11k_f5 - from ptbench.configs.datasets.tbx11k_simplified_v2_RS import fold_6 as tbx11k_f6 - from ptbench.configs.datasets.tbx11k_simplified_v2_RS import fold_7 as tbx11k_f7 - from ptbench.configs.datasets.tbx11k_simplified_v2_RS import fold_8 as tbx11k_f8 - from ptbench.configs.datasets.tbx11k_simplified_v2_RS import fold_9 as tbx11k_f9 + from ptbench.configs.datasets.tbx11k_simplified_v2_RS import ( + default as tbx11k_RS, + ) + from ptbench.configs.datasets.tbx11k_simplified_v2_RS import ( + fold_0 as tbx11k_f0, + ) + from ptbench.configs.datasets.tbx11k_simplified_v2_RS import ( + fold_1 as tbx11k_f1, + ) + from ptbench.configs.datasets.tbx11k_simplified_v2_RS import ( + fold_2 as tbx11k_f2, + ) + from ptbench.configs.datasets.tbx11k_simplified_v2_RS import ( + fold_3 as tbx11k_f3, + ) + from ptbench.configs.datasets.tbx11k_simplified_v2_RS import ( + fold_4 as tbx11k_f4, + ) + from ptbench.configs.datasets.tbx11k_simplified_v2_RS import ( + fold_5 as tbx11k_f5, + ) + from ptbench.configs.datasets.tbx11k_simplified_v2_RS import ( + fold_6 as tbx11k_f6, + ) + from ptbench.configs.datasets.tbx11k_simplified_v2_RS import ( + fold_7 as tbx11k_f7, + ) + from ptbench.configs.datasets.tbx11k_simplified_v2_RS import ( + fold_8 as tbx11k_f8, + ) + from ptbench.configs.datasets.tbx11k_simplified_v2_RS import ( + fold_9 as tbx11k_f9, + ) # Default protocol mc_ch_in_11k_RS_dataset = mc_ch_in_11k_RS.dataset @@ -74,19 +118,23 @@ def test_dataset_consistency(): assert "train" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["train"]) == len( mc_RS_dataset["train"] - ) + len(ch_RS_dataset["train"]) + len(in_RS_dataset["train"] + len( - tbx11k_RS_dataset["train"])) + ) + len(ch_RS_dataset["train"]) + len( + in_RS_dataset["train"] + len(tbx11k_RS_dataset["train"]) + ) assert "validation" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["validation"]) == len( mc_RS_dataset["validation"] - ) + len(ch_RS_dataset["validation"]) + len(in_RS_dataset["validation"] + len( - tbx11k_RS_dataset["validation"])) + ) + len(ch_RS_dataset["validation"]) + len( + in_RS_dataset["validation"] + len(tbx11k_RS_dataset["validation"]) + ) assert "test" in mc_ch_in_11k_RS_dataset - assert len(mc_ch_in_11k_RS_dataset["test"]) == len(mc_RS_dataset["test"]) + len( - ch_RS_dataset["test"] - ) + len(in_RS_dataset["test"] + len(tbx11k_RS_dataset["test"])) + assert len(mc_ch_in_11k_RS_dataset["test"]) == len( + mc_RS_dataset["test"] + ) + len(ch_RS_dataset["test"]) + len( + in_RS_dataset["test"] + len(tbx11k_RS_dataset["test"]) + ) # Fold 0 mc_ch_in_11k_RS_dataset = mc_ch_in_11k_f0.dataset @@ -100,19 +148,23 @@ def test_dataset_consistency(): assert "train" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["train"]) == len( mc_dataset["train"] - ) + len(ch_dataset["train"]) + len(in_dataset["train"] + len( - tbx11k_dataset["train"])) + ) + len(ch_dataset["train"]) + len( + in_dataset["train"] + len(tbx11k_dataset["train"]) + ) assert "validation" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["validation"]) == len( mc_dataset["validation"] - ) + len(ch_dataset["validation"]) + len(in_dataset["validation"] + len( - tbx11k_dataset["validation"])) + ) + len(ch_dataset["validation"]) + len( + in_dataset["validation"] + len(tbx11k_dataset["validation"]) + ) assert "test" in mc_ch_in_11k_RS_dataset - assert len(mc_ch_in_11k_RS_dataset["test"]) == len(mc_dataset["test"]) + len( - ch_dataset["test"] - ) + len(in_dataset["test"] + len(tbx11k_dataset["test"])) + assert len(mc_ch_in_11k_RS_dataset["test"]) == len( + mc_dataset["test"] + ) + len(ch_dataset["test"]) + len( + in_dataset["test"] + len(tbx11k_dataset["test"]) + ) # Fold 1 mc_ch_in_11k_RS_dataset = mc_ch_in_11k_f1.dataset @@ -126,19 +178,23 @@ def test_dataset_consistency(): assert "train" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["train"]) == len( mc_dataset["train"] - ) + len(ch_dataset["train"]) + len(in_dataset["train"] + len( - tbx11k_dataset["train"])) + ) + len(ch_dataset["train"]) + len( + in_dataset["train"] + len(tbx11k_dataset["train"]) + ) assert "validation" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["validation"]) == len( mc_dataset["validation"] - ) + len(ch_dataset["validation"]) + len(in_dataset["validation"] + len( - tbx11k_dataset["validation"])) + ) + len(ch_dataset["validation"]) + len( + in_dataset["validation"] + len(tbx11k_dataset["validation"]) + ) assert "test" in mc_ch_in_11k_RS_dataset - assert len(mc_ch_in_11k_RS_dataset["test"]) == len(mc_dataset["test"]) + len( - ch_dataset["test"] - ) + len(in_dataset["test"] + len(tbx11k_dataset["test"])) + assert len(mc_ch_in_11k_RS_dataset["test"]) == len( + mc_dataset["test"] + ) + len(ch_dataset["test"]) + len( + in_dataset["test"] + len(tbx11k_dataset["test"]) + ) # Fold 2 mc_ch_in_11k_RS_dataset = mc_ch_in_11k_f2.dataset @@ -152,19 +208,23 @@ def test_dataset_consistency(): assert "train" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["train"]) == len( mc_dataset["train"] - ) + len(ch_dataset["train"]) + len(in_dataset["train"] + len( - tbx11k_dataset["train"])) + ) + len(ch_dataset["train"]) + len( + in_dataset["train"] + len(tbx11k_dataset["train"]) + ) assert "validation" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["validation"]) == len( mc_dataset["validation"] - ) + len(ch_dataset["validation"]) + len(in_dataset["validation"] + len( - tbx11k_dataset["validation"])) + ) + len(ch_dataset["validation"]) + len( + in_dataset["validation"] + len(tbx11k_dataset["validation"]) + ) assert "test" in mc_ch_in_11k_RS_dataset - assert len(mc_ch_in_11k_RS_dataset["test"]) == len(mc_dataset["test"]) + len( - ch_dataset["test"] - ) + len(in_dataset["test"] + len(tbx11k_dataset["test"])) + assert len(mc_ch_in_11k_RS_dataset["test"]) == len( + mc_dataset["test"] + ) + len(ch_dataset["test"]) + len( + in_dataset["test"] + len(tbx11k_dataset["test"]) + ) # Fold 3 mc_ch_in_11k_RS_dataset = mc_ch_in_11k_f3.dataset @@ -178,19 +238,23 @@ def test_dataset_consistency(): assert "train" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["train"]) == len( mc_dataset["train"] - ) + len(ch_dataset["train"]) + len(in_dataset["train"] + len( - tbx11k_dataset["train"])) + ) + len(ch_dataset["train"]) + len( + in_dataset["train"] + len(tbx11k_dataset["train"]) + ) assert "validation" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["validation"]) == len( mc_dataset["validation"] - ) + len(ch_dataset["validation"]) + len(in_dataset["validation"] + len( - tbx11k_dataset["validation"])) + ) + len(ch_dataset["validation"]) + len( + in_dataset["validation"] + len(tbx11k_dataset["validation"]) + ) assert "test" in mc_ch_in_11k_RS_dataset - assert len(mc_ch_in_11k_RS_dataset["test"]) == len(mc_dataset["test"]) + len( - ch_dataset["test"] - ) + len(in_dataset["test"] + len(tbx11k_dataset["test"])) + assert len(mc_ch_in_11k_RS_dataset["test"]) == len( + mc_dataset["test"] + ) + len(ch_dataset["test"]) + len( + in_dataset["test"] + len(tbx11k_dataset["test"]) + ) # Fold 4 mc_ch_in_11k_RS_dataset = mc_ch_in_11k_f4.dataset @@ -204,19 +268,23 @@ def test_dataset_consistency(): assert "train" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["train"]) == len( mc_dataset["train"] - ) + len(ch_dataset["train"]) + len(in_dataset["train"] + len( - tbx11k_dataset["train"])) + ) + len(ch_dataset["train"]) + len( + in_dataset["train"] + len(tbx11k_dataset["train"]) + ) assert "validation" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["validation"]) == len( mc_dataset["validation"] - ) + len(ch_dataset["validation"]) + len(in_dataset["validation"] + len( - tbx11k_dataset["validation"])) + ) + len(ch_dataset["validation"]) + len( + in_dataset["validation"] + len(tbx11k_dataset["validation"]) + ) assert "test" in mc_ch_in_11k_RS_dataset - assert len(mc_ch_in_11k_RS_dataset["test"]) == len(mc_dataset["test"]) + len( - ch_dataset["test"] - ) + len(in_dataset["test"] + len(tbx11k_dataset["test"])) + assert len(mc_ch_in_11k_RS_dataset["test"]) == len( + mc_dataset["test"] + ) + len(ch_dataset["test"]) + len( + in_dataset["test"] + len(tbx11k_dataset["test"]) + ) # Fold 5 mc_ch_in_11k_RS_dataset = mc_ch_in_11k_f5.dataset @@ -230,19 +298,23 @@ def test_dataset_consistency(): assert "train" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["train"]) == len( mc_dataset["train"] - ) + len(ch_dataset["train"]) + len(in_dataset["train"] + len( - tbx11k_dataset["train"])) + ) + len(ch_dataset["train"]) + len( + in_dataset["train"] + len(tbx11k_dataset["train"]) + ) assert "validation" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["validation"]) == len( mc_dataset["validation"] - ) + len(ch_dataset["validation"]) + len(in_dataset["validation"] + len( - tbx11k_dataset["validation"])) + ) + len(ch_dataset["validation"]) + len( + in_dataset["validation"] + len(tbx11k_dataset["validation"]) + ) assert "test" in mc_ch_in_11k_RS_dataset - assert len(mc_ch_in_11k_RS_dataset["test"]) == len(mc_dataset["test"]) + len( - ch_dataset["test"] - ) + len(in_dataset["test"] + len(tbx11k_dataset["test"])) + assert len(mc_ch_in_11k_RS_dataset["test"]) == len( + mc_dataset["test"] + ) + len(ch_dataset["test"]) + len( + in_dataset["test"] + len(tbx11k_dataset["test"]) + ) # Fold 6 mc_ch_in_11k_RS_dataset = mc_ch_in_11k_f6.dataset @@ -256,19 +328,23 @@ def test_dataset_consistency(): assert "train" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["train"]) == len( mc_dataset["train"] - ) + len(ch_dataset["train"]) + len(in_dataset["train"] + len( - tbx11k_dataset["train"])) + ) + len(ch_dataset["train"]) + len( + in_dataset["train"] + len(tbx11k_dataset["train"]) + ) assert "validation" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["validation"]) == len( mc_dataset["validation"] - ) + len(ch_dataset["validation"]) + len(in_dataset["validation"] + len( - tbx11k_dataset["validation"])) + ) + len(ch_dataset["validation"]) + len( + in_dataset["validation"] + len(tbx11k_dataset["validation"]) + ) assert "test" in mc_ch_in_11k_RS_dataset - assert len(mc_ch_in_11k_RS_dataset["test"]) == len(mc_dataset["test"]) + len( - ch_dataset["test"] - ) + len(in_dataset["test"] + len(tbx11k_dataset["test"])) + assert len(mc_ch_in_11k_RS_dataset["test"]) == len( + mc_dataset["test"] + ) + len(ch_dataset["test"]) + len( + in_dataset["test"] + len(tbx11k_dataset["test"]) + ) # Fold 7 mc_ch_in_11k_RS_dataset = mc_ch_in_11k_f7.dataset @@ -282,19 +358,23 @@ def test_dataset_consistency(): assert "train" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["train"]) == len( mc_dataset["train"] - ) + len(ch_dataset["train"]) + len(in_dataset["train"] + len( - tbx11k_dataset["train"])) + ) + len(ch_dataset["train"]) + len( + in_dataset["train"] + len(tbx11k_dataset["train"]) + ) assert "validation" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["validation"]) == len( mc_dataset["validation"] - ) + len(ch_dataset["validation"]) + len(in_dataset["validation"] + len( - tbx11k_dataset["validation"])) + ) + len(ch_dataset["validation"]) + len( + in_dataset["validation"] + len(tbx11k_dataset["validation"]) + ) assert "test" in mc_ch_in_11k_RS_dataset - assert len(mc_ch_in_11k_RS_dataset["test"]) == len(mc_dataset["test"]) + len( - ch_dataset["test"] - ) + len(in_dataset["test"] + len(tbx11k_dataset["test"])) + assert len(mc_ch_in_11k_RS_dataset["test"]) == len( + mc_dataset["test"] + ) + len(ch_dataset["test"]) + len( + in_dataset["test"] + len(tbx11k_dataset["test"]) + ) # Fold 8 mc_ch_in_11k_RS_dataset = mc_ch_in_11k_f8.dataset @@ -308,19 +388,23 @@ def test_dataset_consistency(): assert "train" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["train"]) == len( mc_dataset["train"] - ) + len(ch_dataset["train"]) + len(in_dataset["train"] + len( - tbx11k_dataset["train"])) + ) + len(ch_dataset["train"]) + len( + in_dataset["train"] + len(tbx11k_dataset["train"]) + ) assert "validation" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["validation"]) == len( mc_dataset["validation"] - ) + len(ch_dataset["validation"]) + len(in_dataset["validation"] + len( - tbx11k_dataset["validation"])) + ) + len(ch_dataset["validation"]) + len( + in_dataset["validation"] + len(tbx11k_dataset["validation"]) + ) assert "test" in mc_ch_in_11k_RS_dataset - assert len(mc_ch_in_11k_RS_dataset["test"]) == len(mc_dataset["test"]) + len( - ch_dataset["test"] - ) + len(in_dataset["test"] + len(tbx11k_dataset["test"])) + assert len(mc_ch_in_11k_RS_dataset["test"]) == len( + mc_dataset["test"] + ) + len(ch_dataset["test"]) + len( + in_dataset["test"] + len(tbx11k_dataset["test"]) + ) # Fold 9 mc_ch_in_11k_RS_dataset = mc_ch_in_11k_f9.dataset @@ -334,16 +418,20 @@ def test_dataset_consistency(): assert "train" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["train"]) == len( mc_dataset["train"] - ) + len(ch_dataset["train"]) + len(in_dataset["train"] + len( - tbx11k_dataset["train"])) + ) + len(ch_dataset["train"]) + len( + in_dataset["train"] + len(tbx11k_dataset["train"]) + ) assert "validation" in mc_ch_in_11k_RS_dataset assert len(mc_ch_in_11k_RS_dataset["validation"]) == len( mc_dataset["validation"] - ) + len(ch_dataset["validation"]) + len(in_dataset["validation"] + len( - tbx11k_dataset["validation"])) + ) + len(ch_dataset["validation"]) + len( + in_dataset["validation"] + len(tbx11k_dataset["validation"]) + ) assert "test" in mc_ch_in_11k_RS_dataset - assert len(mc_ch_in_11k_RS_dataset["test"]) == len(mc_dataset["test"]) + len( - ch_dataset["test"] - ) + len(in_dataset["test"] + len(tbx11k_dataset["test"])) + assert len(mc_ch_in_11k_RS_dataset["test"]) == len( + mc_dataset["test"] + ) + len(ch_dataset["test"]) + len( + in_dataset["test"] + len(tbx11k_dataset["test"]) + )