Skip to content

merge master#113

Merged
Nic-Ma merged 277 commits into
Nic-Ma:2223-post-transform-handlerfrom
Project-MONAI:dev
May 25, 2021
Merged

merge master#113
Nic-Ma merged 277 commits into
Nic-Ma:2223-post-transform-handlerfrom
Project-MONAI:dev

Conversation

@Nic-Ma

@Nic-Ma Nic-Ma commented May 25, 2021

Copy link
Copy Markdown
Owner

Fixes # .

Description

A few sentences describing the changes proposed in this pull request.

Status

Ready/Work in progress/Hold

Types of changes

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

wyli and others added 30 commits March 5, 2021 00:52
* fixes data type in switching

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* [MONAI] python code formatting

Signed-off-by: monai-bot <monai.miccai2019@gmail.com>

Co-authored-by: monai-bot <monai.miccai2019@gmail.com>
* Implement CuImageReader and OpenSlideReader

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Add unittests for CuImageReader

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Add unittests for OpenSlideReader

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Sort imports

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Add correct boundaries

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Add test cases for reading patches on a grid for CuImage

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Add patch whole slide imaging dataset for pathology

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Add test case for read patches for OpenSlide

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* flake8 and few minor changes

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* black

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* flake8

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Add kwargs to CuImageReader and OpenSlideReader's read method

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Change the type hint from np.dtype to DTypeLike

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Fix a bug

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Implement WSIReader and unittests

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Minor updates

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Fix few typing issues

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Revert datasets

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Add shape property to openslide image object
Reverse size to be compatible with output size (hxw)

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Add untittest for loading the whole image
Reverse the size accroding to the WSIReader

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Update the whole image size

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Remove optional size

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Remove optional dtype

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Remove _get_spatial_shape return type

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Reverse the orders of dimensions of `location`
to be compatible with image shape

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Change test cases to use smaller image and revese location's dimensions

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Replace the test TIFF and some upgrades

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Update dependencies for OpenSlide

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Update unittests for OpenSlide and CuImage

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Fix openslide dependency

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Fix doc dependencies

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Minor changes

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Few variable name changes

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Add EnsureChannelFirst

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Add metadata to WSIReader

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>
Signed-off-by: Nic Ma <nma@nvidia.com>
Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>
* update docstring

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* revise docstring

Signed-off-by: Wenqi Li <wenqil@nvidia.com>
* [DLMED] add Affined transform

Signed-off-by: Nic Ma <nma@nvidia.com>

* [MONAI] python code formatting

Signed-off-by: monai-bot <monai.miccai2019@gmail.com>

Co-authored-by: monai-bot <monai.miccai2019@gmail.com>
* update for torch 1.8.0

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* mute codecov upload error

Signed-off-by: Wenqi Li <wenqil@nvidia.com>
Signed-off-by: Nic Ma <nma@nvidia.com>
with allow_missing_keys_mode
Signed-off-by: Wenqi Li <wenqil@nvidia.com>
* fixes #1500 update grid dataset to support patch level transforms

Signed-off-by: Wenqi Li <wenqil@nvidia.com>
* [DLMED] update type of arg in workflows

Signed-off-by: Nic Ma <nma@nvidia.com>

* [MONAI] python code formatting

Signed-off-by: monai-bot <monai.miccai2019@gmail.com>

* [DLMED] fix flake8 issue

Signed-off-by: Nic Ma <nma@nvidia.com>

* [DLMED] fix flake8 issue

Signed-off-by: Nic Ma <nma@nvidia.com>

* [MONAI] python code formatting

Signed-off-by: monai-bot <monai.miccai2019@gmail.com>

Co-authored-by: monai-bot <monai.miccai2019@gmail.com>
* 1651 implement RegUNet

Signed-off-by: kate-sann5100 <yiwen.li@st-annes.ox.ac.uk>
Signed-off-by: Wenqi Li <wenqil@nvidia.com>
* Update MONAI Docker with OpenSlide dependencies

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>

* Update cron job to install apt dependencies

Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com>
* use eval for getting class_idx for gradcam
* fixes unit test

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* fixes timed call tests

Signed-off-by: Wenqi Li <wenqil@nvidia.com>
basic inverse API
Signed-off-by: Richard Brown <33289025+rijobro@users.noreply.github.com>
* addresses testing instance memory errors

Signed-off-by: Wenqi Li <wenqil@nvidia.com>
* update coverage config

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* temp tests

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* fixes https://github.com/Project-MONAI/MONAI/runs/2083800079?check_suite_focus=true#step:5:13886

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* test cases matching in runner

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* fixes openslide tests

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* fixes https://github.com/Project-MONAI/MONAI/runs/2086767998?check_suite_focus=true#step:7:5955

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* fixes print stats

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* remove temp tests

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* remove unused

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* remove global logging config

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* omit setup.py

