merge master by Nic-Ma · Pull Request #116 · Nic-Ma/MONAI

Nic-Ma · 2021-05-31T06:02:48Z

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.

* [DLMED] update type of arg in workflows Signed-off-by: Nic Ma <[email protected]> * [MONAI] python code formatting Signed-off-by: monai-bot <[email protected]> * [DLMED] fix flake8 issue Signed-off-by: Nic Ma <[email protected]> * [DLMED] fix flake8 issue Signed-off-by: Nic Ma <[email protected]> * [MONAI] python code formatting Signed-off-by: monai-bot <[email protected]> Co-authored-by: monai-bot <[email protected]>

* 1651 implement RegUNet Signed-off-by: kate-sann5100 <[email protected]>

Signed-off-by: Wenqi Li <[email protected]>

* Update MONAI Docker with OpenSlide dependencies Signed-off-by: Behrooz <[email protected]> * Update cron job to install apt dependencies Signed-off-by: Behrooz <[email protected]>

* use eval for getting class_idx for gradcam

* fixes unit test Signed-off-by: Wenqi Li <[email protected]> * fixes timed call tests Signed-off-by: Wenqi Li <[email protected]>

basic inverse API

Signed-off-by: Richard Brown <[email protected]>

* addresses testing instance memory errors Signed-off-by: Wenqi Li <[email protected]>

* update coverage config Signed-off-by: Wenqi Li <[email protected]> * temp tests Signed-off-by: Wenqi Li <[email protected]> * fixes https://github.com/Project-MONAI/MONAI/runs/2083800079?check_suite_focus=true#step:5:13886 Signed-off-by: Wenqi Li <[email protected]> * test cases matching in runner Signed-off-by: Wenqi Li <[email protected]> * fixes openslide tests Signed-off-by: Wenqi Li <[email protected]> * fixes https://github.com/Project-MONAI/MONAI/runs/2086767998?check_suite_focus=true#step:7:5955 Signed-off-by: Wenqi Li <[email protected]> * fixes print stats Signed-off-by: Wenqi Li <[email protected]> * remove temp tests Signed-off-by: Wenqi Li <[email protected]> * remove unused Signed-off-by: Wenqi Li <[email protected]> * remove global logging config Signed-off-by: Wenqi Li <[email protected]> * omit setup.py Signed-off-by: Wenqi Li <[email protected]>

* 1651 implement RegUNet Signed-off-by: kate-sann5100 <[email protected]>

* 1651 implement RegUNet Signed-off-by: kate-sann5100 <[email protected]> * 1651 reformat code Signed-off-by: kate-sann5100 <[email protected]> * 1651 reformat code Signed-off-by: kate-sann5100 <[email protected]> * 1651 add globalnet Signed-off-by: kate-sann5100 <[email protected]> * 1651 reformat code Signed-off-by: kate-sann5100 <[email protected]> * 1651 reformat code Signed-off-by: kate-sann5100 <[email protected]> * 1651 reformat code Signed-off-by: kate-sann5100 <[email protected]> * 1651 reformat code Signed-off-by: kate-sann5100 <[email protected]>

Signed-off-by: Nic Ma <[email protected]>

* [DLMED] add DistributedWeightedRandomSampler Signed-off-by: Nic Ma <[email protected]>

* croppad inverse Signed-off-by: Richard Brown <[email protected]>

…seeds (#1761) * TEST: Check for identical MedNISTDataset length for different seeds Signed-off-by: Adam Aji <[email protected]> * BUG: MedNISTDataset returns differently sized datasets for diff seeds Signed-off-by: Adam Aji <[email protected]>

* [DLMED] add length API Signed-off-by: Nic Ma <[email protected]> * [DLMED] remove replacement arg Signed-off-by: Nic Ma <[email protected]>

* reduce randomly cropped amount to appease CI Signed-off-by: Richard Brown <[email protected]> * fixes rand inverse Signed-off-by: Wenqi Li <[email protected]>

* [DLMED] update ignite to 0.4.4 Signed-off-by: Nic Ma <[email protected]> * [DLMED] fix ignite compatible issues Signed-off-by: Nic Ma <[email protected]> * [DLMED] fix flake8 issue Signed-off-by: Nic Ma <[email protected]> * [DLMED] update according to comments Signed-off-by: Nic Ma <[email protected]>

Signed-off-by: Wenqi Li <[email protected]>

* [DLMED] fix docs Signed-off-by: Nic Ma <[email protected]> * [MONAI] python code formatting Signed-off-by: monai-bot <[email protected]> Co-authored-by: monai-bot <[email protected]>

lossless inverse transforms (non-croppad)

) * [DLMED] add greater_or_equal Signed-off-by: Nic Ma <[email protected]> * [MONAI] python code formatting Signed-off-by: monai-bot <[email protected]> Co-authored-by: monai-bot <[email protected]> Co-authored-by: Eric Kerfoot <[email protected]>

