Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Zarr Merger#6633

Merged
bhashemian merged 24 commits into
Project-MONAI:devfrom
bhashemian:zarr-mergers
Jun 28, 2023
Merged

Zarr Merger#6633
bhashemian merged 24 commits into
Project-MONAI:devfrom
bhashemian:zarr-mergers

Conversation

@bhashemian

@bhashemian bhashemian commented Jun 20, 2023 •
edited
Loading

Copy link
Copy Markdown
Member

Fixes #6006

Description

This PR implements ZarrAvgMerger which can be used for patch inference. Also a use case is demonstrated here.

Types of changes

  • Non-breaking change (fix or new feature that would not break existing functionality).
  • New tests added to cover the changes.
  • Integration tests passed locally by running ./runtests.sh -f -u --net --coverage.
  • Quick tests passed locally by running ./runtests.sh --quick --unittests --disttests.
  • In-line docstrings updated.
  • Documentation updated, tested make html command in the docs/ folder.

@bhashemian bhashemian changed the title Zarr mergers Zarr Merger Jun 20, 2023
@bhashemian bhashemian mentioned this pull request Jun 20, 2023
Merged
5 tasks
@bhashemian bhashemian requested a review from JHancox June 21, 2023 00:54
ericspod
ericspod reviewed Jun 21, 2023
View reviewed changes
Comment thread monai/inferers/merger.py
@ericspod

ericspod commented Jun 21, 2023

Copy link
Copy Markdown
Member

We do also need tests to cover this code. Zarr does look interesting, I wonder if it would have other application MONAI, eg. data handling in transforms.

JHancox
JHancox reviewed Jun 21, 2023
View reviewed changes
Comment thread monai/inferers/merger.py
JHancox
JHancox reviewed Jun 21, 2023
View reviewed changes
Comment thread monai/inferers/merger.py
JHancox
JHancox reviewed Jun 22, 2023
View reviewed changes
Comment thread monai/inferers/merger.py Outdated
JHancox
JHancox reviewed Jun 22, 2023
View reviewed changes
Comment thread monai/inferers/merger.py
@bhashemian bhashemian enabled auto-merge (squash) June 22, 2023 17:02
@bhashemian bhashemian disabled auto-merge June 22, 2023 17:02
dzenanz
dzenanz reviewed Jun 26, 2023
View reviewed changes
Comment thread monai/inferers/merger.py Outdated
bhashemian and others added 13 commits June 26, 2023 11:02
@bhashemian
add zarr dependency
b3c4ad4 
Signed-off-by: Behrooz <[email protected]>
@bhashemian
Implement ZarrAvgMerger
5b7ea1d 
Signed-off-by: Behrooz <[email protected]>
@pre-commit-ci @bhashemian
[pre-commit.ci] auto fixes from pre-commit.com hooks
571498c 
for more information, see https://pre-commit.ci
@bhashemian
update docs
fe1cbc8 
Signed-off-by: Behrooz <[email protected]>
@bhashemian
update docs
0a1aa3d 
Signed-off-by: Behrooz <[email protected]>
@bhashemian
update docstring
8e8594e 
Signed-off-by: Behrooz <[email protected]>
@bhashemian
add info about Zarr in docstring
1a9d0f8 
Signed-off-by: Behrooz <[email protected]>
@pre-commit-ci @bhashemian
[pre-commit.ci] auto fixes from pre-commit.com hooks
5c51200 
for more information, see https://pre-commit.ci
@bhashemian
add unit tests
fdb3969 
Signed-off-by: Behrooz <[email protected]>
@bhashemian
exclude zarr tests from min tests
70bf188 
Signed-off-by: Behrooz <[email protected]>
@bhashemian
add thread locks
e74658b 
Signed-off-by: Behrooz <[email protected]>
@bhashemian
remove compression for temp zarr arrays
bf33fb5 
Signed-off-by: Behrooz <[email protected]>
@bhashemian
add flexibility to define compressors for all zarr arrays
5bc1f94 
Signed-off-by: Behrooz <[email protected]>
@bhashemian
change to skip unless
9bd6ce1 
Signed-off-by: Behrooz <[email protected]>
@bhashemian bhashemian requested review from JHancox and ericspod June 26, 2023 15:07
@bhashemian

bhashemian commented Jun 26, 2023

Copy link
Copy Markdown
Member Author

Hi @ericspod, please take another look and let me know if you have any other comments. Thanks

