Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions configs/dataset/tiled/ftn/0_320.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
defaults:
- /dataset/processed_w_masks/ftn@_here_
- _self_

mpp: 0.17
tile_extent: 320
level: 0
tiling_uris:
train: "mlflow-artifacts:/86/bbbe4603bc30495d85ac99093fc9269a/artifacts/train - ftn" # TODO update URI
test_preliminary: "mlflow-artifacts:/86/bbbe4603bc30495d85ac99093fc9269a/artifacts/test preliminary - ftn" # TODO update URI
test_final: "mlflow-artifacts:/86/bbbe4603bc30495d85ac99093fc9269a/artifacts/test final - ftn" # TODO update URI
Comment on lines +9 to +11

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

These MLFlow artifact URIs appear to be placeholders and are marked with # TODO update URI. Committing placeholder values can lead to runtime errors or incorrect data being used if not updated. Please replace them with the final URIs or use a more dynamic configuration approach to avoid hardcoding them. This comment applies to all similar new dataset configuration files in this pull request.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Waiting for #5

11 changes: 11 additions & 0 deletions configs/dataset/tiled/ftn/0_430.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
defaults:
- /dataset/processed_w_masks/ftn@_here_
- _self_

mpp: 0.17
tile_extent: 430
level: 0
tiling_uris:
train: "mlflow-artifacts:/86/de450f835f0d4462a91b35f4a79a500f/artifacts/train - ftn" # TODO update URI
test_preliminary: "mlflow-artifacts:/86/de450f835f0d4462a91b35f4a79a500f/artifacts/test preliminary - ftn" # TODO update URI
test_final: "mlflow-artifacts:/86/de450f835f0d4462a91b35f4a79a500f/artifacts/test final - ftn" # TODO update URI
11 changes: 11 additions & 0 deletions configs/dataset/tiled/ftn/1_224.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
defaults:
- /dataset/processed_w_masks/ftn@_here_
- _self_

mpp: 0.52
tile_extent: 224
level: 1
tiling_uris:
train: "mlflow-artifacts:/86/f85b64a7f96c41e38f86d84956e2dbe9/artifacts/train - ftn" # TODO update URI
test_preliminary: "mlflow-artifacts:/86/f85b64a7f96c41e38f86d84956e2dbe9/artifacts/test preliminary - ftn" # TODO update URI
test_final: "mlflow-artifacts:/86/f85b64a7f96c41e38f86d84956e2dbe9/artifacts/test final - ftn" # TODO update URI
11 changes: 11 additions & 0 deletions configs/dataset/tiled/ftn/2_224.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
defaults:
- /dataset/processed_w_masks/ftn@_here_
- _self_

mpp: 1.55
tile_extent: 224
level: 2
tiling_uris:
train: "mlflow-artifacts:/86/5814484b6cd7467e9d712889655479af/artifacts/train - ftn" # TODO update URI
test_preliminary: "mlflow-artifacts:/86/5814484b6cd7467e9d712889655479af/artifacts/test preliminary - ftn" # TODO update URI
test_final: "mlflow-artifacts:/86/5814484b6cd7467e9d712889655479af/artifacts/test final - ftn" # TODO update URI
11 changes: 11 additions & 0 deletions configs/dataset/tiled/ikem/0_320.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
defaults:
- /dataset/processed_w_masks/ikem@_here_
- _self_

mpp: 0.17
tile_extent: 320
level: 0
tiling_uris:
train: "mlflow-artifacts:/86/4486e598446d412d926ac66dadb35e51/artifacts/train - ikem" # TODO update URI
test_preliminary: "mlflow-artifacts:/86/4486e598446d412d926ac66dadb35e51/artifacts/test preliminary - ikem" # TODO update URI
test_final: "mlflow-artifacts:/86/4486e598446d412d926ac66dadb35e51/artifacts/test final - ikem" # TODO update URI
11 changes: 11 additions & 0 deletions configs/dataset/tiled/ikem/0_430.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
defaults:
- /dataset/processed_w_masks/ikem@_here_
- _self_

mpp: 0.17
tile_extent: 430
level: 0
tiling_uris:
train: "mlflow-artifacts:/86/fd112e63819c49d999502542b35bfce1/artifacts/train - ikem" # TODO update URI
test_preliminary: "mlflow-artifacts:/86/fd112e63819c49d999502542b35bfce1/artifacts/test preliminary - ikem" # TODO update URI
test_final: "mlflow-artifacts:/86/fd112e63819c49d999502542b35bfce1/artifacts/test final - ikem" # TODO update URI
11 changes: 11 additions & 0 deletions configs/dataset/tiled/ikem/1_224.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
defaults:
- /dataset/processed_w_masks/ikem@_here_
- _self_

