Skip to content

Conversation

Can-Zhao
Copy link
Collaborator

@Can-Zhao Can-Zhao commented Jan 5, 2022

Fixes # .

Description

rebase dev
add box utils

Status

Work in progress

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 -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 and others added 30 commits December 2, 2021 09:20
* Update WSIReader level/location/size calculation

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

* Update location downsampling

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

* Update tests and add a new test case

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

* Update few names and logics

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

* Fix the dependency issue

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

* Check for imagecodecs + tifffile

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

* Remove new test case that uses too much memory

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

* Add new case and ignore level=0 for TiffFile

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

* Address comments

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

Co-authored-by: Nic Ma <nma@nvidia.com>
Signed-off-by: Wenqi Li <wenqil@nvidia.com>
* Update TiffFile backend to read only the entire image

Signed-off-by: Behrooz <3968947+drbeh@users.noreply.github.com>
…ct-MONAI#3431)

* [DLMED] extract write logic

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 according to comments

Signed-off-by: Nic Ma <nma@nvidia.com>
* [DLMED] add dataframe

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

* [DLMED] enhance CSV iterable dataset

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>

* [DLMED] add comment

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 according to comments

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

* [DLMED] fix file close issue

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

* [DLMED] fix doc

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 BaseWorkflow

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>

* [DLMED] add *args, **kwargs

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

Co-authored-by: monai-bot <monai.miccai2019@gmail.com>
* [DLMED] fix deprecated arg

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>
…3427)

* enhance dynunet

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

* fix black issue

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

* use strict=False

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

* fix black 21.12 error

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

* enhance code and update docstring

Signed-off-by: Yiheng Wang <vennw@nvidia.com>
* fixes deprecated args

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

* update based on comments

Signed-off-by: Wenqi Li <wenqil@nvidia.com>
improve error message if reader nott available
Signed-off-by: Wenqi Li <wenqil@nvidia.com>
Signed-off-by: Wenqi Li <wenqil@nvidia.com>
Signed-off-by: Wenqi Li <wenqil@nvidia.com>
* [DLMED] add dataset generator

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

* [DLMED] add DatasetGenerator

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] fix wrong test

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

* [DLMED] simplify according to comments

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

* [DLMED] remove return

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

* [DLMED] update rtol for CI

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

Co-authored-by: monai-bot <monai.miccai2019@gmail.com>
* [DLMED] add missing docs

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

* [DLMED] add missing components

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

* [DLMED] fix test

Signed-off-by: Nic Ma <nma@nvidia.com>
* [DLMED] add channel-wise

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

* [DLMED] update according to comments

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

* [DLMED] fix typo

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

* [DLMED] skip test if before 1.7

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>
* [DLMED] add Iteration base class

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>
Signed-off-by: Yiheng Wang <vennw@nvidia.com>
* [DLMED] support string dtype

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

* [DLMED] fix typo

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

* [DLMED] enhance dtype in ToCupy

Signed-off-by: Nic Ma <nma@nvidia.com>
Signed-off-by: Nic Ma <nma@nvidia.com>
* Update to not include number for the name of the first range

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

* Update CuCIM and TorchVision wrappers to include name

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

* Update nvtx range to append undelying class for wrapper tranforms

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

* Add new test cases to cover changes

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

* Update cucim and torchvision check

Signed-off-by: Behrooz <3968947+drbeh@users.noreply.github.com>
…3494)

* [DLMED] add missing images

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

* [DLMED] fix 3471

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

* [DLMED] fix AsDiscrete

Signed-off-by: Nic Ma <nma@nvidia.com>
* make bending energy loss invariant to resolution

fixes Project-MONAI#3485

Signed-off-by: Ebrahim Ebrahim <ebrahim.ebrahim@kitware.com>

* set BendingEnergyLoss default normalize to False

Maybe it's more important that the default behavior match usage of the
term "bending energy" elsewhere, rather than that it be the most
convenient behavior.

Signed-off-by: Ebrahim Ebrahim <ebrahim.ebrahim@kitware.com>
Signed-off-by: Wenqi Li <wenqil@nvidia.com>
…#3499)

* [DLMED] correct kwargs

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

* [DLMED] fix grammar

Signed-off-by: Nic Ma <nma@nvidia.com>
Signed-off-by: Wenqi Li <wenqil@nvidia.com>
* [DLMED] add SavitzkyGolaySmoothd

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

* [DLMED] fix typo

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

* [DLMED] update according to comments

Signed-off-by: Nic Ma <nma@nvidia.com>
Signed-off-by: Wenqi Li <wenqil@nvidia.com>
Signed-off-by: Wenqi Li <wenqil@nvidia.com>
ericspod and others added 27 commits December 21, 2021 00:05
* Adding Torchscript utility functions

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

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* [MONAI] python code formatting

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