* [DLMED] enhance CheckpointLoader Signed-off-by: Nic Ma <[email protected]> * [DLMED] add more unit tests Signed-off-by: Nic Ma <[email protected]> * [DLMED] update according to comments Signed-off-by: Nic Ma <[email protected]> * [DLMED] fix flake8 issue Signed-off-by: Nic Ma <[email protected]> * [DLMED] update according to comments Signed-off-by: Nic Ma <[email protected]>

* Update WSIReader with cuCIM Signed-off-by: Behrooz <[email protected]> * Update unittests for cuCIM Signed-off-by: Behrooz <[email protected]>

* Add to_onehot_y and include_background Signed-off-by: Yiheng Wang <[email protected]> * Add parameters to test seg loss Signed-off-by: Yiheng Wang <[email protected]> * modify log softmax Signed-off-by: Yiheng Wang <[email protected]> * Modify weight format Signed-off-by: Yiheng Wang <[email protected]>

Signed-off-by: Richard Brown <[email protected]>

Zoomd and RandZoomd

Signed-off-by: Yiheng Wang <[email protected]>

* [DLMED] add CenterScaleCrop Signed-off-by: Nic Ma <[email protected]> * [MONAI] python code formatting Signed-off-by: monai-bot <[email protected]> * [DLMED] fix typo Signed-off-by: Nic Ma <[email protected]> Co-authored-by: monai-bot <[email protected]>

Signed-off-by: Richard Brown <[email protected]>

* [DLMED] enhance CSVSaver Signed-off-by: Nic Ma <[email protected]> * [DLMED] add unit tests Signed-off-by: Nic Ma <[email protected]> * [DLMED] fix test errors Signed-off-by: Nic Ma <[email protected]> * [DLMED] update according to comments Signed-off-by: Nic Ma <[email protected]> * [DLMED] update according to comments Signed-off-by: Nic Ma <[email protected]> * [MONAI] python code formatting Signed-off-by: monai-bot <[email protected]> * [DLMED] update accoring to comments Signed-off-by: Nic Ma <[email protected]> Co-authored-by: monai-bot <[email protected]>

)

* [DLMED] add meta_key arg to components Signed-off-by: Nic Ma <[email protected]> * [DLMED] fix CI test Signed-off-by: Nic Ma <[email protected]> * [DLMED] fix flake8 Signed-off-by: Nic Ma <[email protected]> * [DLMED] update according to comments Signed-off-by: Nic Ma <[email protected]> * [MONAI] python code formatting Signed-off-by: monai-bot <[email protected]> * [DLMED] read-only transforms can share same meta data for keys Signed-off-by: Nic Ma <[email protected]> * [DLMED] add more unit tests Signed-off-by: Nic Ma <[email protected]> Co-authored-by: monai-bot <[email protected]>

Signed-off-by: chaliebudd <[email protected]> Co-authored-by: Wenqi Li <[email protected]>

Signed-off-by: Wenqi Li <[email protected]>

Signed-off-by: Richard Brown <[email protected]>

* [DLMED] temp combine batch and output Signed-off-by: Nic Ma <[email protected]> * [DLMED] update according to comments Signed-off-by: Nic Ma <[email protected]> * [MONAI] python code formatting Signed-off-by: monai-bot <[email protected]> Co-authored-by: Wenqi Li <[email protected]> Co-authored-by: monai-bot <[email protected]>

Signed-off-by: Wenqi Li <[email protected]>

