diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/pyproject.toml b/pyproject.toml
index 95f54b8dcadd02d3d5e3ce0611d196454a6ac4d5..34b75b6a14e86ff59cc1f5d9c316a9b3ebac6578 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -151,7 +151,7 @@ test = "pytest -sv tests/"
test-slow = { cmd = "pytest -sv tests/", env = { PYTEST_ADDOPTS = "-m slow" } }
test-fast = { cmd = "pytest -sv tests/", env = { PYTEST_ADDOPTS = "-m '(not slow)'" } }
test-cov = "pytest -sv --cov-report 'html:html/coverage' tests/"
-test-ci = "cp tests/classification/data/mednet.toml $XDG_CONFIG_HOME && pytest -sv --cov-report 'html:html/coverage' --cov-report 'xml:coverage.xml' --junitxml 'junit-coverage.xml' --ignore '.profile' tests/"
+test-ci = "cp tests/data/mednet.toml $XDG_CONFIG_HOME && pytest -sv --cov-report 'html:html/coverage' --cov-report 'xml:coverage.xml' --junitxml 'junit-coverage.xml' --ignore '.profile' tests/"
[tool.pixi.feature.build.dependencies]
hatch = "*"
diff --git a/tests/classification/data/lfs/.gitattributes b/tests/classification/data/lfs/.gitattributes
deleted file mode 100644
index ebbbf5f9ef5538de427dbe579433ef3349c20cad..0000000000000000000000000000000000000000
--- a/tests/classification/data/lfs/.gitattributes
+++ /dev/null
@@ -1,6 +0,0 @@
-_test_densenetrs_checkpoint.pth filter=lfs diff=lfs merge=lfs -text
-_test_fpasa_checkpoint.pth filter=lfs diff=lfs merge=lfs -text
-_test_logreg_checkpoint.pth filter=lfs diff=lfs merge=lfs -text
-_test_signstotb_checkpoint.pth filter=lfs diff=lfs merge=lfs -text
-_testdb.zip filter=lfs diff=lfs merge=lfs -text
-pasa.pth filter=lfs diff=lfs merge=lfs -text
diff --git a/tests/classification/data/lfs/.gitignore b/tests/classification/data/lfs/.gitignore
deleted file mode 100644
index b25c15b81fae06e1c55946ac6270bfdb293870e8..0000000000000000000000000000000000000000
--- a/tests/classification/data/lfs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*~
diff --git a/tests/classification/data/lfs/README.md b/tests/classification/data/lfs/README.md
deleted file mode 100644
index bc66bf5e69eb8db14bb357d1c3278697f7491e2b..0000000000000000000000000000000000000000
--- a/tests/classification/data/lfs/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Assets for Testing biosignal/software/mednet>
-
-This package contains test unit assets used by the test suit of
-biosignal/software/mednet>.
-
-
-## Updating
-
-To update the contents of this package, use [git-lfs](https://git-lfs.com),
-following the workflow described at the [GitLab support
-page](https://docs.gitlab.com/ee/topics/git/lfs/).
-
-Cloning and updating the repository, in particular, works the same as before
-and should not impose any workflow changes.
diff --git a/tests/classification/data/lfs/models/logreg.ckpt b/tests/classification/data/lfs/models/logreg.ckpt
deleted file mode 100644
index b8609b572753ff637cac6edb39d643ec683abebb..0000000000000000000000000000000000000000
Binary files a/tests/classification/data/lfs/models/logreg.ckpt and /dev/null differ
diff --git a/tests/classification/data/lfs/models/signstotb.ckpt b/tests/classification/data/lfs/models/signstotb.ckpt
deleted file mode 100644
index 59ea4595166b871e031c9664c1e0581081f3412e..0000000000000000000000000000000000000000
Binary files a/tests/classification/data/lfs/models/signstotb.ckpt and /dev/null differ
diff --git a/tests/classification/test_cli_classification.py b/tests/classification/test_cli.py
similarity index 100%
rename from tests/classification/test_cli_classification.py
rename to tests/classification/test_cli.py
diff --git a/tests/classification/test_hivtb.py b/tests/classification/test_hivtb.py
index 91258839bb00566b1330dd364a5f3555e4e4c47f..547346fddd6e381c97223b2ca66dc62a86ebfd97 100644
--- a/tests/classification/test_hivtb.py
+++ b/tests/classification/test_hivtb.py
@@ -103,6 +103,7 @@ def test_loading(database_checkers, name: str, dataset: str):
prefixes=("HIV-TB_Algorithm_study_X-rays",),
possible_labels=(0, 1),
expected_num_labels=1,
+ expected_meta_size=2,
)
limit -= 1
diff --git a/tests/classification/test_indian.py b/tests/classification/test_indian.py
index 952bc9b76727e72e25c41efe3bdfeb1de8e17cc8..dcd4236fa558d7bc460c333c0bf9a8301becdb7b 100644
--- a/tests/classification/test_indian.py
+++ b/tests/classification/test_indian.py
@@ -108,6 +108,7 @@ def test_loading(database_checkers, name: str, dataset: str):
prefixes=("DatasetA/Training", "DatasetA/Testing"),
possible_labels=(0, 1),
expected_num_labels=1,
+ expected_meta_size=2,
)
limit -= 1
diff --git a/tests/classification/test_montgomery.py b/tests/classification/test_montgomery.py
index ef8715ea8b8caf2e3047831bcccd01863e53e25e..494528dc61dcaaac195c79cea22ba32d37db8e32 100644
--- a/tests/classification/test_montgomery.py
+++ b/tests/classification/test_montgomery.py
@@ -108,6 +108,7 @@ def test_loading(database_checkers, name: str, dataset: str):
prefixes=("CXR_png/MCUCXR_0",),
possible_labels=(0, 1),
expected_num_labels=1,
+ expected_meta_size=2,
)
limit -= 1
diff --git a/tests/classification/test_nih_cxr14.py b/tests/classification/test_nih_cxr14.py
index da5504ba37695368c7a77a3bc1e25b5a51a14b89..1d2c2222e16c0cb55e796da2b6b418e00e8a757d 100644
--- a/tests/classification/test_nih_cxr14.py
+++ b/tests/classification/test_nih_cxr14.py
@@ -83,6 +83,7 @@ def test_loading(database_checkers, name: str, dataset: str, num_labels: int):
possible_labels=(0, 1),
expected_num_labels=num_labels,
expected_image_shape=(1, 1024, 1024),
+ expected_meta_size=2,
)
limit -= 1
diff --git a/tests/classification/test_padchest.py b/tests/classification/test_padchest.py
index af6007df4abb53f4d14fd964da4ad9e129eca804..78ce812a45321db783c3a3c799934039f3f62122 100644
--- a/tests/classification/test_padchest.py
+++ b/tests/classification/test_padchest.py
@@ -88,6 +88,7 @@ def test_loading(database_checkers, name: str, dataset: str, num_labels: int):
prefixes=("",),
possible_labels=(0, 1),
expected_num_labels=num_labels,
+ expected_meta_size=2,
)
limit -= 1
diff --git a/tests/classification/test_shenzhen.py b/tests/classification/test_shenzhen.py
index afc55032dc27fa6e29d6515387f37888d2ed8f20..2c31ac26150fb36b989fce4fb5fda4f726428f4e 100644
--- a/tests/classification/test_shenzhen.py
+++ b/tests/classification/test_shenzhen.py
@@ -105,6 +105,7 @@ def test_loading(database_checkers, name: str, dataset: str):
prefixes=("CXR_png/CHNCXR_0",),
possible_labels=(0, 1),
expected_num_labels=1,
+ expected_meta_size=2,
)
limit -= 1
diff --git a/tests/classification/test_tbpoc.py b/tests/classification/test_tbpoc.py
index 81288179e3cc7590726483faefa300344c50edeb..66dcd46ad9b07d59a3b406528500fdd585e16c07 100644
--- a/tests/classification/test_tbpoc.py
+++ b/tests/classification/test_tbpoc.py
@@ -109,6 +109,7 @@ def test_loading(database_checkers, name: str, dataset: str):
),
possible_labels=(0, 1),
expected_num_labels=1,
+ expected_meta_size=2,
)
limit -= 1
diff --git a/tests/common/__init__.py b/tests/common/__init__.py
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/tests/common/conftest.py b/tests/common/conftest.py
deleted file mode 100644
index e9c23ab2fa4c458078c42f5d0c5cdd3045cc0d9a..0000000000000000000000000000000000000000
--- a/tests/common/conftest.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# SPDX-FileCopyrightText: Copyright © 2023 Idiap Research Institute <contact@idiap.ch>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import pathlib
-
-import pytest
-
-
-@pytest.fixture
-def datadir(request) -> pathlib.Path:
- """Return the directory in which the test is sitting. Check the pytest
- documentation for more information.
-
- Parameters
- ----------
- request
- Information of the requesting test function.
-
- Returns
- -------
- pathlib.Path
- The directory in which the test is sitting.
- """
-
- return pathlib.Path(request.module.__file__).parents[0] / "data"
diff --git a/tests/common/data/iris-test.csv b/tests/common/data/iris-test.csv
deleted file mode 100644
index 27d1b05a7aa70667844b74778504f3b51c624884..0000000000000000000000000000000000000000
--- a/tests/common/data/iris-test.csv
+++ /dev/null
@@ -1,75 +0,0 @@
-5,3,1.6,0.2,Iris-setosa
-5,3.4,1.6,0.4,Iris-setosa
-5.2,3.5,1.5,0.2,Iris-setosa
-5.2,3.4,1.4,0.2,Iris-setosa
-4.7,3.2,1.6,0.2,Iris-setosa
-4.8,3.1,1.6,0.2,Iris-setosa
-5.4,3.4,1.5,0.4,Iris-setosa
-5.2,4.1,1.5,0.1,Iris-setosa
-5.5,4.2,1.4,0.2,Iris-setosa
-4.9,3.1,1.5,0.1,Iris-setosa
-5,3.2,1.2,0.2,Iris-setosa
-5.5,3.5,1.3,0.2,Iris-setosa
-4.9,3.1,1.5,0.1,Iris-setosa
-4.4,3,1.3,0.2,Iris-setosa
-5.1,3.4,1.5,0.2,Iris-setosa
-5,3.5,1.3,0.3,Iris-setosa
-4.5,2.3,1.3,0.3,Iris-setosa
-4.4,3.2,1.3,0.2,Iris-setosa
-5,3.5,1.6,0.6,Iris-setosa
-5.1,3.8,1.9,0.4,Iris-setosa
-4.8,3,1.4,0.3,Iris-setosa
-5.1,3.8,1.6,0.2,Iris-setosa
-4.6,3.2,1.4,0.2,Iris-setosa
-5.3,3.7,1.5,0.2,Iris-setosa
-5,3.3,1.4,0.2,Iris-setosa
-6.6,3,4.4,1.4,Iris-versicolor
-6.8,2.8,4.8,1.4,Iris-versicolor
-6.7,3,5,1.7,Iris-versicolor
-6,2.9,4.5,1.5,Iris-versicolor
-5.7,2.6,3.5,1,Iris-versicolor
-5.5,2.4,3.8,1.1,Iris-versicolor
-5.5,2.4,3.7,1,Iris-versicolor
-5.8,2.7,3.9,1.2,Iris-versicolor
-6,2.7,5.1,1.6,Iris-versicolor
-5.4,3,4.5,1.5,Iris-versicolor
-6,3.4,4.5,1.6,Iris-versicolor
-6.7,3.1,4.7,1.5,Iris-versicolor
-6.3,2.3,4.4,1.3,Iris-versicolor
-5.6,3,4.1,1.3,Iris-versicolor
-5.5,2.5,4,1.3,Iris-versicolor
-5.5,2.6,4.4,1.2,Iris-versicolor
-6.1,3,4.6,1.4,Iris-versicolor
-5.8,2.6,4,1.2,Iris-versicolor
-5,2.3,3.3,1,Iris-versicolor
-5.6,2.7,4.2,1.3,Iris-versicolor
-5.7,3,4.2,1.2,Iris-versicolor
-5.7,2.9,4.2,1.3,Iris-versicolor
-6.2,2.9,4.3,1.3,Iris-versicolor
-5.1,2.5,3,1.1,Iris-versicolor
-5.7,2.8,4.1,1.3,Iris-versicolor
-7.2,3.2,6,1.8,Iris-virginica
-6.2,2.8,4.8,1.8,Iris-virginica
-6.1,3,4.9,1.8,Iris-virginica
-6.4,2.8,5.6,2.1,Iris-virginica
-7.2,3,5.8,1.6,Iris-virginica
-7.4,2.8,6.1,1.9,Iris-virginica
-7.9,3.8,6.4,2,Iris-virginica
-6.4,2.8,5.6,2.2,Iris-virginica
-6.3,2.8,5.1,1.5,Iris-virginica
-6.1,2.6,5.6,1.4,Iris-virginica
-7.7,3,6.1,2.3,Iris-virginica
-6.3,3.4,5.6,2.4,Iris-virginica
-6.4,3.1,5.5,1.8,Iris-virginica
-6,3,4.8,1.8,Iris-virginica
-6.9,3.1,5.4,2.1,Iris-virginica
-6.7,3.1,5.6,2.4,Iris-virginica
-6.9,3.1,5.1,2.3,Iris-virginica
-5.8,2.7,5.1,1.9,Iris-virginica
-6.8,3.2,5.9,2.3,Iris-virginica
-6.7,3.3,5.7,2.5,Iris-virginica
-6.7,3,5.2,2.3,Iris-virginica
-6.3,2.5,5,1.9,Iris-virginica
-6.5,3,5.2,2,Iris-virginica
-6.2,3.4,5.4,2.3,Iris-virginica
-5.9,3,5.1,1.8,Iris-virginica
diff --git a/tests/common/data/iris-train.csv b/tests/common/data/iris-train.csv
deleted file mode 100644
index 82d5b134803975463f070aebe6847e7c742749d2..0000000000000000000000000000000000000000
--- a/tests/common/data/iris-train.csv
+++ /dev/null
@@ -1,75 +0,0 @@
-5.1,3.5,1.4,0.2,Iris-setosa
-4.9,3,1.4,0.2,Iris-setosa
-4.7,3.2,1.3,0.2,Iris-setosa
-4.6,3.1,1.5,0.2,Iris-setosa
-5,3.6,1.4,0.2,Iris-setosa
-5.4,3.9,1.7,0.4,Iris-setosa
-4.6,3.4,1.4,0.3,Iris-setosa
-5,3.4,1.5,0.2,Iris-setosa
-4.4,2.9,1.4,0.2,Iris-setosa
-4.9,3.1,1.5,0.1,Iris-setosa
-5.4,3.7,1.5,0.2,Iris-setosa
-4.8,3.4,1.6,0.2,Iris-setosa
-4.8,3,1.4,0.1,Iris-setosa
-4.3,3,1.1,0.1,Iris-setosa
-5.8,4,1.2,0.2,Iris-setosa
-5.7,4.4,1.5,0.4,Iris-setosa
-5.4,3.9,1.3,0.4,Iris-setosa
-5.1,3.5,1.4,0.3,Iris-setosa
-5.7,3.8,1.7,0.3,Iris-setosa
-5.1,3.8,1.5,0.3,Iris-setosa
-5.4,3.4,1.7,0.2,Iris-setosa
-5.1,3.7,1.5,0.4,Iris-setosa
-4.6,3.6,1,0.2,Iris-setosa
-5.1,3.3,1.7,0.5,Iris-setosa
-4.8,3.4,1.9,0.2,Iris-setosa
-7,3.2,4.7,1.4,Iris-versicolor
-6.4,3.2,4.5,1.5,Iris-versicolor
-6.9,3.1,4.9,1.5,Iris-versicolor
-5.5,2.3,4,1.3,Iris-versicolor
-6.5,2.8,4.6,1.5,Iris-versicolor
-5.7,2.8,4.5,1.3,Iris-versicolor
-6.3,3.3,4.7,1.6,Iris-versicolor
-4.9,2.4,3.3,1,Iris-versicolor
-6.6,2.9,4.6,1.3,Iris-versicolor
-5.2,2.7,3.9,1.4,Iris-versicolor
-5,2,3.5,1,Iris-versicolor
-5.9,3,4.2,1.5,Iris-versicolor
-6,2.2,4,1,Iris-versicolor
-6.1,2.9,4.7,1.4,Iris-versicolor
-5.6,2.9,3.6,1.3,Iris-versicolor
-6.7,3.1,4.4,1.4,Iris-versicolor
-5.6,3,4.5,1.5,Iris-versicolor
-5.8,2.7,4.1,1,Iris-versicolor
-6.2,2.2,4.5,1.5,Iris-versicolor
-5.6,2.5,3.9,1.1,Iris-versicolor
-5.9,3.2,4.8,1.8,Iris-versicolor
-6.1,2.8,4,1.3,Iris-versicolor
-6.3,2.5,4.9,1.5,Iris-versicolor
-6.1,2.8,4.7,1.2,Iris-versicolor
-6.4,2.9,4.3,1.3,Iris-versicolor
-6.3,3.3,6,2.5,Iris-virginica
-5.8,2.7,5.1,1.9,Iris-virginica
-7.1,3,5.9,2.1,Iris-virginica
-6.3,2.9,5.6,1.8,Iris-virginica
-6.5,3,5.8,2.2,Iris-virginica
-7.6,3,6.6,2.1,Iris-virginica
-4.9,2.5,4.5,1.7,Iris-virginica
-7.3,2.9,6.3,1.8,Iris-virginica
-6.7,2.5,5.8,1.8,Iris-virginica
-7.2,3.6,6.1,2.5,Iris-virginica
-6.5,3.2,5.1,2,Iris-virginica
-6.4,2.7,5.3,1.9,Iris-virginica
-6.8,3,5.5,2.1,Iris-virginica
-5.7,2.5,5,2,Iris-virginica
-5.8,2.8,5.1,2.4,Iris-virginica
-6.4,3.2,5.3,2.3,Iris-virginica
-6.5,3,5.5,1.8,Iris-virginica
-7.7,3.8,6.7,2.2,Iris-virginica
-7.7,2.6,6.9,2.3,Iris-virginica
-6,2.2,5,1.5,Iris-virginica
-6.9,3.2,5.7,2.3,Iris-virginica
-5.6,2.8,4.9,2,Iris-virginica
-7.7,2.8,6.7,2,Iris-virginica
-6.3,2.7,4.9,1.8,Iris-virginica
-6.7,3.3,5.7,2.1,Iris-virginica
diff --git a/tests/classification/conftest.py b/tests/conftest.py
similarity index 86%
rename from tests/classification/conftest.py
rename to tests/conftest.py
index 97d423782a9b1e4c3bbafe05731ee5ad71eaff34..36e5fa5b1fa427a98eb8d4c390a9eb371e5724a4 100644
--- a/tests/classification/conftest.py
+++ b/tests/conftest.py
@@ -44,7 +44,7 @@ def pytest_configure(config):
config.addinivalue_line(
"markers",
"skip_if_rc_var_not_set(name): this mark skips the test if a certain "
- "~/.config/mednet.libs.classification.toml variable is not set",
+ "~/.config/mednet.toml variable is not set",
)
config.addinivalue_line("markers", "slow: this mark indicates slow tests")
@@ -134,14 +134,19 @@ class DatabaseCheckers:
assert len(split[k]) == lengths[k]
for s in split[k]:
- assert any([s[0].startswith(k) for k in prefixes]), (
- f"Sample with name {s[0]} does not start with any of the "
- f"prefixes in {prefixes}"
- )
- if isinstance(s[1], list):
- assert all([k in possible_labels for k in s[1]])
- else:
- assert s[1] in possible_labels
+ # check filename prefixes match, if prefixes were passed
+ if prefixes:
+ assert any([s[0].startswith(k) for k in prefixes]), (
+ f"Sample with name {s[0]} does not start with any of the "
+ f"prefixes in {prefixes}"
+ )
+
+ # check if labels match, if labels were passed
+ if possible_labels:
+ if isinstance(s[1], list):
+ assert all([k in possible_labels for k in s[1]])
+ else:
+ assert s[1] in possible_labels
@staticmethod
def check_loaded_batch(
@@ -151,6 +156,7 @@ class DatabaseCheckers:
prefixes: typing.Sequence[str],
possible_labels: typing.Sequence[int],
expected_num_labels: int,
+ expected_meta_size: int,
expected_image_shape: tuple[int, ...] | None = None,
):
"""Check the consistency of an individual (loaded) batch.
@@ -170,6 +176,9 @@ class DatabaseCheckers:
These are the list of possible labels contained in any split.
expected_num_labels
The expected number of labels each sample should have.
+ expected_meta_size
+ The expected number of elements on the meta-information dictionary
+ on every sample.
expected_image_shape
The expected shape of the image (num_channels, width, height).
"""
@@ -186,18 +195,20 @@ class DatabaseCheckers:
)
assert isinstance(batch[1], dict) # metadata
- assert len(batch[1]) == 2 # label and name
+ assert len(batch[1]) == expected_meta_size
assert "target" in batch[1]
- assert all([k in possible_labels for k in batch[1]["target"]])
+ if possible_labels:
+ assert all([k in possible_labels for k in batch[1]["target"]])
if expected_num_labels:
assert len(batch[1]["target"]) == expected_num_labels
assert "name" in batch[1]
- assert all(
- [any([k.startswith(j) for j in prefixes]) for k in batch[1]["name"]],
- )
+ if prefixes:
+ assert all(
+ [any([k.startswith(j) for j in prefixes]) for k in batch[1]["name"]],
+ )
# use the code below to view generated images
# from torchvision.transforms.functional import to_pil_image
diff --git a/tests/common/data/16bits.png b/tests/data/16bits.png
similarity index 100%
rename from tests/common/data/16bits.png
rename to tests/data/16bits.png
diff --git a/tests/common/data/iris.json b/tests/data/iris.json
similarity index 100%
rename from tests/common/data/iris.json
rename to tests/data/iris.json
diff --git a/tests/classification/data/mednet.toml b/tests/data/mednet.toml
similarity index 50%
rename from tests/classification/data/mednet.toml
rename to tests/data/mednet.toml
index 283c099805863751a6dfd7d3b6e26d26c43657f7..6096cb4bf90a97e1969ff1438ac904cd7cb98193 100644
--- a/tests/classification/data/mednet.toml
+++ b/tests/data/mednet.toml
@@ -1,6 +1,16 @@
[datadir]
+# classification
+indian = "/idiap/resource/database/TBXpredict"
+tbx11k = "/idiap/resource/database/tbx11k"
+
+# segmentation
+chasedb1 = "/idiap/resource/database/CHASE-DB1"
+drive = "/idiap/resource/database/DRIVE"
+hrf = "/idiap/resource/database/HRF"
+jsrt = "/idiap/resource/database/JSRT"
+stare = "/idiap/resource/database/STARE"
+
+# classification and segmentation
#montgomery = "/idiap/resource/database/MontgomeryXraySet"
montgomery = "/idiap/resource/database/montgomery-preprocessed"
shenzhen = "/idiap/resource/database/ShenzhenXraySet"
-indian = "/idiap/resource/database/TBXpredict"
-tbx11k = "/idiap/resource/database/tbx11k"
diff --git a/tests/common/data/raw_with_black_border.png b/tests/data/raw_with_black_border.png
similarity index 100%
rename from tests/common/data/raw_with_black_border.png
rename to tests/data/raw_with_black_border.png
diff --git a/tests/common/data/raw_with_elastic_deformation.png b/tests/data/raw_with_elastic_deformation.png
similarity index 100%
rename from tests/common/data/raw_with_elastic_deformation.png
rename to tests/data/raw_with_elastic_deformation.png
diff --git a/tests/common/data/raw_without_black_border.png b/tests/data/raw_without_black_border.png
similarity index 100%
rename from tests/common/data/raw_without_black_border.png
rename to tests/data/raw_without_black_border.png
diff --git a/tests/common/data/raw_without_elastic_deformation.png b/tests/data/raw_without_elastic_deformation.png
similarity index 100%
rename from tests/common/data/raw_without_elastic_deformation.png
rename to tests/data/raw_without_elastic_deformation.png
diff --git a/tests/segmentation/conftest.py b/tests/segmentation/conftest.py
deleted file mode 100644
index ce7e932ffc97775ac2cddd80fc50fd6cb8dde757..0000000000000000000000000000000000000000
--- a/tests/segmentation/conftest.py
+++ /dev/null
@@ -1,253 +0,0 @@
-# SPDX-FileCopyrightText: Copyright © 2023 Idiap Research Institute <contact@idiap.ch>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import pathlib
-import typing
-
-import numpy
-import pytest
-import torch
-from mednet.libs.common.data.split import JSONDatabaseSplit
-from mednet.libs.common.data.typing import DatabaseSplit
-
-
-@pytest.fixture
-def datadir(request) -> pathlib.Path:
- """Return the directory in which the test is sitting. Check the pytest
- documentation for more information.
-
- Parameters
- ----------
- request
- Information of the requesting test function.
-
- Returns
- -------
- pathlib.Path
- The directory in which the test is sitting.
- """
-
- return pathlib.Path(request.module.__file__).parents[0] / "data"
-
-
-def pytest_configure(config):
- """This function is run once for pytest setup.
-
- Parameters
- ----------
- config
- Configuration values. Check the pytest documentation for more
- information.
- """
-
- config.addinivalue_line(
- "markers",
- "skip_if_rc_var_not_set(name): this mark skips the test if a certain "
- "~/.config/mednet.libs.segmentation.toml variable is not set",
- )
-
- config.addinivalue_line("markers", "slow: this mark indicates slow tests")
-
-
-def pytest_runtest_setup(item):
- """This function is run for every test candidate in this directory.
-
- The test is run if this function returns ``None``. To skip a test,
- call ``pytest.skip()``, specifying a reason.
-
- Parameters
- ----------
- item
- A test invocation item. Check the pytest documentation for more
- information.
- """
-
- from mednet.libs.common.utils.rc import load_rc
-
- rc = load_rc()
-
- # iterates over all markers for the item being examined, get the first
- # argument and accumulate these names
- rc_names = [
- mark.args[0] for mark in item.iter_markers(name="skip_if_rc_var_not_set")
- ]
-
- # checks all names mentioned are set in ~/.config/mednet.libs.segmentation.toml, otherwise,
- # skip the test
- if rc_names:
- missing = [k for k in rc_names if rc.get(k) is None]
- if any(missing):
- pytest.skip(
- f"Test skipped because {', '.join(missing)} is **not** "
- f"set in ~/.config/mednet.libs.segmentation.toml",
- )
-
-
-def rc_variable_set(name):
- from mednet.libs.common.utils.rc import load_rc
-
- rc = load_rc()
- pytest.mark.skipif(
- name not in rc,
- reason=f"RC variable '{name}' is not set",
- )
-
-
-@pytest.fixture(scope="session")
-def temporary_basedir(tmp_path_factory):
- return tmp_path_factory.mktemp("test-cli")
-
-
-class DatabaseCheckers:
- """Helpers for database tests."""
-
- @staticmethod
- def check_split(
- split: DatabaseSplit,
- lengths: dict[str, int],
- prefixes: typing.Sequence[str] = None,
- ):
- """Run a simple consistency check on the data split.
-
- Parameters
- ----------
- split
- An instance of DatabaseSplit.
- lengths
- A dictionary that contains keys matching those of the split (this
- will be checked). The values of the dictionary should correspond
- to the sizes of each of the datasets in the split.
- prefixes
- Each file named in a split should start with at least one of these
- prefixes.
- """
-
- assert len(split) == len(lengths)
-
- for k in lengths.keys():
- # dataset must have been declared
- assert k in split
-
- assert len(split[k]) == lengths[k]
- for s in split[k]:
- if prefixes is not None:
- assert any([s[0].startswith(k) for k in prefixes]), (
- f"Sample with name {s[0]} does not start with any of the "
- f"prefixes in {prefixes}"
- )
-
- @staticmethod
- def check_loaded_batch(
- batch,
- batch_size: int,
- color_planes: int,
- expected_num_targets: int,
- prefixes: typing.Sequence[str] = None,
- expected_image_shape: tuple[int, ...] | None = None,
- ):
- """Check the consistency of an individual (loaded) batch.
-
- Parameters
- ----------
- batch
- The loaded batch to be checked.
- batch_size
- The mini-batch size.
- color_planes
- The number of color planes in the images.
- expected_num_targets
- The expected number of labels each sample should have.
- prefixes
- Each file named in a split should start with at least one of these
- prefixes.
- expected_image_shape
- The expected shape of the image (num_channels, width, height).
- """
-
- assert len(batch) == 2 # sample, metadata
-
- assert isinstance(batch[0], torch.Tensor)
- assert batch[0].shape[0] == batch_size # mini-batch size
- assert batch[0].shape[1] == color_planes
- assert all([isinstance(image, torch.Tensor) for image in batch[0]])
-
- if expected_image_shape:
- assert all(
- [data.shape == expected_image_shape for data in batch[0]],
- )
-
- assert isinstance(batch[1], dict) # metadata
- assert len(batch[1]) in [2, 3] # target, Optional(mask), name
-
- assert "target" in batch[1]
- assert all([isinstance(target, torch.Tensor) for target in batch[1]["target"]])
-
- if expected_num_targets:
- assert len(batch[1]["target"]) == expected_num_targets
-
- if "mask" in batch[1]:
- assert all([isinstance(mask, torch.Tensor) for mask in batch[1]["mask"]])
-
- assert "name" in batch[1]
- if prefixes is not None:
- assert all(
- [any([k.startswith(j) for j in prefixes]) for k in batch[1]["name"]],
- )
-
- @staticmethod
- def check_image_quality(
- datamodule,
- reference_histogram_file,
- compare_type="equal",
- pearson_coeff_threshold=0.005,
- ):
- ref_histogram_splits = JSONDatabaseSplit(reference_histogram_file)
-
- for split_name in ref_histogram_splits:
- raw_samples = datamodule.splits[split_name][0][0]
-
- # It is not possible to get a sample from a Dataset by name/path,
- # only by index. This creates a dict of sample name to dataset
- # index.
- raw_samples_indices = {}
- for idx, rs in enumerate(raw_samples):
- raw_samples_indices[rs[0]] = idx
-
- for ref_hist_path, ref_hist_data in ref_histogram_splits[split_name]:
- # Get index in the dataset that will return the data
- # corresponding to the specified sample name
- dataset_sample_index = raw_samples_indices[ref_hist_path]
-
- image_tensor = datamodule._datasets[split_name][ # noqa: SLF001
- dataset_sample_index
- ][0]
-
- histogram = []
- for color_channel in image_tensor:
- color_channel = numpy.multiply(
- color_channel.numpy(),
- 255,
- ).astype(int)
- histogram.extend(
- numpy.histogram(
- color_channel,
- bins=256,
- range=(0, 256),
- )[0].tolist(),
- )
-
- if compare_type == "statistical":
- # Compute pearson coefficients between histogram and
- # reference and check the similarity within a certain
- # threshold
- pearson_coeffs = numpy.corrcoef(histogram, ref_hist_data)
- assert 1 - pearson_coeff_threshold <= pearson_coeffs[0][1] <= 1
-
- else:
- assert histogram == ref_hist_data
-
-
-@pytest.fixture
-def database_checkers():
- return DatabaseCheckers
diff --git a/tests/segmentation/test_chasedb1.py b/tests/segmentation/test_chasedb1.py
index 77c8f2d60475939df42f243220deb6d728bb714a..04983002ab7fe205e73de4badfaceedaf3a4e96b 100644
--- a/tests/segmentation/test_chasedb1.py
+++ b/tests/segmentation/test_chasedb1.py
@@ -33,6 +33,8 @@ def test_protocol_consistency(
database_checkers.check_split(
make_split("mednet.libs.segmentation.config.data.chasedb1", f"{split}.json"),
lengths=lengths,
+ prefixes=["Image_"],
+ possible_labels=[],
)
@@ -81,7 +83,10 @@ def test_loading(database_checkers, name: str, dataset: str):
batch,
batch_size=1,
color_planes=3,
- expected_num_targets=1,
+ expected_num_labels=1,
+ expected_meta_size=3,
+ prefixes=["Image_"],
+ possible_labels=[],
)
limit -= 1
diff --git a/tests/segmentation/test_cli_segmentation.py b/tests/segmentation/test_cli.py
similarity index 100%
rename from tests/segmentation/test_cli_segmentation.py
rename to tests/segmentation/test_cli.py
diff --git a/tests/segmentation/test_cxr8.py b/tests/segmentation/test_cxr8.py
index 1d18d53c9bb9a1daa8d264b714e5d30cb4213d92..c097557a00ca56a1a7a52b88689c37f05fffcb94 100644
--- a/tests/segmentation/test_cxr8.py
+++ b/tests/segmentation/test_cxr8.py
@@ -32,6 +32,8 @@ def test_protocol_consistency(
database_checkers.check_split(
make_split("mednet.libs.segmentation.config.data.cxr8", f"{split}.json"),
lengths=lengths,
+ prefixes=[],
+ possible_labels=[],
)
@@ -79,7 +81,8 @@ def test_loading(database_checkers, name: str, dataset: str):
batch,
batch_size=1,
color_planes=3,
- expected_num_targets=1,
+ expected_num_labels=1,
+ expected_meta_size=3,
)
limit -= 1
diff --git a/tests/segmentation/test_drhagis.py b/tests/segmentation/test_drhagis.py
index 48001248f6a376bd3a083e1956058c86b629645a..8eaf73e00e215804521ebab6274c93212dfe2c34 100644
--- a/tests/segmentation/test_drhagis.py
+++ b/tests/segmentation/test_drhagis.py
@@ -32,6 +32,8 @@ def test_protocol_consistency(
database_checkers.check_split(
make_split("mednet.libs.segmentation.config.data.drhagis", f"{split}.json"),
lengths=lengths,
+ prefixes=["Fundus_Images/"],
+ possible_labels=[],
)
@@ -79,7 +81,10 @@ def test_loading(database_checkers, name: str, dataset: str):
batch,
batch_size=1,
color_planes=3,
- expected_num_targets=1,
+ expected_num_labels=1,
+ expected_meta_size=3,
+ prefixes=["Fundus_Images/"],
+ possible_labels=[],
)
limit -= 1
diff --git a/tests/segmentation/test_drionsdb.py b/tests/segmentation/test_drionsdb.py
index 7d4e14f82ea7e653ad28509a0d518876e54cb27f..6c04191ae1afdbac19389d2a463f9288e4770a23 100644
--- a/tests/segmentation/test_drionsdb.py
+++ b/tests/segmentation/test_drionsdb.py
@@ -33,6 +33,8 @@ def test_protocol_consistency(
database_checkers.check_split(
make_split("mednet.libs.segmentation.config.data.drionsdb", f"{split}.json"),
lengths=lengths,
+ prefixes=["images/image_"],
+ possible_labels=[],
)
@@ -81,7 +83,10 @@ def test_loading(database_checkers, name: str, dataset: str):
batch,
batch_size=1,
color_planes=3,
- expected_num_targets=1,
+ expected_num_labels=1,
+ expected_meta_size=3,
+ prefixes=["images/image_"],
+ possible_labels=[],
)
limit -= 1
diff --git a/tests/segmentation/test_drishtigs1.py b/tests/segmentation/test_drishtigs1.py
index 0c099b556a7f23a96b7de53861bf2b8bdcd878fa..8f704979ef308d40fac7d970f6fdea81c4c3fad9 100644
--- a/tests/segmentation/test_drishtigs1.py
+++ b/tests/segmentation/test_drishtigs1.py
@@ -33,6 +33,11 @@ def test_protocol_consistency(
database_checkers.check_split(
make_split("mednet.libs.segmentation.config.data.drishtigs1", f"{split}.json"),
lengths=lengths,
+ prefixes=[
+ "Drishti-GS1_files/Training/Images/drishtiGS_",
+ "Drishti-GS1_files/Test/Images/drishtiGS_",
+ ],
+ possible_labels=[],
)
@@ -83,7 +88,13 @@ def test_loading(database_checkers, name: str, dataset: str):
batch,
batch_size=1,
color_planes=3,
- expected_num_targets=1,
+ expected_num_labels=1,
+ expected_meta_size=3,
+ prefixes=[
+ "Drishti-GS1_files/Training/Images/drishtiGS_",
+ "Drishti-GS1_files/Test/Images/drishtiGS_",
+ ],
+ possible_labels=[],
)
limit -= 1
diff --git a/tests/segmentation/test_drive.py b/tests/segmentation/test_drive.py
index 9d3565964c05a1e6d3c5b5293cc22b23c2d20dd4..33fdd65ac6d95515898f372fb5d353868bc5bc0c 100644
--- a/tests/segmentation/test_drive.py
+++ b/tests/segmentation/test_drive.py
@@ -33,6 +33,8 @@ def test_protocol_consistency(
database_checkers.check_split(
make_split("mednet.libs.segmentation.config.data.drive", f"{split}.json"),
lengths=lengths,
+ prefixes=["training/", "test/"],
+ possible_labels=[],
)
@@ -80,7 +82,10 @@ def test_loading(database_checkers, name: str, dataset: str):
batch,
batch_size=1,
color_planes=3,
- expected_num_targets=1,
+ expected_num_labels=1,
+ expected_meta_size=3,
+ possible_labels=[],
+ prefixes=["training/", "test/"],
)
limit -= 1
diff --git a/tests/segmentation/test_hrf.py b/tests/segmentation/test_hrf.py
index 416fe434e90fb251a3159dc4ef6909a7a12d21d2..5f7a29bde9b30e80a35f41db00d3b1fa850024cb 100644
--- a/tests/segmentation/test_hrf.py
+++ b/tests/segmentation/test_hrf.py
@@ -32,6 +32,8 @@ def test_protocol_consistency(
database_checkers.check_split(
make_split("mednet.libs.segmentation.config.data.hrf", f"{split}.json"),
lengths=lengths,
+ prefixes=["images/"],
+ possible_labels=[],
)
@@ -79,7 +81,10 @@ def test_loading(database_checkers, name: str, dataset: str):
batch,
batch_size=1,
color_planes=3,
- expected_num_targets=1,
+ expected_num_labels=1,
+ expected_meta_size=3,
+ prefixes=["images/"],
+ possible_labels=[],
)
limit -= 1
diff --git a/tests/segmentation/test_iostar.py b/tests/segmentation/test_iostar.py
index e50967e0a6a74622f463f448a23b5365e05e8564..082131f27c46956cc297bbe2891df98002b9756f 100644
--- a/tests/segmentation/test_iostar.py
+++ b/tests/segmentation/test_iostar.py
@@ -33,6 +33,8 @@ def test_protocol_consistency(
database_checkers.check_split(
make_split("mednet.libs.segmentation.config.data.iostar", f"{split}.json"),
lengths=lengths,
+ prefixes=["image/STAR "],
+ possible_labels=[],
)
@@ -78,7 +80,10 @@ def test_loading(database_checkers, name: str, dataset: str):
batch,
batch_size=1,
color_planes=3,
- expected_num_targets=1,
+ expected_num_labels=1,
+ expected_meta_size=3,
+ prefixes=["image/STAR "],
+ possible_labels=[],
)
limit -= 1
diff --git a/tests/segmentation/test_jsrt.py b/tests/segmentation/test_jsrt.py
index c096a1308fd072bbbc5d8a0e0fd3239932821d65..e40b6d18c62ad50e0aae1eea3a01fcf6eff14c6e 100644
--- a/tests/segmentation/test_jsrt.py
+++ b/tests/segmentation/test_jsrt.py
@@ -32,6 +32,8 @@ def test_protocol_consistency(
database_checkers.check_split(
make_split("mednet.libs.segmentation.config.data.jsrt", f"{split}.json"),
lengths=lengths,
+ prefixes=["All247images/JPC"],
+ possible_labels=[],
)
@@ -80,7 +82,10 @@ def test_loading(database_checkers, name: str, dataset: str):
batch,
batch_size=1,
color_planes=3,
- expected_num_targets=1,
+ expected_num_labels=1,
+ expected_meta_size=3,
+ prefixes=["All247images/JPC"],
+ possible_labels=[],
)
limit -= 1
diff --git a/tests/segmentation/test_montgomery.py b/tests/segmentation/test_montgomery.py
index 97d301471f741d3e7099907233313b0836556b19..df72590cb50c64a025dd390ff3d6d87f95257d4f 100644
--- a/tests/segmentation/test_montgomery.py
+++ b/tests/segmentation/test_montgomery.py
@@ -32,6 +32,8 @@ def test_protocol_consistency(
database_checkers.check_split(
make_split("mednet.libs.segmentation.config.data.montgomery", f"{split}.json"),
lengths=lengths,
+ prefixes=["CXR_png"],
+ possible_labels=[],
)
@@ -80,8 +82,10 @@ def test_loading(database_checkers, name: str, dataset: str):
batch,
batch_size=1,
color_planes=3,
- expected_num_targets=1,
+ expected_num_labels=1,
+ expected_meta_size=3,
prefixes=["CXR_png"],
+ possible_labels=[],
)
limit -= 1
diff --git a/tests/segmentation/test_refuge.py b/tests/segmentation/test_refuge.py
index 07dedfc2f1a1872752a0e09765508c19dd291f8b..df8548403abe01ad2fca2af54f5a8b0bcf0b2949 100644
--- a/tests/segmentation/test_refuge.py
+++ b/tests/segmentation/test_refuge.py
@@ -32,6 +32,8 @@ def test_protocol_consistency(
database_checkers.check_split(
make_split("mednet.libs.segmentation.config.data.refuge", f"{split}.json"),
lengths=lengths,
+ prefixes=["Training400/", "REFUGE-Validation400/V", "Test400/T0"],
+ possible_labels=[],
)
@@ -81,7 +83,10 @@ def test_loading(database_checkers, name: str, dataset: str):
batch,
batch_size=1,
color_planes=3,
- expected_num_targets=1,
+ expected_num_labels=1,
+ expected_meta_size=3,
+ prefixes=["Training400/", "REFUGE-Validation400/V", "Test400/T0"],
+ possible_labels=[],
)
limit -= 1
diff --git a/tests/segmentation/test_rimoner3.py b/tests/segmentation/test_rimoner3.py
index 6a2327f36cf2f6dbaae572b9230cdf91f92b971f..895dc3c0869e1e00a3732ed5122ab01a5691b829 100644
--- a/tests/segmentation/test_rimoner3.py
+++ b/tests/segmentation/test_rimoner3.py
@@ -35,6 +35,8 @@ def test_protocol_consistency(
database_checkers.check_split(
make_split("mednet.libs.segmentation.config.data.rimoner3", f"{split}.json"),
lengths=lengths,
+ prefixes=["Healthy/Stereo Images/N-", "Glaucoma and suspects/Stereo Images/"],
+ possible_labels=[],
)
@@ -85,7 +87,13 @@ def test_loading(database_checkers, name: str, dataset: str):
batch,
batch_size=1,
color_planes=3,
- expected_num_targets=1,
+ expected_num_labels=1,
+ expected_meta_size=3,
+ prefixes=[
+ "Healthy/Stereo Images/N-",
+ "Glaucoma and suspects/Stereo Images/",
+ ],
+ possible_labels=[],
)
limit -= 1
diff --git a/tests/segmentation/test_shenzhen.py b/tests/segmentation/test_shenzhen.py
index 9510d3e444aa9a19ee63e8678d38e57d7d568cd7..8de3a36ec5ec139c43eccc5e745b280f5607b408 100644
--- a/tests/segmentation/test_shenzhen.py
+++ b/tests/segmentation/test_shenzhen.py
@@ -32,6 +32,8 @@ def test_protocol_consistency(
database_checkers.check_split(
make_split("mednet.libs.segmentation.config.data.shenzhen", f"{split}.json"),
lengths=lengths,
+ prefixes=["CXR_png/CHNCXR_"],
+ possible_labels=[],
)
@@ -80,7 +82,10 @@ def test_loading(database_checkers, name: str, dataset: str):
batch,
batch_size=1,
color_planes=3,
- expected_num_targets=1,
+ expected_num_labels=1,
+ expected_meta_size=3,
+ prefixes=["CXR_png/CHNCXR_"],
+ possible_labels=[],
)
limit -= 1
diff --git a/tests/segmentation/test_stare.py b/tests/segmentation/test_stare.py
index 6268ec9f32cf53c4ba8377cd1f9bba77f011d12f..086970897a1ddf5436368f51c7a79a0919ac11da 100644
--- a/tests/segmentation/test_stare.py
+++ b/tests/segmentation/test_stare.py
@@ -33,6 +33,8 @@ def test_protocol_consistency(
database_checkers.check_split(
make_split("mednet.libs.segmentation.config.data.stare", f"{split}.json"),
lengths=lengths,
+ prefixes=["stare-images/im0"],
+ possible_labels=[],
)
@@ -81,7 +83,10 @@ def test_loading(database_checkers, name: str, dataset: str):
batch,
batch_size=1,
color_planes=3,
- expected_num_targets=1,
+ expected_num_labels=1,
+ expected_meta_size=3,
+ prefixes=["stare-images/im0"],
+ possible_labels=[],
)
limit -= 1
diff --git a/tests/common/test_database_split.py b/tests/test_database_split.py
similarity index 100%
rename from tests/common/test_database_split.py
rename to tests/test_database_split.py
diff --git a/tests/common/test_image_utils.py b/tests/test_image_utils.py
similarity index 100%
rename from tests/common/test_image_utils.py
rename to tests/test_image_utils.py
diff --git a/tests/common/test_resource_monitor.py b/tests/test_resource_monitor.py
similarity index 100%
rename from tests/common/test_resource_monitor.py
rename to tests/test_resource_monitor.py
diff --git a/tests/common/test_transforms.py b/tests/test_transforms.py
similarity index 100%
rename from tests/common/test_transforms.py
rename to tests/test_transforms.py