* Adding Torchscript utility functions

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

* Added test for extra files

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

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update

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

* Update

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

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update

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

* Update

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

* Updates

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

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Updates

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

* Updates

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

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: monai-bot <monai.miccai2019@gmail.com>
Co-authored-by: Nic Ma <nma@nvidia.com>
* [DLMED] change to utility transforms

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

* [DLMED] enhance args

Signed-off-by: Nic Ma <nma@nvidia.com>
* adds missing item

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

* update the contributing guide

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

* update copyright headers

Signed-off-by: Wenqi Li <wenqil@nvidia.com>
* util to check the licence info

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

* update flags

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

* update based on comments

Signed-off-by: Wenqi Li <wenqil@nvidia.com>
… APIs (Project-MONAI#3526)

* [DLMED] clarify old APIs

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

* [DLMED] update according to comments

Signed-off-by: Nic Ma <nma@nvidia.com>
* [DLMED] update to 21.12

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

* [DLMED] update according to comments

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

* [DLMED] add PyTorch 1.9 test

Signed-off-by: Nic Ma <nma@nvidia.com>
* [DLMED] add missing args

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

* [DLMED] update according to comments

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

* [DLMED] update progress arg

Signed-off-by: Nic Ma <nma@nvidia.com>
* [DLMED] fix oneof

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

* [DLMED] add more unit tests

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

* [DLMED] update index

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

* [DLMED] update according to comments

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

* Revert "[DLMED] update according to comments"

This reverts commit c6c3a35.

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

* Revert "[DLMED] update index"

This reverts commit 649a7c5.

Signed-off-by: Nic Ma <nma@nvidia.com>
* drop py36 support

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

* drop 20.09 test because of python min version 3.6

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

* update tests

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

* error->warning, revise copyright

Signed-off-by: Wenqi Li <wenqil@nvidia.com>
* has cupy check

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

* update based on comments

Signed-off-by: Wenqi Li <wenqil@nvidia.com>
* adds min. memory testing utils

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

* include valueerror for robust outcome

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

* ensure float

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

* msg improvements

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

* update threshold

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

* remove ref

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

* separate disttests

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

* update based on comments

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

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

* [DLMED] fix typo

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

Co-authored-by: Wenqi Li <wenqil@nvidia.com>
* Adding smooth deform transform

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

* Update

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

* Updates

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

* Docs update

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

* Type fixing

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

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* [MONAI] python code formatting

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

* Fix

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

* Fix

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

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fix for moveaxis

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

* Fix for moveaxis

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

* Adding example images, random field sized reduced to (10,10,10)

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

* Changed backend

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

* [MONAI] python code formatting

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

* Tweak

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

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: monai-bot <monai.miccai2019@gmail.com>
* runtest.sh defaults to no build/install

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

* following test case conventions for multiprocessing

- adding `_dist` to multiprocessing test cases
- decouple multiprocessing LMDB tests from `test_lmdbdataset`

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

* exclude lmdbdataset tests in min_tests

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

Co-authored-by: Eric Kerfoot <17726042+ericspod@users.noreply.github.com>
Signed-off-by: Eric Kerfoot <eric.kerfoot@kcl.ac.uk>
Signed-off-by: Nic Ma <nma@nvidia.com>
* [DLMED] update dataset summary

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

* [DLMED] enhance data type

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

* [DLMED] fix pickle issue

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

Co-authored-by: Wenqi Li <wenqil@nvidia.com>
updates:
- [github.com/pre-commit/pre-commit-hooks: v4.0.1 → v4.1.0](pre-commit/pre-commit-hooks@v4.0.1...v4.1.0)
- [github.com/asottile/pyupgrade: v2.29.0 → v2.31.0](asottile/pyupgrade@v2.29.0...v2.31.0)
- [github.com/asottile/yesqa: v1.2.3 → v1.3.0](asottile/yesqa@v1.2.3...v1.3.0)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* adds metadata when loading dicom series

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

* fixes timed tests

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

* update based on comments

Signed-off-by: Wenqi Li <wenqil@nvidia.com>
* Create codeql-analysis.yml

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

* build cpp

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

* fixes Multiplication result converted to larger type

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

* fixes url parsing

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

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

* [DLMED] fix CI tests

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

* [DLMED] fix CI test

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

* [DLMED] test CI

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

* [DLMED] fix logging

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

* [DLMED] temp test

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

* [DLMED] fix wrong unit test

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

* [DLMED] fix wrong test cases

Signed-off-by: Nic Ma <nma@nvidia.com>
@Can-Zhao Can-Zhao merged commit dd74c59 into Project-MONAI:feature/1741-detection Jan 5, 2022
Can-Zhao added a commit that referenced this pull request Jan 5, 2022
Can-Zhao added a commit that referenced this pull request Jan 5, 2022
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.

8 participants