* cache grid Signed-off-by: Wenqi Li <[email protected]> * update based on comments Signed-off-by: Wenqi Li <[email protected]> * adds cache tests Signed-off-by: Wenqi Li <[email protected]>

* thread safety impl. Signed-off-by: Wenqi Li <[email protected]> * fixes croppad Signed-off-by: Wenqi Li <[email protected]> * fixed intensity Signed-off-by: Wenqi Li <[email protected]> * fixes spatial Signed-off-by: Wenqi Li <[email protected]> * fixes util Signed-off-by: Wenqi Li <[email protected]> * autofix Signed-off-by: Wenqi Li <[email protected]> * update docstring Signed-off-by: Wenqi Li <[email protected]> * update datastats Signed-off-by: Wenqi Li <[email protected]> * fixes docstring Signed-off-by: Wenqi Li <[email protected]> * fixes torch 1.7 issue Signed-off-by: Wenqi Li <[email protected]> * fixes mac/win n_workers Signed-off-by: Wenqi Li <[email protected]> * update based on comments Signed-off-by: Wenqi Li <[email protected]> * [MONAI] python code formatting Signed-off-by: monai-bot <[email protected]> Co-authored-by: monai-bot <[email protected]>

Signed-off-by: ambroslins <[email protected]>

* add pypi quick tests Signed-off-by: Wenqi Li <[email protected]> * temp tests Signed-off-by: Wenqi Li <[email protected]> * update Signed-off-by: Wenqi Li <[email protected]> * cron pypi tests Signed-off-by: Wenqi Li <[email protected]> * temp tests Signed-off-by: Wenqi Li <[email protected]> * Revert "temp tests" This reverts commit b6d86d6. Signed-off-by: Wenqi Li <[email protected]> * update Signed-off-by: Wenqi Li <[email protected]> * revise cron Signed-off-by: Wenqi Li <[email protected]> * Revert "temp tests" This reverts commit 44cddc0. Signed-off-by: Wenqi Li <[email protected]> * docstring Signed-off-by: Wenqi Li <[email protected]> * update setup.cfg Signed-off-by: Wenqi Li <[email protected]>

Signed-off-by: Richard Brown <[email protected]>

* [DLMED] fix CopyItemsd transform Signed-off-by: Nic Ma <[email protected]> * [MONAI] python code formatting Signed-off-by: monai-bot <[email protected]> Co-authored-by: monai-bot <[email protected]>

Signed-off-by: Wenqi Li <[email protected]>

* enhance downloading APIs Signed-off-by: Wenqi Li <[email protected]> * update docstrings Signed-off-by: Wenqi Li <[email protected]>

* [DLMED] add PostProcessing handler Signed-off-by: Nic Ma <[email protected]> * [DLMED] add unit tests Signed-off-by: Nic Ma <[email protected]> * [DLMED] skip min test Signed-off-by: Nic Ma <[email protected]> * [MONAI] python code formatting Signed-off-by: monai-bot <[email protected]> Co-authored-by: monai-bot <[email protected]>

* [DLMED] Adjust Invertd and TransformInverter Signed-off-by: Nic Ma <[email protected]> * [MONAI] python code formatting Signed-off-by: monai-bot <[email protected]> * [DLMED] add detailed example to doc-string Signed-off-by: Nic Ma <[email protected]> * [DLMED] update according to comments Signed-off-by: Nic Ma <[email protected]> * enhance docstring Signed-off-by: Wenqi Li <[email protected]> Co-authored-by: monai-bot <[email protected]> Co-authored-by: Wenqi Li <[email protected]>

Signed-off-by: Yiheng Wang <[email protected]>

This reverts commit 4c6af53. Signed-off-by: Wenqi Li <[email protected]>

* removing convolutional compatability kernel for an optional matric multiplication Signed-off-by: chaliebudd <[email protected]> * change to identity test against None Co-authored-by: Richard Brown <[email protected]> Signed-off-by: chaliebudd <[email protected]> * updating tests, non-determanism should be solved Signed-off-by: chaliebudd <[email protected]> * moving compatability matrix to gpu in test to prevent errors when running without cuda Signed-off-by: chaliebudd <[email protected]> * removing unused imports Signed-off-by: chaliebudd <[email protected]> * pytyping fix for optional arg Signed-off-by: chaliebudd <[email protected]> Co-authored-by: Richard Brown <[email protected]>

