-
Notifications
You must be signed in to change notification settings - Fork 0
feat: add data loading #4
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
3151772
feat: add data loading
LAdam-ix 9874f1c
feat: add dataset configs with MMCI TL 512 URIs
LAdam-ix 8d58794
chore: migrate from pdm to uv
LAdam-ix ac94a75
chore: fix requires-python range
LAdam-ix 6c7ecbf
fix: review ai agent feedback
LAdam-ix 851b4e5
chore: update uv.lock
LAdam-ix e608241
fix: ai agent review
LAdam-ix 6560ac8
fix: review feedback
LAdam-ix 51d9708
fix: add dataset docstrings, move collate_fn, use img_as_float
LAdam-ix File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,183 @@ | ||
| # Byte-compiled / optimized / DLL files | ||
| __pycache__/ | ||
| *.py[cod] | ||
| *$py.class | ||
|
|
||
| # C extensions | ||
| *.so | ||
|
|
||
| # Distribution / packaging | ||
| .Python | ||
| build/ | ||
| develop-eggs/ | ||
| dist/ | ||
| downloads/ | ||
| eggs/ | ||
| .eggs/ | ||
| lib/ | ||
| lib64/ | ||
| parts/ | ||
| sdist/ | ||
| var/ | ||
| wheels/ | ||
| share/python-wheels/ | ||
| *.egg-info/ | ||
| .installed.cfg | ||
| *.egg | ||
| MANIFEST | ||
|
|
||
| # PyInstaller | ||
| # Usually these files are written by a python script from a template | ||
| # before PyInstaller builds the exe, so as to inject date/other infos into it. | ||
| *.manifest | ||
| *.spec | ||
|
|
||
| # Installer logs | ||
| pip-log.txt | ||
| pip-delete-this-directory.txt | ||
|
|
||
| # Unit test / coverage reports | ||
| htmlcov/ | ||
| .tox/ | ||
| .nox/ | ||
| .coverage | ||
| .coverage.* | ||
| .cache | ||
| nosetests.xml | ||
| coverage.xml | ||
| *.cover | ||
| *.py,cover | ||
| .hypothesis/ | ||
| .pytest_cache/ | ||
| cover/ | ||
|
|
||
| # Translations | ||
| *.mo | ||
| *.pot | ||
|
|
||
| # Django stuff: | ||
| *.log | ||
| local_settings.py | ||
| db.sqlite3 | ||
| db.sqlite3-journal | ||
|
|
||
| # Flask stuff: | ||
| instance/ | ||
| .webassets-cache | ||
|
|
||
| # Scrapy stuff: | ||
| .scrapy | ||
|
|
||
| # Sphinx documentation | ||
| docs/_build/ | ||
|
|
||
| # PyBuilder | ||
| .pybuilder/ | ||
| target/ | ||
|
|
||
| # Jupyter Notebook | ||
| .ipynb_checkpoints | ||
|
|
||
| # IPython | ||
| profile_default/ | ||
| ipython_config.py | ||
|
|
||
| # pyenv | ||
| # For a library or package, you might want to ignore these files since the code is | ||
| # intended to run in multiple environments; otherwise, check them in: | ||
| # .python-version | ||
|
|
||
| # pipenv | ||
| # According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. | ||
| # However, in case of collaboration, if having platform-specific dependencies or dependencies | ||
| # having no cross-platform support, pipenv may install dependencies that don't work, or not | ||
| # install all needed dependencies. | ||
| #Pipfile.lock | ||
|
|
||
| # poetry | ||
| # Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. | ||
| # This is especially recommended for binary packages to ensure reproducibility, and is more | ||
| # commonly ignored for libraries. | ||
| # https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control | ||
| #poetry.lock | ||
|
|
||
| # pdm | ||
| # Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. | ||
| #pdm.lock | ||
| # pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it | ||
| # in version control. | ||
| # https://pdm-project.org/#use-with-ide | ||
| .pdm.toml | ||
| .pdm-python | ||
| .pdm-build/ | ||
|
|
||
| # PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm | ||
| __pypackages__/ | ||
|
|
||
| # Celery stuff | ||
| celerybeat-schedule | ||
| celerybeat.pid | ||
|
|
||
| # SageMath parsed files | ||
| *.sage.py | ||
|
|
||
| # Environments | ||
| .env | ||
| .venv | ||
| env/ | ||
| venv/ | ||
| ENV/ | ||
| env.bak/ | ||
| venv.bak/ | ||
|
|
||
| # Spyder project settings | ||
| .spyderproject | ||
| .spyproject | ||
|
|
||
| # Rope project settings | ||
| .ropeproject | ||
|
|
||
| # mkdocs documentation | ||
| site | ||
|
|
||
| # mypy | ||
| .mypy_cache/ | ||
| .dmypy.json | ||
| dmypy.json | ||
|
|
||
| # ruff | ||
| .ruff_cache/ | ||
|
|
||
| # Pyre type checker | ||
| .pyre/ | ||
|
|
||
| # pytype static type analyzer | ||
| .pytype/ | ||
|
|
||
| # Cython debug symbols | ||
| cython_debug/ | ||
|
|
||
| # VSCode | ||
| .vscode/ | ||
|
|
||
| # MacOS | ||
| .DS_Store | ||
|
|
||
| # Mlflow | ||
| mlruns/ | ||
| mlflow_store/ | ||
| mlflow_artifacts/ | ||
|
|
||
| # Pytorch Lightning | ||
| lightning_logs/ | ||
|
|
||
| # PyCharm | ||
| # JetBrains specific template is maintained in a separate JetBrains.gitignore that can | ||
| # be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore | ||
| # and can be added to the global gitignore or merged into this file. For a more nuclear | ||
| # option (not recommended) you can uncomment the following to ignore the entire idea folder. | ||
| .idea/ | ||
|
|
||
| # Project | ||
| /data | ||
| /demo_* |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| defaults: | ||
| - /data/normalize@normalize: default | ||
|
|
||
| _target_: stain_normalization.data.datasets.PredictDataset | ||
| uris: ["mlflow-artifacts:/79/ce91ce61ac8e4b4784b76a7193e59da9/artifacts/FNBrno_400/2"] | ||
matejpekar marked this conversation as resolved.
Show resolved
Hide resolved
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| defaults: | ||
| - /data/modify@modify: test | ||
| - /data/normalize@normalize: default | ||
|
|
||
| _target_: stain_normalization.data.datasets.TestDataset | ||
| uris: ["mlflow-artifacts:/65/c47cd842fbf14bf399cd4aca43af3127/artifacts/MMCI TL Test 512"] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| defaults: | ||
| - /data/modify@modify: train | ||
| - /data/normalize@normalize: default | ||
|
|
||
| _target_: stain_normalization.data.datasets.TrainDataset | ||
| uris: ["mlflow-artifacts:/65/b587398845c54e1c84e8b60f11c42b15/artifacts/MMCI TL Train 512"] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| defaults: | ||
| - /data/modify@modify: train | ||
| - /data/normalize@normalize: default | ||
|
|
||
| _target_: stain_normalization.data.datasets.TrainDataset | ||
| uris: ["mlflow-artifacts:/65/a43da470f89848abb3a32e59c504ee1a/artifacts/MMCI TL Val 512"] | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| _target_: albumentations.Normalize | ||
| # From PC-A-42 MOU prostate dataset | ||
| # Original 255-scale values: | ||
| # mean=[228.5544, 178.8584, 219.8793], std=[27.8285, 51.4639, 26.4458] | ||
| mean: | ||
| - 0.896291765 | ||
| - 0.70140549 | ||
| - 0.862271765 | ||
| std: | ||
| - 0.109131373 | ||
| - 0.201819216 | ||
| - 0.10370902 | ||
| max_pixel_value: 1 |
LAdam-ix marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| [project] | ||
| name = "stain-normalization" | ||
| version = "0.1.0" | ||
| authors = [{name = "Adam Lopatka"}] | ||
| requires-python = ">=3.12.5,<3.14" | ||
| readme = "README.md" | ||
| license = { file = "LICENSE" } | ||
| dependencies = [ | ||
| "lightning>=2.0.0", | ||
| "albumentations>=1.4.14", | ||
| "torchmetrics>=1.4.3", | ||
| "torchvision>=0.17.2", | ||
| "torch>=2.2.2", | ||
| "tqdm>=4.66.5", | ||
| "rationai-mlkit @ git+https://gitlab.ics.muni.cz/rationai/digital-pathology/libraries/mlkit.git", | ||
| "rationai-masks @ git+https://gitlab.ics.muni.cz/rationai/digital-pathology/libraries/masks.git", | ||
| "rationai-tiling @ git+https://gitlab.ics.muni.cz/rationai/digital-pathology/libraries/tiling.git", | ||
| "scikit-image>=0.25.2", | ||
| "rationai-staining @ git+https://gitlab.ics.muni.cz/rationai/digital-pathology/libraries/staining.git", | ||
coderabbitai[bot] marked this conversation as resolved.
Show resolved
Hide resolved
matejpekar marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| "openslide-python>=1.4.3", | ||
| ] | ||
|
|
||
| [dependency-groups] | ||
| dev = ["mypy", "ruff"] | ||
|
|
||
| [tool.uv] | ||
| environments = ["sys_platform == 'linux'"] | ||
|
|
||
| override-dependencies = ["mlflow>=2.15.1"] | ||
coderabbitai[bot] marked this conversation as resolved.
Show resolved
Hide resolved
matejpekar marked this conversation as resolved.
Show resolved
Hide resolved
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| from stain_normalization.data.data_module import DataModule | ||
|
|
||
|
|
||
| __all__ = ["DataModule"] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| from collections.abc import Iterable | ||
| from typing import Any | ||
|
|
||
| import torch | ||
| from hydra.utils import instantiate | ||
| from lightning import LightningDataModule | ||
| from omegaconf import DictConfig | ||
| from torch import Tensor | ||
| from torch.utils.data import DataLoader | ||
|
|
||
| from stain_normalization.type_aliases import Batch, PredictBatch | ||
|
|
||
|
|
||
| def collate_fn(batch: list[tuple[Tensor, Any]]) -> tuple[Tensor, list[Any]]: | ||
| return torch.stack([x[0] for x in batch]), [x[1] for x in batch] | ||
|
|
||
|
|
||
| class DataModule(LightningDataModule): | ||
| def __init__( | ||
| self, batch_size: int, num_workers: int = 0, **datasets: DictConfig | ||
| ) -> None: | ||
| super().__init__() | ||
| self.batch_size = batch_size | ||
| self.num_workers = num_workers | ||
| self.datasets = datasets | ||
|
|
||
| def setup(self, stage: str) -> None: | ||
| match stage: | ||
| case "fit": | ||
| self.train = instantiate(self.datasets["train"]) | ||
| self.val = instantiate(self.datasets["val"]) | ||
| case "validate": | ||
| self.val = instantiate(self.datasets["val"]) | ||
| case "test": | ||
| self.test = instantiate(self.datasets["test"]) | ||
| case "predict": | ||
| self.predict = instantiate(self.datasets["predict"]) | ||
matejpekar marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| def train_dataloader(self) -> Iterable[Batch]: | ||
| return DataLoader( | ||
| self.train, | ||
| batch_size=self.batch_size, | ||
| shuffle=True, | ||
| drop_last=True, | ||
| num_workers=self.num_workers, | ||
| persistent_workers=self.num_workers > 0, | ||
| ) | ||
|
|
||
| def val_dataloader(self) -> Iterable[Batch]: | ||
| return DataLoader( | ||
| self.val, | ||
| batch_size=self.batch_size, | ||
| num_workers=self.num_workers, | ||
| persistent_workers=self.num_workers > 0, | ||
| ) | ||
|
|
||
| def test_dataloader(self) -> Iterable[PredictBatch]: | ||
| return DataLoader( | ||
| self.test, | ||
| batch_size=self.batch_size, | ||
| num_workers=self.num_workers, | ||
| collate_fn=collate_fn, | ||
| ) | ||
|
|
||
| def predict_dataloader(self) -> Iterable[PredictBatch]: | ||
| return DataLoader( | ||
| self.predict, | ||
| batch_size=self.batch_size, | ||
| num_workers=self.num_workers, | ||
| collate_fn=collate_fn, | ||
| ) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| from stain_normalization.data.datasets.predict_dataset import PredictDataset | ||
| from stain_normalization.data.datasets.test_dataset import TestDataset | ||
| from stain_normalization.data.datasets.train_dataset import TrainDataset | ||
|
|
||
|
|
||
| __all__ = ["PredictDataset", "TestDataset", "TrainDataset"] |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.