Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
2b2a31e
Implement foreground mask
bhashemian May 26, 2022
381ac73
Add unittests for foreground mask
bhashemian May 26, 2022
ba45b62
Add several test cases
bhashemian May 26, 2022
582caf7
Merge branch 'dev' of github.com:Project-MONAI/MONAI into tissue-mask
bhashemian May 26, 2022
7294c87
Add ForegroundMaskd
bhashemian May 26, 2022
cb86da5
Add unittests for ForegroundMaskd
bhashemian May 26, 2022
a2feb79
Update init
bhashemian May 26, 2022
d271d98
Update docstring
bhashemian May 26, 2022
aff1005
Merge branch 'dev' of github.com:Project-MONAI/MONAI into tissue-mask
bhashemian May 26, 2022
be4a7d5
Merge branch 'dev' of github.com:Project-MONAI/MONAI into tissue-mask
bhashemian May 28, 2022
32313ec
Update to less or equal for RGB threshold
bhashemian May 28, 2022
4771712
Update RGB and HSV mask combination
bhashemian May 28, 2022
7a72eb9
Add support for torch.Tensor
bhashemian May 28, 2022
d393e35
Update docsting and dict tests
bhashemian May 28, 2022
8902a8a
Add docs
bhashemian May 28, 2022
5209c52
Merge branch 'dev' into tissue-mask
bhashemian May 28, 2022
4a8aa14
Add skipunless for skimage
bhashemian May 29, 2022
33fc743
Exclude form min tests
bhashemian May 29, 2022
aa11706
fix a typo
bhashemian May 29, 2022
558314a
Merge branch 'dev' into tissue-mask
bhashemian May 30, 2022
48aece9
Merge branch 'dev' into tissue-mask
bhashemian May 30, 2022
de94b00
Update no or wrong threshold cases
bhashemian May 30, 2022
2849958
Merge branch 'dev' of github.com:Project-MONAI/MONAI into tissue-mask
bhashemian May 30, 2022
ebde248
Update docstring
bhashemian May 30, 2022
b84b63b
Merge branch 'dev' of github.com:Project-MONAI/MONAI into tissue-mask
bhashemian May 30, 2022
0bfb77b
Implement MaskedPatchWSIDataset
bhashemian May 30, 2022
1c8a106
Add unittests
bhashemian May 30, 2022
6e860a3
Merge branch 'dev' into tissue-mask
bhashemian May 31, 2022
deaab9e
pMerge branch 'tissue-mask' of github.com:behxyz/MONAI into tissue-mask
bhashemian May 31, 2022
6411373
Update the min verison for skimage to 0.19.0
bhashemian May 31, 2022
44604e6
Merge branch 'dev' into tissue-mask
bhashemian May 31, 2022
1b0b8c4
Added 3D image test case
bhashemian May 31, 2022
2520c60
Add another 3D test case
bhashemian May 31, 2022
5de232e
resolve conflicts
bhashemian May 31, 2022
6e95fb9
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 31, 2022
2f41a2a
Merge branch 'tissue-mask' of github.com:behxyz/MONAI into masked_wsi…
bhashemian May 31, 2022
f1be100
Merge branch 'masked_wsi_dataset' of github.com:behxyz/MONAI into mas…
bhashemian May 31, 2022
3f01357
Add docs
bhashemian May 31, 2022
9a88c61
Merge branch 'dev' of github.com:Project-MONAI/MONAI into masked_wsi_…
bhashemian May 31, 2022
cfb7cd4
deprecate dataset
bhashemian May 31, 2022
22917e2
Pull the enum from prob map PR
bhashemian May 31, 2022
a1d180e
pull wsi_reader form prob map branch
bhashemian May 31, 2022
d2c68db
Replace all wsi patch key related with WSIPatchKeys
bhashemian May 31, 2022
a5986ca
Update channel last for wsireader
bhashemian May 31, 2022
44d0156
Merge dev
bhashemian May 31, 2022
a782bc5
formmating
bhashemian May 31, 2022
401ff77
Merge branch 'dev' into deprecate-apps-path
bhashemian May 31, 2022
45169eb
Update docs
bhashemian May 31, 2022
2944e09
Fix a typo
bhashemian May 31, 2022
0435742
Merge branch 'dev' into masked_wsi_dataset
bhashemian May 31, 2022
ad4a3f1
Update channel_last and add test cases
bhashemian May 31, 2022
732708e
Merge branch 'masked_wsi_dataset' of github.com:behxyz/MONAI into mas…
bhashemian May 31, 2022
a239104
add image_data to masked dataset
bhashemian Jun 1, 2022
1c3bd38
Pull prob map
bhashemian Jun 1, 2022
b437de8
Update ProbMapKeys.NAME
bhashemian Jun 1, 2022
b7bd6b6
Merge dev
bhashemian Jun 1, 2022
238daab
Update GridPatch and iter_patch to support no padding
bhashemian Jun 1, 2022
a77975e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 1, 2022
4d0ea64
Remove enum filter
bhashemian Jun 1, 2022
be00a42
Update filter_fn for dicts and update docstings:
bhashemian Jun 1, 2022
748d793
Fix typos
bhashemian Jun 1, 2022
e9fde98
Change name value for prob map
bhashemian Jun 1, 2022
787b3ad
Update prob map unittest
bhashemian Jun 1, 2022
91f282e
Merge branch 'dev' into masked_wsi_dataset
bhashemian Jun 1, 2022
14d206d
Read mask shape directly
bhashemian Jun 1, 2022
65d0a15
Merge branch 'masked_wsi_dataset' of github.com:behxyz/MONAI into mas…
bhashemian Jun 1, 2022
835fa1e
Add threshold for filtering to grid patch
bhashemian Jun 2, 2022
d16f120
Add unittest for threshold
bhashemian Jun 2, 2022
48a8e02
Address reviews
bhashemian Jun 2, 2022
f54a4f9
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 2, 2022
66c9095
Merge branch 'dev' into masked_wsi_dataset
bhashemian Jun 2, 2022
74e2b69
Formatting
bhashemian Jun 2, 2022
4a480b4
Merge branch 'masked_wsi_dataset' of github.com:behxyz/MONAI into mas…
bhashemian Jun 2, 2022
f34dd39
Merge branch 'dev' into masked_wsi_dataset
bhashemian Jun 2, 2022
f61d39e
Merge branch 'dev' into masked_wsi_dataset
bhashemian Jun 2, 2022
54ac6df
Merge branch 'dev' of github.com:Project-MONAI/MONAI into deprecate-a…
bhashemian Jun 2, 2022
c6395ac
Merge branch 'masked_wsi_dataset' of github.com:behxyz/MONAI into dep…
bhashemian Jun 2, 2022
3881741
Merge branch 'dev' of github.com:Project-MONAI/MONAI into deprecate-a…
bhashemian Jun 3, 2022
cb3b2f2
Update min test exclusion
bhashemian Jun 3, 2022
8d46f6a
Update test file names for deprecated component and update prob map d…
bhashemian Jun 3, 2022
5cf0a34
Merge branch 'dev' into deprecate-apps-path
bhashemian Jun 3, 2022
af1c967
Merge dev
bhashemian Jun 6, 2022
2113189
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 6, 2022
f50df9c
Remove noqa: N802
bhashemian Jun 6, 2022
65e3c6f
Merge branch 'deprecate-apps-path' of github.com:behxyz/MONAI into de…
bhashemian Jun 6, 2022
e7ac569
Merge branch 'dev' into deprecate-apps-path
bhashemian Jun 7, 2022
828d0bd
Merge dev
bhashemian Jul 27, 2022
1ab0c4a
Deprecate image_reader.WSIReader
bhashemian Jul 27, 2022
985dfca
Rename from _new
bhashemian Jul 27, 2022
d499773
Revert test_patch_wsi_dataset naming
bhashemian Jul 27, 2022
11b93ad
Depreccate test_patch_wsi_dataset
bhashemian Jul 27, 2022
f8285b0
Rename from _new
bhashemian Jul 27, 2022
f2fd06e
Merge branch 'dev' into deprecate-apps-path
bhashemian Jul 28, 2022
0109810
Merge branch 'dev' into deprecate-apps-path
bhashemian Jul 28, 2022
2fd6a8c
Merge branch 'dev' into deprecate-apps-path
bhashemian Aug 3, 2022
925d650
Merge branch 'dev' into deprecate-apps-path
bhashemian Aug 4, 2022
2f1d91a
Revert file names
bhashemian Aug 4, 2022
f04bb5c
Revert file names
bhashemian Aug 5, 2022
6458501
Restove wsireader test:
bhashemian Aug 8, 2022
3af782f
Merge new and deprecated wsireader tests
bhashemian Aug 8, 2022
697ea86
Merge branch 'dev' of github.com:Project-MONAI/MONAI into deprecate-a…
bhashemian Aug 8, 2022
0d595b6
Restore patch wsi dataset testsr
bhashemian Aug 8, 2022
9258031
Merge new and deprecated patch wsi dataset tests
bhashemian Aug 8, 2022
050ef6b
Deprecate unit tests
bhashemian Aug 8, 2022
61d3818
Remove redundant tests
bhashemian Aug 8, 2022
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
5 changes: 4 additions & 1 deletion monai/apps/pathology/data/datasets.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@

