diff --git a/configs/data/radboud/test.yaml b/configs/data/radboud/test.yaml index cc5ee1dc..c880b3ab 100644 --- a/configs/data/radboud/test.yaml +++ b/configs/data/radboud/test.yaml @@ -4,6 +4,13 @@ defaults: metadata_table: "mlflow-artifacts:/38/1a718a849be3412ab4621b6772daf049/artifacts/PANDA - Radboud_test.csv" -tiles_uri_512: "mlflow-artifacts:/38/7bfcfeeaa29a4745943ac8556a63de4b/artifacts/PANDA - Radboud test" + +tiles_uri_512: "mlflow-artifacts:/38/197410ccc71c443bb8b1d8eb517c53fa/artifacts/PANDA - Radboud test" +tiles_filtered_uri_512: "mlflow-artifacts:/38/0525b745d0954fb6ace98ead20042faf/artifacts/PANDA - Radboud test_512" + +tiles_uri_224: "mlflow-artifacts:/38/4cab0908f7eb4d0aba64407af072f08c/artifacts/PANDA - Radboud test" +tiles_filtered_uri_224: "mlflow-artifacts:/38/0525b745d0954fb6ace98ead20042faf/artifacts/PANDA - Radboud test_224" +tiles_filtered_w_virchow2_uri_224: "mlflow-artifacts:/38/a63457454feb49ecb362af00ad5e2320/artifacts/PANDA - Radboud test" +tiles_filtered_w_pgp_uri_224: "mlflow-artifacts:/38/11c6715b9d1445a9aa59e9d0e0294c4c/artifacts/PANDA - Radboud test" data_name: "PANDA - Radboud test" diff --git a/configs/data/radboud/train.yaml b/configs/data/radboud/train.yaml index 95b509eb..71f38a82 100644 --- a/configs/data/radboud/train.yaml +++ b/configs/data/radboud/train.yaml @@ -4,7 +4,10 @@ defaults: # points to the public mlflow metadata_table: "mlflow-artifacts:/38/25b0e9ead22e44908f74d23b4efcaa62/artifacts/PANDA - Radboud train + val_train.csv" -tiles_uri_512: "mlflow-artifacts:/38/fc5ea991725d4066bddeb31090aae463/artifacts/PANDA - Radboud train" -tiles_uri_224: "mlflow-artifacts:/38/71423731ba2a45099f28892733667386/artifacts/PANDA - Radboud train" +tiles_uri_512: "mlflow-artifacts:/38/02b36c4f7e544436b0bd2f81146676c5/artifacts/PANDA - Radboud train" +tiles_filtered_uri_512: "mlflow-artifacts:/38/e1ef2698c62541e4a5e92a65ecb36fa5/artifacts/PANDA - Radboud train_512" + +tiles_uri_224: "mlflow-artifacts:/38/d658d0c339844eec8b425b403657f086/artifacts/PANDA - Radboud train" +tiles_filtered_uri_224: "mlflow-artifacts:/38/e1ef2698c62541e4a5e92a65ecb36fa5/artifacts/PANDA - Radboud train_224" data_name: "PANDA - Radboud train" diff --git a/configs/data/radboud/val.yaml b/configs/data/radboud/val.yaml index 9a59d188..ce1628a4 100644 --- a/configs/data/radboud/val.yaml +++ b/configs/data/radboud/val.yaml @@ -3,6 +3,11 @@ defaults: - _self_ tiles_uri_512: "mlflow-artifacts:/38/4e3b31f87a8a46df9f911a69206d6a1d/artifacts/PANDA - Radboud val" -tiles_uri_224: "mlflow-artifacts:/38/fae8eacf77a24fce808de83cb8ec3edd/artifacts/PANDA - Radboud val" +tiles_filtered_uri_512: "mlflow-artifacts:/38/b38ca47d6fd4422a9f8d5a32fcae221c/artifacts/PANDA - Radboud val_512" + +tiles_uri_224: "mlflow-artifacts:/38/33ad08ab5f9845809fb48b2b7d2aa643/artifacts/PANDA - Radboud val" +tiles_filtered_uri_224: "mlflow-artifacts:/38/b38ca47d6fd4422a9f8d5a32fcae221c/artifacts/PANDA - Radboud val_224" +tiles_filtered_w_virchow2_uri_224: "mlflow-artifacts:/38/e0376ffbbc894cb5862011e7f79c03f9/artifacts/PANDA - Radboud val" +tiles_filtered_w_pgp_uri_224: "mlflow-artifacts:/38/1ffee8c4b2c841879a25aa3781a271ff/artifacts/PANDA - Radboud val" data_name: "PANDA - Radboud val" diff --git a/configs/data/radboud/val_heuristic_normalized.yaml b/configs/data/radboud/val_heuristic_normalized.yaml index 58664cf1..a70b5802 100644 --- a/configs/data/radboud/val_heuristic_normalized.yaml +++ b/configs/data/radboud/val_heuristic_normalized.yaml @@ -2,7 +2,7 @@ defaults: - base_val - _self_ -tiles_uri_512: "mlflow-artifacts:/38/4ced588761614abda73d2f447284d6ce/artifacts/PANDA - Radboud val512_normalized" -tiles_uri_224: "mlflow-artifacts:/38/4ced588761614abda73d2f447284d6ce/artifacts/PANDA - Radboud val224_normalized" +tiles_uri_512: "mlflow-artifacts:/38/4ced588761614abda73d2f447284d6ce/artifacts/PANDA - Radboud val512_normalized" # invalid QC +tiles_uri_224: "mlflow-artifacts:/38/4ced588761614abda73d2f447284d6ce/artifacts/PANDA - Radboud val224_normalized" # invalid QC data_name: "PANDA - Radboud val (Heuristic Normalized)" diff --git a/configs/data/radboud/val_ml_normalized.yaml b/configs/data/radboud/val_ml_normalized.yaml index 3f8aaee9..2139085e 100644 --- a/configs/data/radboud/val_ml_normalized.yaml +++ b/configs/data/radboud/val_ml_normalized.yaml @@ -2,7 +2,7 @@ defaults: - base_val - _self_ -tiles_uri_512: "mlflow-artifacts:/38/c0a9e22016924940880188d6e111f150/artifacts/PANDA - Radboud val512_normalized" -tiles_uri_224: "mlflow-artifacts:/38/c0a9e22016924940880188d6e111f150/artifacts/PANDA - Radboud val224_normalized" +tiles_uri_512: "mlflow-artifacts:/38/c0a9e22016924940880188d6e111f150/artifacts/PANDA - Radboud val512_normalized" # invalid QC +tiles_uri_224: "mlflow-artifacts:/38/c0a9e22016924940880188d6e111f150/artifacts/PANDA - Radboud val224_normalized" # invalid QC data_name: "PANDA - Radboud val (ML Normalized)" diff --git a/configs/datamodule/datasets/images/labeled.yaml b/configs/datamodule/datasets/images/labeled.yaml index f3a5b9a9..ce8f4854 100644 --- a/configs/datamodule/datasets/images/labeled.yaml +++ b/configs/datamodule/datasets/images/labeled.yaml @@ -1,4 +1,5 @@ _target_: prostate_cancer.datamodule.datasets.LabeledTilesDataset uris: ??? +transforms: ??? carcinoma_roi_t: ${carcinoma_roi_t} stratified_filter: ??? diff --git a/configs/datamodule/datasets/images/unlabeled.yaml b/configs/datamodule/datasets/images/unlabeled.yaml index dfe019b3..8278ab13 100644 --- a/configs/datamodule/datasets/images/unlabeled.yaml +++ b/configs/datamodule/datasets/images/unlabeled.yaml @@ -1,2 +1,3 @@ _target_: prostate_cancer.datamodule.datasets.UnlabeledTilesDataset uris: ??? +transforms: ??? diff --git a/configs/datamodule/transforms/augmentations.yaml b/configs/datamodule/transforms/augmentations.yaml deleted file mode 100644 index bbcd47ba..00000000 --- a/configs/datamodule/transforms/augmentations.yaml +++ /dev/null @@ -1,38 +0,0 @@ -_target_: albumentations.Compose -transforms: - - _target_: albumentations.RandomRotate90 - p: 1.0 - - _target_: albumentations.HorizontalFlip - p: 0.5 - - _target_: albumentations.VerticalFlip - p: 0.5 - - _target_: albumentations.RandomGamma - p: 0.5 - - _target_: albumentations.RandomBrightnessContrast - p: 0.5 - - _target_: albumentations.HueSaturationValue - p: 0.5 - - - _target_: rationai.staining.AugmentStainingTransform - - conversion: - _target_: rationai.staining.ColorConversion.from_stain_vectors - stain1: [0.479, 0.823, 0.305] - stain2: [0.156, 0.949, 0.273] - stain3: [-0.189, -0.242, 0.952] - - noise_transform: - _target_: albumentations.Compose - transforms: - - _target_: albumentations.MultiplicativeNoise - multiplier: [0.5, 1.5] - per_channel: true - elementwise: false - p: 1.0 - - - _target_: albumentations.AdditiveNoise - noise_type: uniform - noise_params: - ranges: - - [-0.005, 0.005] - p: 1.0 diff --git a/configs/experiment/predict/embeddings/pgp/multi_aggregator_eval/radboud_test.yaml b/configs/experiment/predict/embeddings/pgp/multi_aggregator_eval/radboud_test.yaml new file mode 100644 index 00000000..bd7323c9 --- /dev/null +++ b/configs/experiment/predict/embeddings/pgp/multi_aggregator_eval/radboud_test.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/predict/embeddings/pgp/multi_aggregator_eval/base + - /data/radboud/test@predict_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/experiment/predict/embeddings/pgp/multi_aggregator_eval/stain_radboud_test.yaml b/configs/experiment/predict/embeddings/pgp/multi_aggregator_eval/stain_radboud_test.yaml new file mode 100644 index 00000000..dcbcc96d --- /dev/null +++ b/configs/experiment/predict/embeddings/pgp/multi_aggregator_eval/stain_radboud_test.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/predict/embeddings/pgp/multi_aggregator_eval/stain_base + - /data/radboud/test@predict_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/experiment/predict/embeddings/virchow2/multi_aggregator_eval/radboud_test.yaml b/configs/experiment/predict/embeddings/virchow2/multi_aggregator_eval/radboud_test.yaml new file mode 100644 index 00000000..02478538 --- /dev/null +++ b/configs/experiment/predict/embeddings/virchow2/multi_aggregator_eval/radboud_test.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/predict/embeddings/virchow2/multi_aggregator_eval/base + - /data/radboud/test@predict_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/experiment/predict/embeddings/virchow2/multi_aggregator_eval/stain_radboud_test.yaml b/configs/experiment/predict/embeddings/virchow2/multi_aggregator_eval/stain_radboud_test.yaml new file mode 100644 index 00000000..d994a82a --- /dev/null +++ b/configs/experiment/predict/embeddings/virchow2/multi_aggregator_eval/stain_radboud_test.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/predict/embeddings/virchow2/multi_aggregator_eval/stain_base + - /data/radboud/test@predict_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/experiment/predict/images/google_vit/multi_aggregator_eval/radboud_test.yaml b/configs/experiment/predict/images/google_vit/multi_aggregator_eval/radboud_test.yaml new file mode 100644 index 00000000..a6875770 --- /dev/null +++ b/configs/experiment/predict/images/google_vit/multi_aggregator_eval/radboud_test.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/predict/images/google_vit/multi_aggregator_eval/base + - /data/radboud/test@predict_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/experiment/predict/images/google_vit/multi_aggregator_eval/stain_radboud_test.yaml b/configs/experiment/predict/images/google_vit/multi_aggregator_eval/stain_radboud_test.yaml new file mode 100644 index 00000000..08800bdc --- /dev/null +++ b/configs/experiment/predict/images/google_vit/multi_aggregator_eval/stain_radboud_test.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/predict/images/google_vit/multi_aggregator_eval/stain_base + - /data/radboud/test@predict_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/experiment/predict/images/resnet50/heatmaps_and_max_aggregations/radboud_test.yaml b/configs/experiment/predict/images/resnet50/heatmaps_and_max_aggregations/radboud_test.yaml new file mode 100644 index 00000000..35ee7dbb --- /dev/null +++ b/configs/experiment/predict/images/resnet50/heatmaps_and_max_aggregations/radboud_test.yaml @@ -0,0 +1,6 @@ +# @package _global_ + +defaults: + - /experiment/predict/images/resnet50/heatmaps_and_max_aggregations/base + - /data/radboud/test@predict_data + - _self_ diff --git a/configs/experiment/predict/images/resnet50/multi_aggregator_eval/radboud_test.yaml b/configs/experiment/predict/images/resnet50/multi_aggregator_eval/radboud_test.yaml new file mode 100644 index 00000000..b76dbcc4 --- /dev/null +++ b/configs/experiment/predict/images/resnet50/multi_aggregator_eval/radboud_test.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/predict/images/resnet50/multi_aggregator_eval/base + - /data/radboud/test@predict_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/experiment/predict/images/resnet50/multi_aggregator_eval/radboud_test_224.yaml b/configs/experiment/predict/images/resnet50/multi_aggregator_eval/radboud_test_224.yaml new file mode 100644 index 00000000..55ffa8cd --- /dev/null +++ b/configs/experiment/predict/images/resnet50/multi_aggregator_eval/radboud_test_224.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/predict/images/resnet50/multi_aggregator_eval/base_224 + - /data/radboud/test@predict_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/experiment/predict/images/resnet50/multi_aggregator_eval/stain_radboud_test.yaml b/configs/experiment/predict/images/resnet50/multi_aggregator_eval/stain_radboud_test.yaml new file mode 100644 index 00000000..f8eb8f19 --- /dev/null +++ b/configs/experiment/predict/images/resnet50/multi_aggregator_eval/stain_radboud_test.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/predict/images/resnet50/multi_aggregator_eval/stain_base + - /data/radboud/test@predict_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/experiment/predict/images/resnet50/multi_aggregator_eval/stain_radboud_test_224.yaml b/configs/experiment/predict/images/resnet50/multi_aggregator_eval/stain_radboud_test_224.yaml new file mode 100644 index 00000000..e9346f2a --- /dev/null +++ b/configs/experiment/predict/images/resnet50/multi_aggregator_eval/stain_radboud_test_224.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/predict/images/resnet50/multi_aggregator_eval/stain_base_224 + - /data/radboud/test@predict_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/experiment/predict/images/vgg16/multi_aggregator_eval/radboud_test.yaml b/configs/experiment/predict/images/vgg16/multi_aggregator_eval/radboud_test.yaml new file mode 100644 index 00000000..93ad0bac --- /dev/null +++ b/configs/experiment/predict/images/vgg16/multi_aggregator_eval/radboud_test.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/predict/images/vgg16/multi_aggregator_eval/base + - /data/radboud/test@predict_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/experiment/predict/images/vgg16/multi_aggregator_eval/radboud_test_224.yaml b/configs/experiment/predict/images/vgg16/multi_aggregator_eval/radboud_test_224.yaml new file mode 100644 index 00000000..47512064 --- /dev/null +++ b/configs/experiment/predict/images/vgg16/multi_aggregator_eval/radboud_test_224.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/predict/images/vgg16/multi_aggregator_eval/base_224 + - /data/radboud/test@predict_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/experiment/predict/images/vgg16/multi_aggregator_eval/stain_radboud_test.yaml b/configs/experiment/predict/images/vgg16/multi_aggregator_eval/stain_radboud_test.yaml new file mode 100644 index 00000000..95828140 --- /dev/null +++ b/configs/experiment/predict/images/vgg16/multi_aggregator_eval/stain_radboud_test.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/predict/images/vgg16/multi_aggregator_eval/stain_base + - /data/radboud/test@predict_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/experiment/predict/images/vgg16/multi_aggregator_eval/stain_radboud_test_224.yaml b/configs/experiment/predict/images/vgg16/multi_aggregator_eval/stain_radboud_test_224.yaml new file mode 100644 index 00000000..722914ec --- /dev/null +++ b/configs/experiment/predict/images/vgg16/multi_aggregator_eval/stain_radboud_test_224.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/predict/images/vgg16/multi_aggregator_eval/stain_base_224 + - /data/radboud/test@predict_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/experiment/preprocessing/filter_tiles/radboud_test.yaml b/configs/experiment/preprocessing/filter_tiles/radboud_test.yaml new file mode 100644 index 00000000..23100058 --- /dev/null +++ b/configs/experiment/preprocessing/filter_tiles/radboud_test.yaml @@ -0,0 +1,5 @@ +# @package _global_ + +defaults: + - /data/radboud/test@data + - _self_ diff --git a/configs/experiment/preprocessing/filter_tiles/radboud_train.yaml b/configs/experiment/preprocessing/filter_tiles/radboud_train.yaml new file mode 100644 index 00000000..c6d87616 --- /dev/null +++ b/configs/experiment/preprocessing/filter_tiles/radboud_train.yaml @@ -0,0 +1,5 @@ +# @package _global_ + +defaults: + - /data/radboud/train@data + - _self_ diff --git a/configs/experiment/preprocessing/filter_tiles/radboud_val.yaml b/configs/experiment/preprocessing/filter_tiles/radboud_val.yaml new file mode 100644 index 00000000..8ead8fb8 --- /dev/null +++ b/configs/experiment/preprocessing/filter_tiles/radboud_val.yaml @@ -0,0 +1,5 @@ +# @package _global_ + +defaults: + - /data/radboud/val@data + - _self_ diff --git a/configs/experiment/preprocessing/tile_embeddings_v2/pgp/base.yaml b/configs/experiment/preprocessing/tile_embeddings_v2/pgp/base.yaml index eec9b461..fac2b2f7 100644 --- a/configs/experiment/preprocessing/tile_embeddings_v2/pgp/base.yaml +++ b/configs/experiment/preprocessing/tile_embeddings_v2/pgp/base.yaml @@ -1,3 +1,3 @@ # @package _global_ -encoder: "provgigapath" +encoder: "prov-gigapath" diff --git a/configs/experiment/preprocessing/tile_embeddings_v2/pgp/radboud_test.yaml b/configs/experiment/preprocessing/tile_embeddings_v2/pgp/radboud_test.yaml new file mode 100644 index 00000000..4f0f5548 --- /dev/null +++ b/configs/experiment/preprocessing/tile_embeddings_v2/pgp/radboud_test.yaml @@ -0,0 +1,5 @@ +# @package _global_ + +defaults: + - /experiment/preprocessing/tile_embeddings_v2/pgp/base + - /data/radboud/test@data diff --git a/configs/experiment/preprocessing/tile_embeddings_v2/pgp/radboud_val.yaml b/configs/experiment/preprocessing/tile_embeddings_v2/pgp/radboud_val.yaml new file mode 100644 index 00000000..6d312f4d --- /dev/null +++ b/configs/experiment/preprocessing/tile_embeddings_v2/pgp/radboud_val.yaml @@ -0,0 +1,5 @@ +# @package _global_ + +defaults: + - /experiment/preprocessing/tile_embeddings_v2/pgp/base + - /data/radboud/val@data diff --git a/configs/experiment/preprocessing/tile_embeddings_v2/virchow2/radboud_test.yaml b/configs/experiment/preprocessing/tile_embeddings_v2/virchow2/radboud_test.yaml new file mode 100644 index 00000000..ce19ac71 --- /dev/null +++ b/configs/experiment/preprocessing/tile_embeddings_v2/virchow2/radboud_test.yaml @@ -0,0 +1,5 @@ +# @package _global_ + +defaults: + - /experiment/preprocessing/tile_embeddings_v2/virchow2/base + - /data/radboud/test@data diff --git a/configs/experiment/preprocessing/tile_embeddings_v2/virchow2/radboud_val.yaml b/configs/experiment/preprocessing/tile_embeddings_v2/virchow2/radboud_val.yaml new file mode 100644 index 00000000..38e710a1 --- /dev/null +++ b/configs/experiment/preprocessing/tile_embeddings_v2/virchow2/radboud_val.yaml @@ -0,0 +1,5 @@ +# @package _global_ + +defaults: + - /experiment/preprocessing/tile_embeddings_v2/virchow2/base + - /data/radboud/val@data diff --git a/configs/experiment/preprocessing/tile_masks/radboud_test_224.yaml b/configs/experiment/preprocessing/tile_masks/radboud_test_224.yaml new file mode 100644 index 00000000..ca9819ee --- /dev/null +++ b/configs/experiment/preprocessing/tile_masks/radboud_test_224.yaml @@ -0,0 +1,15 @@ +# @package _global_ + +defaults: + - /data/radboud/test@data + - _self_ + +tile_uris: + - ${data.tiles_filtered_uri_224} + +percentage_cols: + - "tissue_roi_percentage" + - "carcinoma_roi_percentage" + - "residual_percentage" + - "blur_percentage" + - "folding_percentage" diff --git a/configs/experiment/preprocessing/tile_masks/radboud_test_512.yaml b/configs/experiment/preprocessing/tile_masks/radboud_test_512.yaml new file mode 100644 index 00000000..4ff4d6ed --- /dev/null +++ b/configs/experiment/preprocessing/tile_masks/radboud_test_512.yaml @@ -0,0 +1,15 @@ +# @package _global_ + +defaults: + - /data/radboud/test@data + - _self_ + +tile_uris: + - ${data.tiles_filtered_uri_512} + +percentage_cols: + - "tissue_roi_percentage" + - "carcinoma_roi_percentage" + - "residual_percentage" + - "blur_percentage" + - "folding_percentage" diff --git a/configs/experiment/preprocessing/tile_masks/radboud_train_224.yaml b/configs/experiment/preprocessing/tile_masks/radboud_train_224.yaml new file mode 100644 index 00000000..bef43107 --- /dev/null +++ b/configs/experiment/preprocessing/tile_masks/radboud_train_224.yaml @@ -0,0 +1,15 @@ +# @package _global_ + +defaults: + - /data/radboud/train@data + - _self_ + +tile_uris: + - ${data.tiles_filtered_uri_224} + +percentage_cols: + - "tissue_roi_percentage" + - "carcinoma_roi_percentage" + - "residual_percentage" + - "blur_percentage" + - "folding_percentage" diff --git a/configs/experiment/preprocessing/tile_masks/radboud_train_512.yaml b/configs/experiment/preprocessing/tile_masks/radboud_train_512.yaml new file mode 100644 index 00000000..ecd8700f --- /dev/null +++ b/configs/experiment/preprocessing/tile_masks/radboud_train_512.yaml @@ -0,0 +1,15 @@ +# @package _global_ + +defaults: + - /data/radboud/train@data + - _self_ + +tile_uris: + - ${data.tiles_filtered_uri_512} + +percentage_cols: + - "tissue_roi_percentage" + - "carcinoma_roi_percentage" + - "residual_percentage" + - "blur_percentage" + - "folding_percentage" diff --git a/configs/experiment/preprocessing/tile_masks/radboud_val_224.yaml b/configs/experiment/preprocessing/tile_masks/radboud_val_224.yaml new file mode 100644 index 00000000..cd3f0fa9 --- /dev/null +++ b/configs/experiment/preprocessing/tile_masks/radboud_val_224.yaml @@ -0,0 +1,15 @@ +# @package _global_ + +defaults: + - /data/radboud/val@data + - _self_ + +tile_uris: + - ${data.tiles_filtered_uri_224} + +percentage_cols: + - "tissue_roi_percentage" + - "carcinoma_roi_percentage" + - "residual_percentage" + - "blur_percentage" + - "folding_percentage" diff --git a/configs/experiment/preprocessing/tile_masks/radboud_val_512.yaml b/configs/experiment/preprocessing/tile_masks/radboud_val_512.yaml index 1d8ab1aa..82c5458c 100644 --- a/configs/experiment/preprocessing/tile_masks/radboud_val_512.yaml +++ b/configs/experiment/preprocessing/tile_masks/radboud_val_512.yaml @@ -5,8 +5,11 @@ defaults: - _self_ tile_uris: - - ${data.tiles_uri_512} + - ${data.tiles_filtered_uri_512} percentage_cols: - "tissue_roi_percentage" - "carcinoma_roi_percentage" + - "residual_percentage" + - "blur_percentage" + - "folding_percentage" diff --git a/configs/experiment/test/bag_of_embeddings/pgp/test_suite/classic_radboud_test.yaml b/configs/experiment/test/bag_of_embeddings/pgp/test_suite/classic_radboud_test.yaml new file mode 100644 index 00000000..f05a3f29 --- /dev/null +++ b/configs/experiment/test/bag_of_embeddings/pgp/test_suite/classic_radboud_test.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/test/bag_of_embeddings/pgp/test_suite/classic_base + - /data/radboud/test@test_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/experiment/test/bag_of_embeddings/pgp/test_suite/hybrid_radboud_test.yaml b/configs/experiment/test/bag_of_embeddings/pgp/test_suite/hybrid_radboud_test.yaml new file mode 100644 index 00000000..5507086a --- /dev/null +++ b/configs/experiment/test/bag_of_embeddings/pgp/test_suite/hybrid_radboud_test.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/test/bag_of_embeddings/pgp/test_suite/hybrid_base + - /data/radboud/test@test_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/experiment/test/bag_of_embeddings/virchow2/test_suite/classic_radboud_test.yaml b/configs/experiment/test/bag_of_embeddings/virchow2/test_suite/classic_radboud_test.yaml new file mode 100644 index 00000000..0b9dc7fd --- /dev/null +++ b/configs/experiment/test/bag_of_embeddings/virchow2/test_suite/classic_radboud_test.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/test/bag_of_embeddings/virchow2/test_suite/classic_base + - /data/radboud/test@test_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/experiment/test/bag_of_embeddings/virchow2/test_suite/hybrid_radboud_test.yaml b/configs/experiment/test/bag_of_embeddings/virchow2/test_suite/hybrid_radboud_test.yaml new file mode 100644 index 00000000..debfccc8 --- /dev/null +++ b/configs/experiment/test/bag_of_embeddings/virchow2/test_suite/hybrid_radboud_test.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/test/bag_of_embeddings/virchow2/test_suite/hybrid_base + - /data/radboud/test@test_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/experiment/test/embeddings/pgp/test_suite/radboud_test.yaml b/configs/experiment/test/embeddings/pgp/test_suite/radboud_test.yaml new file mode 100644 index 00000000..24e1ab6b --- /dev/null +++ b/configs/experiment/test/embeddings/pgp/test_suite/radboud_test.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/test/embeddings/pgp/test_suite/base + - /data/radboud/test@test_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/experiment/test/embeddings/pgp/test_suite/stain_radboud_test.yaml b/configs/experiment/test/embeddings/pgp/test_suite/stain_radboud_test.yaml new file mode 100644 index 00000000..b74ba07b --- /dev/null +++ b/configs/experiment/test/embeddings/pgp/test_suite/stain_radboud_test.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/test/embeddings/pgp/test_suite/stain_base + - /data/radboud/test@test_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/experiment/test/embeddings/virchow2/test_suite/radboud_test.yaml b/configs/experiment/test/embeddings/virchow2/test_suite/radboud_test.yaml new file mode 100644 index 00000000..03d7b8a7 --- /dev/null +++ b/configs/experiment/test/embeddings/virchow2/test_suite/radboud_test.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/test/embeddings/virchow2/test_suite/base + - /data/radboud/test@test_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/experiment/test/embeddings/virchow2/test_suite/stain_radboud_test.yaml b/configs/experiment/test/embeddings/virchow2/test_suite/stain_radboud_test.yaml new file mode 100644 index 00000000..c103e074 --- /dev/null +++ b/configs/experiment/test/embeddings/virchow2/test_suite/stain_radboud_test.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/test/embeddings/virchow2/test_suite/stain_base + - /data/radboud/test@test_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/experiment/test/images/google_vit/test_suite/radboud_test.yaml b/configs/experiment/test/images/google_vit/test_suite/radboud_test.yaml new file mode 100644 index 00000000..d71bad18 --- /dev/null +++ b/configs/experiment/test/images/google_vit/test_suite/radboud_test.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/test/images/google_vit/test_suite/base + - /data/radboud/test@test_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/experiment/test/images/google_vit/test_suite/stain_radboud_test.yaml b/configs/experiment/test/images/google_vit/test_suite/stain_radboud_test.yaml new file mode 100644 index 00000000..fb049c19 --- /dev/null +++ b/configs/experiment/test/images/google_vit/test_suite/stain_radboud_test.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/test/images/google_vit/test_suite/stain_base + - /data/radboud/test@test_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/experiment/test/images/resnet50/test_suite/radboud_test.yaml b/configs/experiment/test/images/resnet50/test_suite/radboud_test.yaml new file mode 100644 index 00000000..dd61d2f0 --- /dev/null +++ b/configs/experiment/test/images/resnet50/test_suite/radboud_test.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/test/images/resnet50/test_suite/base + - /data/radboud/test@test_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/experiment/test/images/resnet50/test_suite/radboud_test_224.yaml b/configs/experiment/test/images/resnet50/test_suite/radboud_test_224.yaml new file mode 100644 index 00000000..8ff63dea --- /dev/null +++ b/configs/experiment/test/images/resnet50/test_suite/radboud_test_224.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/test/images/resnet50/test_suite/base_224 + - /data/radboud/test@test_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/experiment/test/images/resnet50/test_suite/stain_radboud_test.yaml b/configs/experiment/test/images/resnet50/test_suite/stain_radboud_test.yaml new file mode 100644 index 00000000..6b7bd7e8 --- /dev/null +++ b/configs/experiment/test/images/resnet50/test_suite/stain_radboud_test.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/test/images/resnet50/test_suite/stain_base + - /data/radboud/test@test_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/experiment/test/images/resnet50/test_suite/stain_radboud_test_224.yaml b/configs/experiment/test/images/resnet50/test_suite/stain_radboud_test_224.yaml new file mode 100644 index 00000000..4f2c2959 --- /dev/null +++ b/configs/experiment/test/images/resnet50/test_suite/stain_radboud_test_224.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/test/images/resnet50/test_suite/stain_base_224 + - /data/radboud/test@test_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/experiment/test/images/vgg16/test_suite/radboud_test.yaml b/configs/experiment/test/images/vgg16/test_suite/radboud_test.yaml new file mode 100644 index 00000000..80d26deb --- /dev/null +++ b/configs/experiment/test/images/vgg16/test_suite/radboud_test.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/test/images/vgg16/test_suite/base + - /data/radboud/test@test_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/experiment/test/images/vgg16/test_suite/radboud_test_224.yaml b/configs/experiment/test/images/vgg16/test_suite/radboud_test_224.yaml new file mode 100644 index 00000000..0a5a9a6a --- /dev/null +++ b/configs/experiment/test/images/vgg16/test_suite/radboud_test_224.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/test/images/vgg16/test_suite/base_224 + - /data/radboud/test@test_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/experiment/test/images/vgg16/test_suite/stain_radboud_test.yaml b/configs/experiment/test/images/vgg16/test_suite/stain_radboud_test.yaml new file mode 100644 index 00000000..db1a9b4d --- /dev/null +++ b/configs/experiment/test/images/vgg16/test_suite/stain_radboud_test.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/test/images/vgg16/test_suite/stain_base + - /data/radboud/test@test_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/experiment/test/images/vgg16/test_suite/stain_radboud_test_224.yaml b/configs/experiment/test/images/vgg16/test_suite/stain_radboud_test_224.yaml new file mode 100644 index 00000000..e7e6e754 --- /dev/null +++ b/configs/experiment/test/images/vgg16/test_suite/stain_radboud_test_224.yaml @@ -0,0 +1,8 @@ +# @package _global_ + +defaults: + - /experiment/test/images/vgg16/test_suite/stain_base_224 + - /data/radboud/test@test_data + - _self_ + +checkpoint: ${model_data.public_checkpoint} diff --git a/configs/model/checkpoints/mmci_tl/google_vit.yaml b/configs/model/checkpoints/mmci_tl/google_vit.yaml index db3f6e1d..89c9323a 100644 --- a/configs/model/checkpoints/mmci_tl/google_vit.yaml +++ b/configs/model/checkpoints/mmci_tl/google_vit.yaml @@ -9,6 +9,8 @@ slide_top_k_threshold: 0.9998286963 slide_span_threshold: 0.5 # arbitrary - span predictions are binary checkpoint: "mlflow-artifacts:/65/4b7c1663713b4dd0b03063c9f9b60925/artifacts/checkpoints/epoch=0-step=55556/checkpoint.ckpt" +public_checkpoint: "mlflow-artifacts:/38/abde571304794242be0c1630b7bd16ce/artifacts/gvit_checkpoint.ckpt" + model_name: "Google ViT" slide_level_prediction_uris: diff --git a/configs/model/checkpoints/mmci_tl/google_vit_stain.yaml b/configs/model/checkpoints/mmci_tl/google_vit_stain.yaml index ab7ed29a..4fa5ab9e 100644 --- a/configs/model/checkpoints/mmci_tl/google_vit_stain.yaml +++ b/configs/model/checkpoints/mmci_tl/google_vit_stain.yaml @@ -9,6 +9,8 @@ slide_top_k_threshold: 0.9986477494 slide_span_threshold: 0.5 # arbitrary - span predictions are binary checkpoint: "mlflow-artifacts:/65/a07e33c384a64cb9ab73621200efd314/artifacts/checkpoints/epoch=5-step=291684/checkpoint.ckpt" +public_checkpoint: "mlflow-artifacts:/38/abde571304794242be0c1630b7bd16ce/artifacts/gvit_stain_checkpoint.ckpt" + model_name: "Google ViT (Stain)" slide_level_prediction_uris: diff --git a/configs/model/checkpoints/mmci_tl/pgp_classic_mil.yaml b/configs/model/checkpoints/mmci_tl/pgp_classic_mil.yaml index 371a74ed..bf9eab49 100644 --- a/configs/model/checkpoints/mmci_tl/pgp_classic_mil.yaml +++ b/configs/model/checkpoints/mmci_tl/pgp_classic_mil.yaml @@ -6,4 +6,6 @@ tile_threshold: 0.65 slide_threshold: 0.1796019971 checkpoint: "mlflow-artifacts:/65/9e9e6ec6817844c296004f0dc7369d1f/artifacts/checkpoints/epoch=6-step=1221/checkpoint.ckpt" +public_checkpoint: "mlflow-artifacts:/38/abde571304794242be0c1630b7bd16ce/artifacts/pgp_classic_mil_checkpoint.ckpt" + model_name: "PGP (Classic-MIL)" diff --git a/configs/model/checkpoints/mmci_tl/pgp_hybrid_mil.yaml b/configs/model/checkpoints/mmci_tl/pgp_hybrid_mil.yaml index 4c5b99d9..d4baa827 100644 --- a/configs/model/checkpoints/mmci_tl/pgp_hybrid_mil.yaml +++ b/configs/model/checkpoints/mmci_tl/pgp_hybrid_mil.yaml @@ -6,4 +6,6 @@ tile_threshold: 0.88 slide_threshold: 0.9783778786 checkpoint: "mlflow-artifacts:/65/7cb992adfe4b422790becc5984ff2a6f/artifacts/checkpoints/epoch=8-step=1583/checkpoint.ckpt" +public_checkpoint: "mlflow-artifacts:/38/abde571304794242be0c1630b7bd16ce/artifacts/pgp_hybrid_mil_checkpoint.ckpt" + model_name: "PGP (Hybrid-MIL)" diff --git a/configs/model/checkpoints/mmci_tl/pgp_stain.yaml b/configs/model/checkpoints/mmci_tl/pgp_stain.yaml index cc6c3208..20c360b7 100644 --- a/configs/model/checkpoints/mmci_tl/pgp_stain.yaml +++ b/configs/model/checkpoints/mmci_tl/pgp_stain.yaml @@ -9,7 +9,8 @@ slide_top_k_threshold: 0.911498785 slide_span_threshold: 0.5 # arbitrary - span predictions are binary checkpoint: "mlflow-artifacts:/65/4e6a272ec77c4deaa8c8b7b53a6295b2/artifacts/checkpoints/epoch=3-step=222233/checkpoint.ckpt" -public_checkpoint: null +public_checkpoint: "mlflow-artifacts:/38/abde571304794242be0c1630b7bd16ce/artifacts/pgp_stain_checkpoint.ckpt" + model_name: "PGP (Stain & Frozen)" slide_level_prediction_uris: diff --git a/configs/model/checkpoints/mmci_tl/resnet50_224.yaml b/configs/model/checkpoints/mmci_tl/resnet50_224.yaml index efa9c5b4..d044e606 100644 --- a/configs/model/checkpoints/mmci_tl/resnet50_224.yaml +++ b/configs/model/checkpoints/mmci_tl/resnet50_224.yaml @@ -9,7 +9,7 @@ slide_top_k_threshold: 0.9961571097 slide_span_threshold: 0.5 # arbitrary - span predictions are binary checkpoint: "mlflow-artifacts:/65/d9bd39a0207c4b9484ad92574c50b503/artifacts/checkpoints/epoch=0-step=13889/checkpoint.ckpt" -public_checkpoint: "mlflow-artifacts:/38/abde571304794242be0c1630b7bd16ce/artifacts/resnet50_checkpoint.ckpt" +public_checkpoint: "mlflow-artifacts:/38/abde571304794242be0c1630b7bd16ce/artifacts/resnet50_224_checkpoint.ckpt" model_name: "ResNet50 (224x224)" slide_level_prediction_uris: diff --git a/configs/model/checkpoints/mmci_tl/resnet50_stain_224.yaml b/configs/model/checkpoints/mmci_tl/resnet50_stain_224.yaml index f59017ca..03de76bf 100644 --- a/configs/model/checkpoints/mmci_tl/resnet50_stain_224.yaml +++ b/configs/model/checkpoints/mmci_tl/resnet50_stain_224.yaml @@ -9,7 +9,7 @@ slide_top_k_threshold: 0.9998824596 slide_span_threshold: 0.5 # arbitrary - span predictions are binary checkpoint: "mlflow-artifacts:/65/80543b4ec2d14ca48384e6d52a7418fb/artifacts/checkpoints/epoch=0-step=55556/checkpoint.ckpt" -public_checkpoint: "mlflow-artifacts:/38/abde571304794242be0c1630b7bd16ce/artifacts/resnet50_stain_checkpoint.ckpt" +public_checkpoint: "mlflow-artifacts:/38/abde571304794242be0c1630b7bd16ce/artifacts/resnet50_stain_224_checkpoint.ckpt" model_name: "ResNet50 Stain (224x224)" slide_level_prediction_uris: diff --git a/configs/model/checkpoints/mmci_tl/vgg16_224.yaml b/configs/model/checkpoints/mmci_tl/vgg16_224.yaml index 993ba92f..a7d55962 100644 --- a/configs/model/checkpoints/mmci_tl/vgg16_224.yaml +++ b/configs/model/checkpoints/mmci_tl/vgg16_224.yaml @@ -9,7 +9,7 @@ slide_top_k_threshold: 0.9999379516 slide_span_threshold: 0.5 # arbitrary - span predictions are binary checkpoint: "mlflow-artifacts:/65/2b4986681bb24e1abd85a9108a7a49bb/artifacts/checkpoints/epoch=1-step=97226/checkpoint.ckpt" -public_checkpoint: "mlflow-artifacts:/38/abde571304794242be0c1630b7bd16ce/artifacts/vgg16_checkpoint.ckpt" +public_checkpoint: "mlflow-artifacts:/38/abde571304794242be0c1630b7bd16ce/artifacts/vgg16_224_checkpoint.ckpt" model_name: "VGG-16 (224x224)" slide_level_prediction_uris: diff --git a/configs/model/checkpoints/mmci_tl/vgg16_stain_224.yaml b/configs/model/checkpoints/mmci_tl/vgg16_stain_224.yaml index 912791ca..b27988d8 100644 --- a/configs/model/checkpoints/mmci_tl/vgg16_stain_224.yaml +++ b/configs/model/checkpoints/mmci_tl/vgg16_stain_224.yaml @@ -9,7 +9,7 @@ slide_top_k_threshold: 0.9988395572 slide_span_threshold: 0.5 # arbitrary - span predictions are binary checkpoint: "mlflow-artifacts:/65/98e0d43027664084aef1beebaeac7fff/artifacts/checkpoints/epoch=1-step=111115/checkpoint.ckpt" -public_checkpoint: "mlflow-artifacts:/38/abde571304794242be0c1630b7bd16ce/artifacts/vgg16_stain_checkpoint.ckpt" +public_checkpoint: "mlflow-artifacts:/38/abde571304794242be0c1630b7bd16ce/artifacts/vgg16_stain_224_checkpoint.ckpt" model_name: "VGG-16 Stain (224x224)" diff --git a/configs/model/checkpoints/mmci_tl/virchow2_classic_mil.yaml b/configs/model/checkpoints/mmci_tl/virchow2_classic_mil.yaml index 781c1a43..c3629376 100644 --- a/configs/model/checkpoints/mmci_tl/virchow2_classic_mil.yaml +++ b/configs/model/checkpoints/mmci_tl/virchow2_classic_mil.yaml @@ -6,4 +6,6 @@ tile_threshold: 0.77 slide_threshold: 0.1469607204 checkpoint: "mlflow-artifacts:/65/8613d45c98664f63b5cdd7e40e190986/artifacts/checkpoints/epoch=5-step=950/checkpoint.ckpt" +public_checkpoint: "mlflow-artifacts:/38/abde571304794242be0c1630b7bd16ce/artifacts/virchow2_classic_mil_checkpoint.ckpt" + model_name: "Virchow2 (Classic-MIL)" diff --git a/configs/model/checkpoints/mmci_tl/virchow2_hybrid_mil.yaml b/configs/model/checkpoints/mmci_tl/virchow2_hybrid_mil.yaml index 11f36170..cb602b38 100644 --- a/configs/model/checkpoints/mmci_tl/virchow2_hybrid_mil.yaml +++ b/configs/model/checkpoints/mmci_tl/virchow2_hybrid_mil.yaml @@ -6,4 +6,6 @@ tile_threshold: 0.85 slide_threshold: 0.9917988777 checkpoint: "mlflow-artifacts:/65/5e0c1d4699ca49c4938baf3c65e7f61c/artifacts/checkpoints/epoch=6-step=1176/checkpoint.ckpt" +public_checkpoint: "mlflow-artifacts:/38/abde571304794242be0c1630b7bd16ce/artifacts/virchow2_hybrid_mil_checkpoint.ckpt" + model_name: "Virchow2 (Hybrid-MIL)" diff --git a/configs/model/checkpoints/mmci_tl/virchow2_stain.yaml b/configs/model/checkpoints/mmci_tl/virchow2_stain.yaml index 22957025..38fa1d65 100644 --- a/configs/model/checkpoints/mmci_tl/virchow2_stain.yaml +++ b/configs/model/checkpoints/mmci_tl/virchow2_stain.yaml @@ -9,7 +9,7 @@ slide_top_k_threshold: 0.9723860025 slide_span_threshold: 0.5 # arbitrary - span predictions are binary checkpoint: "mlflow-artifacts:/65/d39c26e7dd474d3bbdd3932f6f8bf2fb/artifacts/checkpoints/epoch=0-step=27778/checkpoint.ckpt" -public_checkpoint: null +public_checkpoint: "mlflow-artifacts:/38/abde571304794242be0c1630b7bd16ce/artifacts/virchow2_stain_checkpoint.ckpt" model_name: "Virchow2 (Stain & Frozen)" diff --git a/preprocessing/embeddings/tile_embeddings_v2.py b/preprocessing/embeddings/tile_embeddings_v2.py index e8ff41e1..f15ca253 100644 --- a/preprocessing/embeddings/tile_embeddings_v2.py +++ b/preprocessing/embeddings/tile_embeddings_v2.py @@ -86,8 +86,13 @@ def main(config: DictConfig, logger: MLFlowLogger) -> None: if tiles_parquet_dir.exists(): shutil.rmtree(tiles_parquet_dir) - slides.to_parquet(output_path / "slides.parquet", index=False) - ds.write_parquet(str(tiles_parquet_dir), min_rows_per_file=config.rows_per_file) + slides_parquet_dir = output_path / "slides" + if slides_parquet_dir.exists(): + shutil.rmtree(slides_parquet_dir) + + slides_parquet_dir.mkdir(parents=True, exist_ok=True) + slides.to_parquet(slides_parquet_dir / "slides.parquet", index=False) + ds.write_parquet(str(tiles_parquet_dir), max_rows_per_file=config.rows_per_file) logger.log_artifacts(str(output_path), f"{config.data.data_name}") diff --git a/pyproject.toml b/pyproject.toml index 0c78e67e..d70316a5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,8 +25,8 @@ dependencies = [ "rationai-masks @ git+https://gitlab.ics.muni.cz/rationai/digital-pathology/libraries/masks.git", "rationai-mlkit @ git+https://github.com/RationAI/mlkit.git", "rationai-tiling @ git+https://gitlab.ics.muni.cz/rationai/digital-pathology/libraries/tiling.git", - "rationai-staining @ git+https://gitlab.ics.muni.cz/rationai/digital-pathology/libraries/staining.git", - "rationai-sdk @git+https://github.com/RationAI/rationai-sdk-python.git@68904dfd216ce19454e08a032f7e4dd978a85707", + "rationai-staining @ git+https://gitlab.ics.muni.cz/rationai/digital-pathology/libraries/staining.git@2437ec9af319731f3e32aa79c4bf9e6fef5a5711", + "rationai-sdk @git+https://github.com/RationAI/rationai-sdk-python.git", "numpy>=2.3.2", "timm==1.0.15", "matplotlib==3.10.1", diff --git a/uv.lock b/uv.lock index 8b53308e..2836046d 100644 --- a/uv.lock +++ b/uv.lock @@ -2430,8 +2430,8 @@ requires-dist = [ { name = "pillow", specifier = "==11.3.0" }, { name = "rationai-masks", git = "https://gitlab.ics.muni.cz/rationai/digital-pathology/libraries/masks.git" }, { name = "rationai-mlkit", git = "https://github.com/RationAI/mlkit.git" }, - { name = "rationai-sdk", git = "https://github.com/RationAI/rationai-sdk-python.git?rev=68904dfd216ce19454e08a032f7e4dd978a85707" }, - { name = "rationai-staining", git = "https://gitlab.ics.muni.cz/rationai/digital-pathology/libraries/staining.git" }, + { name = "rationai-sdk", git = "https://github.com/RationAI/rationai-sdk-python.git" }, + { name = "rationai-staining", git = "https://gitlab.ics.muni.cz/rationai/digital-pathology/libraries/staining.git?rev=2437ec9af319731f3e32aa79c4bf9e6fef5a5711" }, { name = "rationai-tiling", git = "https://gitlab.ics.muni.cz/rationai/digital-pathology/libraries/tiling.git" }, { name = "ratiopath", specifier = ">=1.1.2" }, { name = "ray", extras = ["data"], specifier = ">=2.52.1" }, @@ -2927,7 +2927,7 @@ dependencies = [ [[package]] name = "rationai-sdk" version = "0.1.0" -source = { git = "https://github.com/RationAI/rationai-sdk-python.git?rev=68904dfd216ce19454e08a032f7e4dd978a85707#68904dfd216ce19454e08a032f7e4dd978a85707" } +source = { git = "https://github.com/RationAI/rationai-sdk-python.git#3fb74c0f867432422dacde29ec5c0a4584af4830" } dependencies = [ { name = "httpx" }, { name = "lz4" }, @@ -2938,8 +2938,8 @@ dependencies = [ [[package]] name = "rationai-staining" -version = "0.3.0" -source = { git = "https://gitlab.ics.muni.cz/rationai/digital-pathology/libraries/staining.git#c48d216e910df11f3e6891aa071ebb8d04635727" } +version = "0.4.0" +source = { git = "https://gitlab.ics.muni.cz/rationai/digital-pathology/libraries/staining.git?rev=2437ec9af319731f3e32aa79c4bf9e6fef5a5711#2437ec9af319731f3e32aa79c4bf9e6fef5a5711" } dependencies = [ { name = "albumentations" }, { name = "numpy" },