Signed-off-by: Wenqi Li <wenqil@nvidia.com>
* 1651 implement RegUNet

Signed-off-by: kate-sann5100 <yiwen.li@st-annes.ox.ac.uk>
* 1651 implement RegUNet

Signed-off-by: kate-sann5100 <yiwen.li@st-annes.ox.ac.uk>

* 1651 reformat code

Signed-off-by: kate-sann5100 <yiwen.li@st-annes.ox.ac.uk>

* 1651 reformat code

Signed-off-by: kate-sann5100 <yiwen.li@st-annes.ox.ac.uk>

* 1651 add globalnet

Signed-off-by: kate-sann5100 <yiwen.li@st-annes.ox.ac.uk>

* 1651 reformat code

Signed-off-by: kate-sann5100 <yiwen.li@st-annes.ox.ac.uk>

* 1651 reformat code

Signed-off-by: kate-sann5100 <yiwen.li@st-annes.ox.ac.uk>

* 1651 reformat code

Signed-off-by: kate-sann5100 <yiwen.li@st-annes.ox.ac.uk>

* 1651 reformat code

Signed-off-by: kate-sann5100 <yiwen.li@st-annes.ox.ac.uk>
Signed-off-by: Nic Ma <nma@nvidia.com>
* [DLMED] add DistributedWeightedRandomSampler

Signed-off-by: Nic Ma <nma@nvidia.com>
* croppad inverse