from monai.data import Dataset, SmartCacheDataset
from monai.data.image_reader import WSIReader
from monai.utils import ensure_tuple_rep
from monai.utils import deprecated, ensure_tuple_rep

__all__ = ["PatchWSIDataset", "SmartCachePatchWSIDataset", "MaskedInferenceWSIDataset"]


@deprecated(since="0.8", msg_suffix="use `monai.data.PatchWSIDataset` instead.")
class PatchWSIDataset(Dataset):
"""
This dataset reads whole slide images, extracts regions, and creates patches.
Expand Down Expand Up @@ -103,6 +104,7 @@ def __getitem__(self, index):
return patches


@deprecated(since="0.8", msg_suffix="use `monai.data.SmartCacheDataset` with `monai.data.PatchWSIDataset` instead.")
class SmartCachePatchWSIDataset(SmartCacheDataset):
"""Add SmartCache functionality to `PatchWSIDataset`.

Expand Down Expand Up @@ -177,6 +179,7 @@ def __init__(
)


@deprecated(since="0.8", msg_suffix="use `monai.data.MaskedPatchWSIDataset` instead.")
class MaskedInferenceWSIDataset(Dataset):
"""
This dataset load the provided foreground masks at an arbitrary resolution level,
Expand Down
5 changes: 4 additions & 1 deletion monai/apps/pathology/handlers/prob_map_producer.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@

@deprecated(
since="0.8",
msg_suffix="use `monai.handler.ProbMapProducer` (with `monai.data.wsi_dataset.SlidingPatchWSIDataset`) instead.",
msg_suffix=(
"use `monai.handler.ProbMapProducer` (with `monai.data.wsi_dataset.MaskedPatchWSIDataset` or "
"`monai.data.wsi_dataset.SlidingPatchWSIDataset`) instead."
),
)
class ProbMapProducer:
"""
Expand Down
3 changes: 2 additions & 1 deletion monai/data/image_reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
orientation_ras_lps,
)
from monai.transforms.utility.array import EnsureChannelFirst
from monai.utils import MetaKeys, SpaceKeys, ensure_tuple, ensure_tuple_rep, optional_import, require_pkg
from monai.utils import MetaKeys, SpaceKeys, deprecated, ensure_tuple, ensure_tuple_rep, optional_import, require_pkg

if TYPE_CHECKING:
import itk
Expand Down Expand Up @@ -1218,6 +1218,7 @@ def _get_spatial_shape(self, img):
return np.asarray((img.width, img.height))


@deprecated(since="0.8", msg_suffix="use `monai.wsi_reader.WSIReader` instead.")
class WSIReader(ImageReader):
"""
Read whole slide images and extract patches.
Expand Down
1 change: 0 additions & 1 deletion tests/min_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ def run_testsuit():
"test_vitautoenc",
"test_write_metrics_reports",
"test_wsireader",
"test_wsireader_new",
"test_zoom",
"test_zoom_affine",
"test_zoomd",
Expand Down
Loading