* removing convolutional compatability kernel for an optional matric multiplication Signed-off-by: chaliebudd <[email protected]> * change to identity test against None Co-authored-by: Richard Brown <[email protected]> Signed-off-by: chaliebudd <[email protected]> * updating tests, non-determanism should be solved Signed-off-by: chaliebudd <[email protected]> * moving compatability matrix to gpu in test to prevent errors when running without cuda Signed-off-by: chaliebudd <[email protected]> * removing unused imports Signed-off-by: chaliebudd <[email protected]> * pytyping fix for optional arg Signed-off-by: chaliebudd <[email protected]> * moving back to permissive testing sue to cuda non determanism Signed-off-by: chaliebudd <[email protected]> Co-authored-by: Richard Brown <[email protected]>

Signed-off-by: Wenqi Li <[email protected]>

* skip resampling if possible Signed-off-by: Wenqi Li <[email protected]> * update docstring Signed-off-by: Wenqi Li <[email protected]>

* [DLMED] enhance doc-string of CacheDataset Signed-off-by: Nic Ma <[email protected]> * [MONAI] python code formatting Signed-off-by: monai-bot <[email protected]> Co-authored-by: monai-bot <[email protected]>

* revise cron-pip Signed-off-by: Wenqi Li <[email protected]> * fixes pythonpath Signed-off-by: Wenqi Li <[email protected]> * update path Signed-off-by: Wenqi Li <[email protected]>

Nic-Ma and others added 30 commits March 9, 2021 12:41