mpp: 0.52
tile_extent: 224
level: 1
tiling_uris:
train: "mlflow-artifacts:/86/ece822e7c0e3416f97212267c773c8ac/artifacts/train - ikem" # TODO update URI
test_preliminary: "mlflow-artifacts:/86/ece822e7c0e3416f97212267c773c8ac/artifacts/test preliminary - ikem" # TODO update URI
test_final: "mlflow-artifacts:/86/ece822e7c0e3416f97212267c773c8ac/artifacts/test final - ikem" # TODO update URI
11 changes: 11 additions & 0 deletions configs/dataset/tiled/ikem/2_224.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
defaults:
- /dataset/processed_w_masks/ikem@_here_
- _self_

mpp: 1.55
tile_extent: 224
level: 2
tiling_uris:
train: "mlflow-artifacts:/86/0c09e1c61d294fa3877b6b21703bab2f/artifacts/train - ikem" # TODO update URI
test_preliminary: "mlflow-artifacts:/86/0c09e1c61d294fa3877b6b21703bab2f/artifacts/test preliminary - ikem" # TODO update URI
test_final: "mlflow-artifacts:/86/0c09e1c61d294fa3877b6b21703bab2f/artifacts/test final - ikem" # TODO update URI
10 changes: 10 additions & 0 deletions configs/dataset/tiled/knl_patos/0_320.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
defaults:
- /dataset/processed_w_masks/knl_patos@_here_
- _self_

mpp: 0.17
tile_extent: 320
level: 0
tiling_uris:
test_preliminary: "mlflow-artifacts:/86/7b9a446145b14965981bbac88e8e2c8b/artifacts/test preliminary - knl_patos" # TODO update URI
test_final: "mlflow-artifacts:/86/7b9a446145b14965981bbac88e8e2c8b/artifacts/test final - knl_patos" # TODO update URI
10 changes: 10 additions & 0 deletions configs/dataset/tiled/knl_patos/0_430.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
defaults:
- /dataset/processed_w_masks/knl_patos@_here_
- _self_

mpp: 0.17
tile_extent: 430
level: 0
tiling_uris:
test_preliminary: "mlflow-artifacts:/86/eb29255c944d4dad926160a7cb102ad9/artifacts/test preliminary - knl_patos" # TODO update URI
test_final: "mlflow-artifacts:/86/eb29255c944d4dad926160a7cb102ad9/artifacts/test final - knl_patos" # TODO update URI
10 changes: 10 additions & 0 deletions configs/dataset/tiled/knl_patos/1_224.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
defaults:
- /dataset/processed_w_masks/knl_patos@_here_
- _self_

mpp: 0.52
tile_extent: 224
level: 1
tiling_uris:
test_preliminary: "mlflow-artifacts:/86/6782155362d54ecc9f1beccb4362d359/artifacts/test preliminary - knl_patos" # TODO update URI
test_final: "mlflow-artifacts:/86/6782155362d54ecc9f1beccb4362d359/artifacts/test final - knl_patos" # TODO update URI
10 changes: 10 additions & 0 deletions configs/dataset/tiled/knl_patos/2_224.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
defaults:
- /dataset/processed_w_masks/knl_patos@_here_
- _self_

mpp: 1.55
tile_extent: 224
level: 2
tiling_uris:
test_preliminary: "mlflow-artifacts:/86/d7486bb6b667433989c3ce1c8ce31d60/artifacts/test preliminary - knl_patos" # TODO update URI
test_final: "mlflow-artifacts:/86/d7486bb6b667433989c3ce1c8ce31d60/artifacts/test final - knl_patos" # TODO update URI
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# @package _global_

defaults:
- /dataset/tiled/ftn/1_224@dataset
- /preprocessing/tile_encoder/prov_gigapath
- _self_
6 changes: 6 additions & 0 deletions configs/experiment/preprocessing/embeddings/ftn_1_uni.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# @package _global_

defaults:
- /dataset/tiled/ftn/1_224@dataset
- /preprocessing/tile_encoder/uni
- _self_
6 changes: 6 additions & 0 deletions configs/experiment/preprocessing/embeddings/ftn_1_uni2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# @package _global_

defaults:
- /dataset/tiled/ftn/1_224@dataset
- /preprocessing/tile_encoder/uni2
- _self_
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# @package _global_

defaults:
- /dataset/tiled/ftn/1_224@dataset
- /preprocessing/tile_encoder/virchow
- _self_
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# @package _global_

defaults:
- /dataset/tiled/ftn/1_224@dataset
- /preprocessing/tile_encoder/virchow2
- _self_
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# @package _global_

defaults:
- /dataset/tiled/ftn/2_224@dataset
- /preprocessing/tile_encoder/virchow2
- _self_
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# @package _global_

defaults:
- /dataset/tiled/ikem/1_224@dataset
- /preprocessing/tile_encoder/prov_gigapath
- _self_
6 changes: 6 additions & 0 deletions configs/experiment/preprocessing/embeddings/ikem_1_uni.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# @package _global_

defaults:
- /dataset/tiled/ikem/1_224@dataset
- /preprocessing/tile_encoder/uni
- _self_
6 changes: 6 additions & 0 deletions configs/experiment/preprocessing/embeddings/ikem_1_uni2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# @package _global_