Signed-off-by: Richard Brown <33289025+rijobro@users.noreply.github.com>
…seeds (#1761)

* TEST: Check for identical MedNISTDataset length for different seeds

Signed-off-by: Adam Aji <3487395+adamaji@users.noreply.github.com>

* BUG: MedNISTDataset returns differently sized datasets for diff seeds

Signed-off-by: Adam Aji <3487395+adamaji@users.noreply.github.com>
* [DLMED] add length API

Signed-off-by: Nic Ma <nma@nvidia.com>

* [DLMED] remove replacement arg

Signed-off-by: Nic Ma <nma@nvidia.com>
* reduce randomly cropped amount to appease CI

Signed-off-by: Richard Brown <33289025+rijobro@users.noreply.github.com>

* fixes rand inverse

Signed-off-by: Wenqi Li <wenqil@nvidia.com>
cgrain and others added 29 commits May 12, 2021 17:30
* better way of managing Cache

Signed-off-by: Coen <coengruijt@gmail.com>

* Update test_smartcachedataset.py

Signed-off-by: Coen <coengruijt@gmail.com>
* fixes docstring

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* 2099 docstring updates

Signed-off-by: Wenqi Li <wenqil@nvidia.com>
Signed-off-by: Wenqi Li <wenqil@nvidia.com>
* enhance norm and act layers

Signed-off-by: Yiheng Wang <vennw@nvidia.com>

* write generic norm and act layers

Signed-off-by: Yiheng Wang <vennw@nvidia.com>

* Fix flake8 errors

Signed-off-by: Yiheng Wang <vennw@nvidia.com>
Signed-off-by: Wenqi Li <wenqil@nvidia.com>
* enhance get layers

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* codeformat/typo fixes

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* fixes type errors

Signed-off-by: Wenqi Li <wenqil@nvidia.com>
* [DLMED] add RandScaleCrop

Signed-off-by: Nic Ma <nma@nvidia.com>

* [DLMED] update according to comments

Signed-off-by: Nic Ma <nma@nvidia.com>

* [DLMED] update for corner case

Signed-off-by: Nic Ma <nma@nvidia.com>

* [DLMED] fix typo

Signed-off-by: Nic Ma <nma@nvidia.com>

* [MONAI] python code formatting

Signed-off-by: monai-bot <monai.miccai2019@gmail.com>

Co-authored-by: monai-bot <monai.miccai2019@gmail.com>
Signed-off-by: Wenqi Li <wenqil@nvidia.com>
* Add array and dictionary based CoordConv transforms

Signed-off-by: Mark <mark.graham@kcl.ac.uk>

* Add comments and input checks

Signed-off-by: Mark Graham <markgraham539@gmail.com>

* Add docs for CoordConv

Signed-off-by: Mark Graham <markgraham539@gmail.com>

* Add tests for CoordConv

Signed-off-by: Mark Graham <markgraham539@gmail.com>

* Renames to AddCoordinateChannels and simplifies transform code

Signed-off-by: Mark Graham <markgraham539@gmail.com>

* Test input channel is unchanged and shorten code more

Signed-off-by: Mark Graham <markgraham539@gmail.com>

* [MONAI] python code formatting

Signed-off-by: monai-bot <monai.miccai2019@gmail.com>

Co-authored-by: Richard Brown <33289025+rijobro@users.noreply.github.com>
Co-authored-by: monai-bot <monai.miccai2019@gmail.com>
Signed-off-by: Yiheng Wang <vennw@nvidia.com>
* [DLMED] add CenterScaleCrop

Signed-off-by: Nic Ma <nma@nvidia.com>

* [MONAI] python code formatting

Signed-off-by: monai-bot <monai.miccai2019@gmail.com>

* [DLMED] fix typo

Signed-off-by: Nic Ma <nma@nvidia.com>

Co-authored-by: monai-bot <monai.miccai2019@gmail.com>
Signed-off-by: Richard Brown <33289025+rijobro@users.noreply.github.com>
* [DLMED] enhance CSVSaver

Signed-off-by: Nic Ma <nma@nvidia.com>

* [DLMED] add unit tests

Signed-off-by: Nic Ma <nma@nvidia.com>

* [DLMED] fix test errors

Signed-off-by: Nic Ma <nma@nvidia.com>

* [DLMED] update according to comments

Signed-off-by: Nic Ma <nma@nvidia.com>

* [DLMED] update according to comments

Signed-off-by: Nic Ma <nma@nvidia.com>

* [MONAI] python code formatting

Signed-off-by: monai-bot <monai.miccai2019@gmail.com>

* [DLMED] update accoring to comments

Signed-off-by: Nic Ma <nma@nvidia.com>

Co-authored-by: monai-bot <monai.miccai2019@gmail.com>
* [DLMED] add meta_key arg to components

Signed-off-by: Nic Ma <nma@nvidia.com>

* [DLMED] fix CI test

Signed-off-by: Nic Ma <nma@nvidia.com>

* [DLMED] fix flake8

Signed-off-by: Nic Ma <nma@nvidia.com>

* [DLMED] update according to comments

Signed-off-by: Nic Ma <nma@nvidia.com>

* [MONAI] python code formatting

Signed-off-by: monai-bot <monai.miccai2019@gmail.com>

* [DLMED] read-only transforms can share same meta data for keys

Signed-off-by: Nic Ma <nma@nvidia.com>

* [DLMED] add more unit tests

Signed-off-by: Nic Ma <nma@nvidia.com>

Co-authored-by: monai-bot <monai.miccai2019@gmail.com>
Signed-off-by: chaliebudd <charles.budd@kcl.ac.uk>

Co-authored-by: Wenqi Li <wenqil@nvidia.com>
Signed-off-by: Wenqi Li <wenqil@nvidia.com>
Signed-off-by: Richard Brown <33289025+rijobro@users.noreply.github.com>
* [DLMED] temp combine batch and output

Signed-off-by: Nic Ma <nma@nvidia.com>

* [DLMED] update according to comments

Signed-off-by: Nic Ma <nma@nvidia.com>

* [MONAI] python code formatting

Signed-off-by: monai-bot <monai.miccai2019@gmail.com>

Co-authored-by: Wenqi Li <wenqil@nvidia.com>
Co-authored-by: monai-bot <monai.miccai2019@gmail.com>
Signed-off-by: Wenqi Li <wenqil@nvidia.com>
* cache grid

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* update based on comments

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* adds cache tests

Signed-off-by: Wenqi Li <wenqil@nvidia.com>
* thread safety impl.

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* fixes croppad

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* fixed intensity

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* fixes spatial

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* fixes util

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* autofix

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* update docstring

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* update datastats

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* fixes docstring

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* fixes torch 1.7 issue

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* fixes mac/win n_workers

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* update based on comments

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* [MONAI] python code formatting

Signed-off-by: monai-bot <monai.miccai2019@gmail.com>

Co-authored-by: monai-bot <monai.miccai2019@gmail.com>
Signed-off-by: ambroslins <ambros.lins@gmail.com>
* add pypi quick tests

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* temp tests

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* update

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* cron pypi tests

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* temp tests

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* Revert "temp tests"

This reverts commit b6d86d6.

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* update

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* revise cron

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* Revert "temp tests"

This reverts commit 44cddc0.

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* docstring

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

* update setup.cfg

Signed-off-by: Wenqi Li <wenqil@nvidia.com>
Signed-off-by: Richard Brown <33289025+rijobro@users.noreply.github.com>
* [DLMED] fix CopyItemsd transform

Signed-off-by: Nic Ma <nma@nvidia.com>

* [MONAI] python code formatting

Signed-off-by: monai-bot <monai.miccai2019@gmail.com>

Co-authored-by: monai-bot <monai.miccai2019@gmail.com>
Signed-off-by: Wenqi Li <wenqil@nvidia.com>
@Nic-Ma Nic-Ma merged commit 44882b7 into Nic-Ma:2223-post-transform-handler May 25, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.