1651 implement RegUNet (#1658)

78ec66f

* 1651 implement RegUNet Signed-off-by: kate-sann5100 <[email protected]>

remove print msg (#1730)

ea1d04b

Signed-off-by: Wenqi Li <[email protected]>

Fix MONAI docker dependency (#1731)

a462714

* Update MONAI Docker with OpenSlide dependencies Signed-off-by: Behrooz <[email protected]> * Update cron job to install apt dependencies Signed-off-by: Behrooz <[email protected]>

[1710] Gradcam eval (#1734)

d4c201e

* use eval for getting class_idx for gradcam

fixes unit test (#1735)

c362beb

* fixes unit test Signed-off-by: Wenqi Li <[email protected]> * fixes timed call tests Signed-off-by: Wenqi Li <[email protected]>

basic inverse API (#1720)

0b1fc4e

basic inverse API

improve decollate test for set_determinism (#1736)

c3e5a69

Signed-off-by: Richard Brown <[email protected]>

1236 integration test memory (#1738)

6d3bf2f

* addresses testing instance memory errors Signed-off-by: Wenqi Li <[email protected]>

1665 adjust localnet (#1752)

ce8f92a

* 1651 implement RegUNet Signed-off-by: kate-sann5100 <[email protected]>

[DLMED] update WSIReader for typos and docs (#1758)

e001d2a

Signed-off-by: Nic Ma <[email protected]>

1742 Add DistributedWeightedRandomSampler (#1745)

21a3c16

* [DLMED] add DistributedWeightedRandomSampler Signed-off-by: Nic Ma <[email protected]>

Croppad inverse transform (#1737)

f56058d

* croppad inverse Signed-off-by: Richard Brown <[email protected]>

TEST: Fix failing pytype check for predict_segmentation (#1762)

e17e158

Add __len__ for DistributedWeightedRandomSampler (#1766)

4670fd2

* [DLMED] add length API Signed-off-by: Nic Ma <[email protected]> * [DLMED] remove replacement arg Signed-off-by: Nic Ma <[email protected]>

reduce randomly cropped amount to appease CI (#1769)

1badb41

* reduce randomly cropped amount to appease CI Signed-off-by: Richard Brown <[email protected]> * fixes rand inverse Signed-off-by: Wenqi Li <[email protected]>

update contrib guide to include some recent changes in dev tools (#1763)

3ea9ed4

Signed-off-by: Wenqi Li <[email protected]>

1768 Update docs based on feedback (#1774)

13a2c59

* [DLMED] fix docs Signed-off-by: Nic Ma <[email protected]> * [MONAI] python code formatting Signed-off-by: monai-bot <[email protected]> Co-authored-by: monai-bot <[email protected]>

lossless inverse (#1767)

3406398

lossless inverse transforms (non-croppad)

Update WSIReader with cuCIM (#1773)

bcbd685

* Update WSIReader with cuCIM Signed-off-by: Behrooz <[email protected]> * Update unittests for cuCIM Signed-off-by: Behrooz <[email protected]>

Inverse Spacingd (#1779)

5588528

Inverse Resized (#1780)

46154ec

Signed-off-by: Richard Brown <[email protected]>

Inverse Zoomd and RandZoomd (#1778)

cf3bd1a

Zoomd and RandZoomd

yiheng-wang-nv and others added 29 commits May 17, 2021 11:44

Add warnings for inf/nan surface distance (#2205)

ca0bda1

Signed-off-by: Yiheng Wang <[email protected]>

allow sequence for network consistency (#2209)

fed0136

Signed-off-by: Richard Brown <[email protected]>

2041 - fixing main/releasing branch CI/CD; update contributing.md (#2123

e6258c9

)

cleaning allocated memory (#2216)

26ee695

Signed-off-by: chaliebudd <[email protected]> Co-authored-by: Wenqi Li <[email protected]>

array transforms inherit Transform (#2219)

ba03150

Signed-off-by: Wenqi Li <[email protected]>

inverse adjust contrast (#2217)

4c6af53

Signed-off-by: Richard Brown <[email protected]>

improve error msg (#2229)

ebfd550

Signed-off-by: Wenqi Li <[email protected]>

2172 caching grid for randaffine (#2228)

2fb4b21

* cache grid Signed-off-by: Wenqi Li <[email protected]> * update based on comments Signed-off-by: Wenqi Li <[email protected]> * adds cache tests Signed-off-by: Wenqi Li <[email protected]>

fix type for margin argument in CropForegroundd (#2234)

33539db

Signed-off-by: ambroslins <[email protected]>

SaveImage print_log (#2237)

fac9350

Signed-off-by: Richard Brown <[email protected]>

2236 Fix the duplicated key issue in CopyItemsd transform (#2238)

81994d2

* [DLMED] fix CopyItemsd transform Signed-off-by: Nic Ma <[email protected]> * [MONAI] python code formatting Signed-off-by: monai-bot <[email protected]> Co-authored-by: monai-bot <[email protected]>

fixes network docs (#2240)

5d46589

Signed-off-by: Wenqi Li <[email protected]>

enhance downloading APIs (#2242)

c3a5bdd

* enhance downloading APIs Signed-off-by: Wenqi Li <[email protected]> * update docstrings Signed-off-by: Wenqi Li <[email protected]>

Update type hints for act and norm (#2254)

fbfda15

Signed-off-by: Yiheng Wang <[email protected]>

Revert "inverse adjust contrast (#2217)" (#2259)

3ff988f

This reverts commit 4c6af53. Signed-off-by: Wenqi Li <[email protected]>

move mednist to gdrive (#2276)

2b13246

Signed-off-by: Wenqi Li <[email protected]>

skip resampling for randaffine(d) if possible (#2264)

2aec103

* skip resampling if possible Signed-off-by: Wenqi Li <[email protected]> * update docstring Signed-off-by: Wenqi Li <[email protected]>

Enhance the doc-string of CacheDataset (#2279)

70f9fd1

* [DLMED] enhance doc-string of CacheDataset Signed-off-by: Nic Ma <[email protected]> * [MONAI] python code formatting Signed-off-by: monai-bot <[email protected]> Co-authored-by: monai-bot <[email protected]>

Fixes cron tests (#2277)

7ee7989

* revise cron-pip Signed-off-by: Wenqi Li <[email protected]> * fixes pythonpath Signed-off-by: Wenqi Li <[email protected]> * update path Signed-off-by: Wenqi Li <[email protected]>

Nic-Ma merged commit 64fc10b into Nic-Ma:2287-enhance-decollate May 31, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

merge master#116

merge master#116
Nic-Ma merged 288 commits intoNic-Ma:2287-enhance-decollatefrom
Project-MONAI:dev

Nic-Ma commented May 31, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

18 participants

Conversation

Nic-Ma commented May 31, 2021

Description

Status

Types of changes

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

18 participants