[data.shenzhen] Use right split name; separate split creation so it is reusable

src/ptbench/data/shenzhen/datamodule.py

@@ -13,6 +13,7 @@ from ...utils.rc import load_rc
 from ..datamodule import CachingDataModule
 from ..image_utils import remove_black_borders
 from ..split import JSONDatabaseSplit
+from ..typing import DatabaseSplit
 from ..typing import RawDataLoader as _BaseRawDataLoader
 from ..typing import Sample
 
@@ -93,6 +94,14 @@ class RawDataLoader(_BaseRawDataLoader):
         return sample[1]
 
 
+def make_split(basename: str) -> DatabaseSplit:
+    """Returns a database split for the Shenzhen database."""
+
+    return JSONDatabaseSplit(
+        importlib.resources.files(__name__.rsplit(".", 1)[0]).joinpath(basename)
+    )
+
+
 class DataModule(CachingDataModule):
     """Shenzhen datamodule for computer-aided diagnosis.
 
@@ -128,10 +137,6 @@ class DataModule(CachingDataModule):
 
     def __init__(self, split_filename: str):
         super().__init__(
-            database_split=JSONDatabaseSplit(
-                importlib.resources.files(__name__.rsplit(".", 1)[0]).joinpath(
-                    split_filename
-                )
-            ),
+            database_split=make_split(split_filename),
             raw_data_loader=RawDataLoader(),
         )

src/ptbench/data/shenzhen/default.py

@@ -4,7 +4,7 @@
 
 from .datamodule import DataModule
 
-datamodule = DataModule("default.json.bz2")
+datamodule = DataModule("default.json")
 """Default Shenzen TB database split.
 
 * Training samples: 64% of TB and healthy CXR (including labels)

src/ptbench/data/shenzhen/fold_0.py

@@ -4,4 +4,4 @@
 
 from .datamodule import DataModule
 
-datamodule = DataModule("fold_0.json.bz2")
+datamodule = DataModule("fold_0.json")

src/ptbench/data/shenzhen/fold_1.py

@@ -4,4 +4,4 @@
 
 from .datamodule import DataModule
 
-datamodule = DataModule("fold_1.json.bz2")
+datamodule = DataModule("fold_1.json")

src/ptbench/data/shenzhen/fold_2.py

@@ -4,4 +4,4 @@
 
 from .datamodule import DataModule
 
-datamodule = DataModule("fold_2.json.bz2")
+datamodule = DataModule("fold_2.json")

src/ptbench/data/shenzhen/fold_3.py

@@ -4,4 +4,4 @@
 
 from .datamodule import DataModule
 
-datamodule = DataModule("fold_3.json.bz2")
+datamodule = DataModule("fold_3.json")

src/ptbench/data/shenzhen/fold_4.py

@@ -4,4 +4,4 @@
 
 from .datamodule import DataModule
 
-datamodule = DataModule("fold_4.json.bz2")
+datamodule = DataModule("fold_4.json")

src/ptbench/data/shenzhen/fold_5.py

@@ -4,4 +4,4 @@
 
 from .datamodule import DataModule
 
-datamodule = DataModule("fold_5.json.bz2")
+datamodule = DataModule("fold_5.json")

src/ptbench/data/shenzhen/fold_6.py

@@ -4,4 +4,4 @@
 
 from .datamodule import DataModule
 
-datamodule = DataModule("fold_6.json.bz2")
+datamodule = DataModule("fold_6.json")

src/ptbench/data/shenzhen/fold_7.py

@@ -4,4 +4,4 @@
 
 from .datamodule import DataModule
 
-datamodule = DataModule("fold_7.json.bz2")
+datamodule = DataModule("fold_7.json")

src/ptbench/data/shenzhen/fold_8.py

@@ -4,4 +4,4 @@
 
 from .datamodule import DataModule
 
-datamodule = DataModule("fold_8.json.bz2")
+datamodule = DataModule("fold_8.json")

src/ptbench/data/shenzhen/fold_9.py

@@ -4,4 +4,4 @@
 
 from .datamodule import DataModule
 
-datamodule = DataModule("fold_9.json.bz2")
+datamodule = DataModule("fold_9.json")