Skip to content

merge master#157

Merged
Nic-Ma merged 410 commits into
Nic-Ma:2495-enhance-net-blockfrom
Project-MONAI:dev
Jul 1, 2021
Merged

merge master#157
Nic-Ma merged 410 commits into
Nic-Ma:2495-enhance-net-blockfrom
Project-MONAI:dev

Conversation

@Nic-Ma

@Nic-Ma Nic-Ma commented Jul 1, 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.

Nic-Ma and others added 30 commits April 7, 2021 16:36
* [DLMED] add support for addtional events

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

* [DLMED] add unit tests

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

* [DLMED] fix typehints

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

* [MONAI] python code formatting

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

* fixes typos

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

Co-authored-by: monai-bot <monai.miccai2019@gmail.com>
Co-authored-by: Wenqi Li <wenqil@nvidia.com>
* fixes #1965

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

* adds docstring

Signed-off-by: Wenqi Li <wenqil@nvidia.com>
* [DLMED] enhance doc-strings

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>
* adding init efficientnet support

Signed-off-by: masadcv <muhammad.asad@kcl.ac.uk>

* fixing flake8 and further refactoring

Signed-off-by: masadcv <muhammad.asad@kcl.ac.uk>

* adding unittests for efficiennet

Signed-off-by: masadcv <muhammad.asad@kcl.ac.uk>

* making unittests backwards compatible python<3.8

Signed-off-by: masadcv <muhammad.asad@kcl.ac.uk>

* fixed kitty unittests file path

Signed-off-by: masadcv <muhammad.asad@kcl.ac.uk>

* adding docstrings and minor refactoring

Signed-off-by: masadcv <muhammad.asad@kcl.ac.uk>

* fix flake8-py3 failing test

Signed-off-by: masadcv <muhammad.asad@kcl.ac.uk>

* generalize drop_connect for n-dim, fix/add unittests, remove assert

Signed-off-by: masadcv <muhammad.asad@kcl.ac.uk>

* fix failing unittest, CC0-license image for test

Signed-off-by: masadcv <muhammad.asad@kcl.ac.uk>

* refactoring code for review

Signed-off-by: masadcv <muhammad.asad@kcl.ac.uk>

* WIP fix mypy type hint errors

Signed-off-by: masadcv <muhammad.asad@kcl.ac.uk>

* fix cuda test error

Signed-off-by: masadcv <muhammad.asad@kcl.ac.uk>

* WIP fix test errors

Signed-off-by: masadcv <muhammad.asad@kcl.ac.uk>

* adding non-default shape tests

Signed-off-by: masadcv <muhammad.asad@kcl.ac.uk>

* remove 3d case from non-default shape test

Signed-off-by: masadcv <muhammad.asad@kcl.ac.uk>

* refactoring and updating docs

Signed-off-by: masadcv <muhammad.asad@kcl.ac.uk>

Co-authored-by: Yiheng Wang <68361391+yiheng-wang-nv@users.noreply.github.com>
Co-authored-by: Wenqi Li <wenqil@nvidia.com>
* [DLMED] add TransformInverter handler

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

* [DLMED] fix typo

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

* [DLMED] add support in SegmentationSaver handler

Signed-off-by: Nic Ma <nma@nvidia.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>

* [DLMED] fix CI test

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>
* changelog for 0.5.0

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

* update changelog

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

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

* [DLMED] fix typo

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

* [DLMED] add support in SegmentationSaver handler

Signed-off-by: Nic Ma <nma@nvidia.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>

* [DLMED] fix CI test

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

* [MONAI] python code formatting

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

* [DLMED] save mode into inverse dict

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

* [DLMED] add unit tests

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

* [DLMED] fix ToTensor inverse issue

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

* [DLMED] change the replacement logic into util function

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

* [DLMED] add more tests

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

* [DLMED] fix flake8

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>
* [DLMED] update highlights for 0.5

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

* [DLMED] add invert transforms

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

* [DLMED] add more highlights

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

* [DLMED] add checkpointloader

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

* downscale image

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

* downscale image

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

* update docs

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

* update desc

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

* update

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

Co-authored-by: Wenqi Li <wenqil@nvidia.com>
* update convs docstrings

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

* increase tol for cuda crf

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

* update requirements according to docs/requirements

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

* prune image

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

Co-authored-by: Wenqi Li <wenqil@nvidia.com>
* [DLMED] metrics support a list of tensor

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