defaults:
- /dataset/tiled/ikem/1_224@dataset
- /preprocessing/tile_encoder/uni2
- _self_
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# @package _global_

defaults:
- /dataset/tiled/ikem/1_224@dataset
- /preprocessing/tile_encoder/virchow
- _self_
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# @package _global_

defaults:
- /dataset/tiled/ikem/1_224@dataset
- /preprocessing/tile_encoder/virchow2
- _self_
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# @package _global_

defaults:
- /dataset/tiled/ikem/2_224@dataset
- /preprocessing/tile_encoder/virchow2
- _self_
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# @package _global_

defaults:
- /dataset/tiled/knl_patos/1_224@dataset
- /preprocessing/tile_encoder/prov_gigapath
- _self_
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# @package _global_

defaults:
- /dataset/tiled/knl_patos/1_224@dataset
- /preprocessing/tile_encoder/uni
- _self_
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# @package _global_

defaults:
- /dataset/tiled/knl_patos/1_224@dataset
- /preprocessing/tile_encoder/uni2
- _self_
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# @package _global_

defaults:
- /dataset/tiled/knl_patos/1_224@dataset
- /preprocessing/tile_encoder/virchow
- _self_
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# @package _global_

defaults:
- /dataset/tiled/knl_patos/1_224@dataset
- /preprocessing/tile_encoder/virchow2
- _self_
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# @package _global_

defaults:
- /dataset/tiled/knl_patos/2_224@dataset
- /preprocessing/tile_encoder/virchow2
- _self_
17 changes: 17 additions & 0 deletions configs/preprocessing/embeddings.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# @package _global_

output_dir: ${project_dir}/embeddings/${dataset.institution}/${dataset.level}/${tile_encoder.name}

dataloader:
batch_size: 2048 # 2048 for H100, 1024 for A40, 512 for mig-2g.20gb
num_workers: 8
persistent_workers: True

metadata:
run_name: '📂 Embeddings: ${dataset.institution} - ${dataset.level} - ${tile_encoder.name}'
description: Embeddings preprocessing for ${dataset.institution} institution with ${tile_encoder.name} tile encoder.
hyperparams:
tile_encoder: ${tile_encoder.name}
level: ${dataset.level}
batch_size: ${dataloader.batch_size}
num_workers: ${dataloader.num_workers}
5 changes: 5 additions & 0 deletions configs/preprocessing/tile_encoder/prov_gigapath.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# @package _global_

tile_encoder:
_target_: preprocessing.embeddings.ProvGigaPath
name: prov_gigapath
5 changes: 5 additions & 0 deletions configs/preprocessing/tile_encoder/uni.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# @package _global_

tile_encoder:
_target_: preprocessing.embeddings.UNI
name: uni
5 changes: 5 additions & 0 deletions configs/preprocessing/tile_encoder/uni2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# @package _global_

tile_encoder:
_target_: preprocessing.embeddings.UNI2
name: uni2
5 changes: 5 additions & 0 deletions configs/preprocessing/tile_encoder/virchow.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# @package _global_

tile_encoder:
_target_: preprocessing.embeddings.Virchow
name: virchow
5 changes: 5 additions & 0 deletions configs/preprocessing/tile_encoder/virchow2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# @package _global_

tile_encoder:
_target_: preprocessing.embeddings.Virchow2
name: virchow2
File renamed without changes.
4 changes: 2 additions & 2 deletions project_name/__main__.py → ml/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
from omegaconf import DictConfig, OmegaConf
from rationai.mlkit import Trainer, autolog

from project_name.data import DataModule
from project_name.project_name_model import ProjectNameModel
from ml.data import DataModule
from ml.project_name_model import ProjectNameModel


OmegaConf.register_new_resolver(
Expand Down
File renamed without changes.
4 changes: 4 additions & 0 deletions ml/data/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
from ml.data.data_module import DataModule


__all__ = ["DataModule"]
9 changes: 5 additions & 4 deletions project_name/data/data_module.py → ml/data/data_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
from omegaconf import DictConfig
from torch.utils.data import DataLoader

from project_name.typing import Input

# from ml.typing import Input TODO


class DataModule(LightningDataModule):
Expand All @@ -27,7 +28,7 @@ def setup(self, stage: str) -> None:
case "test":
self.test = instantiate(self.datasets["test"])

def train_dataloader(self) -> Iterable[Input]:
def train_dataloader(self) -> Iterable:
return DataLoader(
self.train,
batch_size=self.batch_size,
Expand All @@ -37,15 +38,15 @@ def train_dataloader(self) -> Iterable[Input]:
persistent_workers=self.num_workers > 0,
)

def val_dataloader(self) -> Iterable[Input]:
def val_dataloader(self) -> Iterable:
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[Input]:
def test_dataloader(self) -> Iterable:
return DataLoader(
self.test, batch_size=self.batch_size, num_workers=self.num_workers
)
Loading