@bhashemian bhashemian enabled auto-merge (squash) June 27, 2023 19:45
wyli
wyli reviewed Jun 28, 2023
View reviewed changes
Comment thread monai/inferers/merger.py Outdated
@bhashemian bhashemian requested review from JHancox and wyli June 28, 2023 13:47
@wyli

wyli commented Jun 28, 2023

Copy link
Copy Markdown
Contributor

/build

@bhashemian bhashemian disabled auto-merge June 28, 2023 13:59
@bhashemian bhashemian enabled auto-merge (squash) June 28, 2023 13:59
wyli
wyli approved these changes Jun 28, 2023
View reviewed changes

@wyli wyli left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

looks good to me, @ericspod please feel free to follow up if anything missing

ericspod
ericspod approved these changes Jun 28, 2023
View reviewed changes

@ericspod ericspod left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks good, I had just very minor changes to docs.

Comment thread monai/inferers/merger.py Outdated
Comment thread monai/inferers/merger.py Outdated
Comment thread monai/inferers/merger.py Outdated
Comment thread monai/inferers/merger.py
bhashemian and others added 4 commits June 28, 2023 13:11
@bhashemian @ericspod
Update monai/inferers/merger.py
8145c08 
Co-authored-by: Eric Kerfoot <[email protected]>
Signed-off-by: Dr. Behrooz Hashemian <[email protected]>
@bhashemian @ericspod
Update monai/inferers/merger.py
3b84aee 
Co-authored-by: Eric Kerfoot <[email protected]>
Signed-off-by: Dr. Behrooz Hashemian <[email protected]>
@bhashemian @ericspod
Update monai/inferers/merger.py
a7f4f93 
Co-authored-by: Eric Kerfoot <[email protected]>
Signed-off-by: Dr. Behrooz Hashemian <[email protected]>
@bhashemian
Merge branch 'dev' into zarr-mergers
52d8898
@wyli

wyli commented Jun 28, 2023

Copy link
Copy Markdown
Contributor

/build

@bhashemian bhashemian merged commit ae95bf9 into Project-MONAI:dev Jun 28, 2023
@bhashemian bhashemian deleted the zarr-mergers branch June 28, 2023 18:16
bhashemian added a commit to Project-MONAI/tutorials that referenced this pull request Jul 4, 2023
@bhashemian
Add zarr merger notebook section (#1433)
5884947 
This PR add an example for `ZarrAvgMerger` to be plugged into
`PatchInferer` along with `WSISlidingWindowSplitter`.

Note: Project-MONAI/MONAI#6633 in MONAI core
should be merged before this one.

### Checks
<!--- Put an `x` in all the boxes that apply, and remove the not
applicable items -->
- [x] Avoid including large-size files in the PR.
- [x] Clean up long text outputs from code cells in the notebook.
- [x] For security purposes, please check the contents and remove any
sensitive info such as user names and private key.
- [x] Ensure (1) hyperlinks and markdown anchors are working (2) use
relative paths for tutorial repo files (3) put figure and graphs in the
`./figure` folder
- [x] Notebook runs automatically `./runner.sh -t <path to .ipynb file>`

---------

Signed-off-by: Behrooz <[email protected]>
boneseva pushed a commit to boneseva/MONAI-tutorials that referenced this pull request Apr 21, 2024
@bhashemian
Add zarr merger notebook section (Project-MONAI#1433)
7d835e3 
This PR add an example for `ZarrAvgMerger` to be plugged into
`PatchInferer` along with `WSISlidingWindowSplitter`.

Note: Project-MONAI/MONAI#6633 in MONAI core
should be merged before this one.

### Checks
<!--- Put an `x` in all the boxes that apply, and remove the not
applicable items -->
- [x] Avoid including large-size files in the PR.
- [x] Clean up long text outputs from code cells in the notebook.
- [x] For security purposes, please check the contents and remove any
sensitive info such as user names and private key.
- [x] Ensure (1) hyperlinks and markdown anchors are working (2) use
relative paths for tutorial repo files (3) put figure and graphs in the
`./figure` folder
- [x] Notebook runs automatically `./runner.sh -t <path to .ipynb file>`

---------

Signed-off-by: Behrooz <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@KumoLiu KumoLiu KumoLiu left review comments
@wyli wyli wyli approved these changes
@ericspod ericspod ericspod approved these changes
@JHancox JHancox JHancox approved these changes
+1 more reviewer
@dzenanz dzenanz dzenanz left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Implement Zarr Merger

6 participants

@bhashemian @ericspod @wyli @dzenanz @JHancox @KumoLiu