* update workflow test

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

* [DLMED] fix engine.state.output dict copy issue

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

* [DLMED] add num_workers

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

* fixes typos

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

* update tests

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

* update docstrings

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

* tests

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

Co-authored-by: Wenqi Li <wenqil@nvidia.com>
Signed-off-by: Wenqi Li <wenqil@nvidia.com>
* handling error

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

* temp test

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

* fixes tests

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

* Revert "temp test"

This reverts commit 60661ae.

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

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

* typo fix

Signed-off-by: Wenqi Li <wenqil@nvidia.com>
Signed-off-by: Richard Brown <33289025+rijobro@users.noreply.github.com>
TTA progress bar, use torch for mode, add label meta_data
* follow up of #1992

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

* update spacing inverse

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

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

* [DLMED] fix deepcopy

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>
* [DLMED] add more tests

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

* [DLMED] add nearest test cases

Signed-off-by: Nic Ma <nma@nvidia.com>
* adds a what's new page

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

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

* [DLMED] enhance CAM logic

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

* [DLMED] add unit tests

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

* [DLMED] fix flake8

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

* [DLMED] fix typo

Co-authored-by: Richard Brown <33289025+rijobro@users.noreply.github.com>
Signed-off-by: Nic Ma <nma@nvidia.com>

* [DLMED] fix flake8 issue

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

Co-authored-by: Richard Brown <33289025+rijobro@users.noreply.github.com>
* [DLMED] enhance unit tests

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>
* [DLMED] add warning

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>
* Jupyter and other additions

Signed-off-by: Eric Kerfoot <eric.kerfoot@kcl.ac.uk>
* allow slicing with SpatialCrop(d)

Signed-off-by: Richard Brown <33289025+rijobro@users.noreply.github.com>
Signed-off-by: chaliebudd <charles.budd@kcl.ac.uk>
* fixes docstring

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

* update example

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

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

* [MONAI] python code formatting

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

* [DLMED] add unit tests

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: Nic Ma <nma@nvidia.com>
myron and others added 29 commits June 23, 2021 18:13
Signed-off-by: Dong Yang <dongy@nvidia.com>
Signed-off-by: Nic Ma <nma@nvidia.com>
* [DLMED] add TorchVisionClassificationModel

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

Co-authored-by: monai-bot <monai.miccai2019@gmail.com>
* Add parameter unpacking for transforms

Signed-off-by: Sebastian Penhouet <sebastian.penhouet@airamed.de>
Signed-off-by: Nic Ma <nma@nvidia.com>
* [DLMED] add copy logic

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

* [DLMED] fix flake8

Signed-off-by: Nic Ma <nma@nvidia.com>
* Add query to NGC to get matched model URL and version.
Allow mmar download with latest version or a specific version.

Signed-off-by: Isaac Yang <isaacy@nvidia.com>
no need for default orig_size stored for invertible transforms
Signed-off-by: Can Zhao <canz@nvidia.com>
Signed-off-by: Yiheng Wang <vennw@nvidia.com>
* [DLMED] enhance ToTensor

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

* [DLMED] update according to comments

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

* add clara_train_covid19_3d_ct_classification and clara_train_covid19_annotation_ct_lung_1

point to pt version of covid19 lung annotation model

Signed-off-by: Holger Roth <hroth@nvidia.com>
* [DLMED] add pad options

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

* [DLMED] add to dict transforms

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

* [MONAI] python code formatting

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

* [DLMED] update according to comments

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

Co-authored-by: monai-bot <monai.miccai2019@gmail.com>
Signed-off-by: ahatamizadeh <ahatamizadeh@nvidia.com>
* [DLMED] update ignite to 0.4.5

Signed-off-by: Nic Ma <nma@nvidia.com>
* [DLMED] add dynamic data list in CacheDataset

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

* [DLMED] add support to PersistentDataset

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

* [DLMED] fix flake8 issue

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

* [DLMED] fix CI tests

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

* [DLMED] enhance dataset

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>

* [DLMED] update_data -> set_data

Signed-off-by: Nic Ma <nma@nvidia.com>
Signed-off-by: Holger Roth <hroth@nvidia.com>
…grow (#2442)

Signed-off-by: vnath <vnath@nvidia.com>
…2315)

* [WIP] 2220 Decollate batch into list of tensors after model forward (#2244)

* [DLMED] add support for Activation transform

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

* [DLMED] change all the array level post transforms to channel-first

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

* [DLMED] update all the IO, utility, post transforms

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

* [DLMED] update engines for list of dict

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

* [DLMED] update all the event handlers

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

* [DLMED] support non-batch data

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

* [MONAI] python code formatting

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

* [DLMED] update according to comments

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

* [DLMED] update based on the latest APIs

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

Co-authored-by: monai-bot <monai.miccai2019@gmail.com>

* [MONAI] python code formatting

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

* [DLMED] fix all the unit tests

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

* [DLMED] fix unit tests

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

* [DLMED] fix flake8 issues

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

* [DLMED] remove unused import

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

* [DLMED] fix flake8 issue

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

* [DLMED] fix integration test

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

* [DLMED] fix integration tests

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

* [MONAI] python code formatting

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

* [DLMED] fix integration tests

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] add support to copy scalar

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

* [DLMED] fix flake8 issue

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

* [DLMED] fix wrong unit tests

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

* [DLMED] fix doc issue

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

* [DLMED] fix broken tests

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

* [DLMED] fix unit tests

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

* [MONAI] python code formatting

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

* [DLMED] simplify CSV saver

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

* [DLMED] update according to comments

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

* [DLMED] add copy_scalar_to_batch util

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

* [DLMED] fix flake8 issue

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

* [DLMED] change to preprocessing and postprocessing

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

* [DLMED] change file name to postprocessing

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

* [DLMED] fix flake8

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

* [DLMED] fix typo in doc-string

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

* [DLMED] add Decollated back

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

* [MONAI] python code formatting

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

* [DLMED] update according to comments

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

* [DLMED] update to use ignite v0.4.5 metrics API

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

* [DLMED] fix flake8 issue

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

* [DLMED] fix conflicts

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

* [MONAI] python code formatting

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

* fixes #2452

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

Co-authored-by: monai-bot <monai.miccai2019@gmail.com>
* deprecation fixes

Signed-off-by: Eric Kerfoot <eric.kerfoot@kcl.ac.uk>

* deprecation fixes

Signed-off-by: Eric Kerfoot <eric.kerfoot@kcl.ac.uk>

* deprecation fixes

Signed-off-by: Eric Kerfoot <eric.kerfoot@kcl.ac.uk>

* deprecation fixes

Signed-off-by: Eric Kerfoot <eric.kerfoot@kcl.ac.uk>

* deprecation fixes

Signed-off-by: Eric Kerfoot <eric.kerfoot@kcl.ac.uk>

* deprecation fixes

Signed-off-by: Eric Kerfoot <eric.kerfoot@kcl.ac.uk>

* deprecation fixes

Signed-off-by: Eric Kerfoot <eric.kerfoot@kcl.ac.uk>
* enhance version compare

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

* update

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

* remove unused

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

* remove unused vars

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

* update debug info

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

* temp tests

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

* non integer comparison

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

* adds tests

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

* no temp tests

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

* update test

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

Co-authored-by: Nic Ma <nma@nvidia.com>
* [DLMED] add deprecated decorator

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

* [MONAI] python code formatting

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

* [DLMED] update according to comments

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

* [DLMED] enhance doc-string

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

Co-authored-by: monai-bot <monai.miccai2019@gmail.com>
Signed-off-by: Jeff VanOss <jeff.vanoss@bamfhealth.com>
* [DLMED] add support to compare metrics

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>
* add UNETR, ViT

Signed-off-by: ahatamizadeh <ahatamizadeh@nvidia.com>

* add UNETR, ViT

Signed-off-by: ahatamizadeh <ahatamizadeh@nvidia.com>

* add UNETR, ViT

Signed-off-by: ahatamizadeh <ahatamizadeh@nvidia.com>

* add UNETR, ViT

Signed-off-by: ahatamizadeh <ahatamizadeh@nvidia.com>

* add UNETR, ViT

Signed-off-by: ahatamizadeh <ahatamizadeh@nvidia.com>

* add UNETR, ViT

Signed-off-by: ahatamizadeh <ahatamizadeh@nvidia.com>

* add UNETR, ViT

Signed-off-by: ahatamizadeh <ahatamizadeh@nvidia.com>
@Nic-Ma Nic-Ma merged commit 8410443 into Nic-Ma:2495-enhance-net-block Jul 1, 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.