Skip to content

Implementing UNet++#5084

Merged
wyli merged 26 commits into
Project-MONAI:devfrom
yashika-git:patch-3
Sep 7, 2022
Merged

Implementing UNet++#5084
wyli merged 26 commits into
Project-MONAI:devfrom
yashika-git:patch-3

Conversation

@yashika-git

Copy link
Copy Markdown
Contributor

Fixes #896.

Description

Added Unet++.

Status

**Ready

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.

Signed-off-by: Yashika Jain <yashikajain201@gmail.com>
Signed-off-by: Yashika Jain <yashikajain201@gmail.com>
Signed-off-by: Yashika Jain <yashikajain201@gmail.com>
Signed-off-by: Yashika Jain <yashikajain201@gmail.com>
@yashika-git yashika-git changed the title Patch 3 Implementing UNet++ Sep 3, 2022
@yashika-git yashika-git marked this pull request as draft September 3, 2022 13:59
Signed-off-by: Yashika Jain <yashikajain201@gmail.com>
Signed-off-by: Yashika Jain <yashikajain201@gmail.com>
@yashika-git yashika-git marked this pull request as ready for review September 3, 2022 14:47
@yashika-git

Copy link
Copy Markdown
Contributor Author

Hi @Nic-Ma, @KumoLiu,
I've resolved the Flake8 issues. Could you please review it?
Thanks.

Comment thread monai/networks/nets/basic_unetplusplus.py Outdated
Signed-off-by: Yashika Jain <yashikajain201@gmail.com>
@ericspod

ericspod commented Sep 4, 2022

Copy link
Copy Markdown
Member

/black

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

@KumoLiu KumoLiu 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.

I think it overall looks good to me. Thanks!

@yashika-git

Copy link
Copy Markdown
Contributor Author

I think it overall looks good to me. Thanks!

Thank you, @KumoLiu

Comment thread monai/networks/nets/basic_unetplusplus.py Outdated
yashika-git and others added 5 commits September 6, 2022 23:31
Signed-off-by: Yashika Jain <yashikajain201@gmail.com>
for more information, see https://pre-commit.ci

Signed-off-by: Yashika Jain <yashikajain201@gmail.com>
Signed-off-by: Yashika Jain <yashikajain201@gmail.com>
Signed-off-by: Yashika Jain <yashikajain201@gmail.com>
for more information, see https://pre-commit.ci

Signed-off-by: Yashika Jain <yashikajain201@gmail.com>
Signed-off-by: monai-bot <monai.miccai2019@gmail.com>
ericspod and others added 12 commits September 6, 2022 23:55
Signed-off-by: Eric Kerfoot <eric.kerfoot@kcl.ac.uk>

### Description
Adds a handler for directing logging information to a file once an `Engine` object starts and then doing the cleanup when it completes.

### Status
**Ready**

### Types of changes
<!--- Put an `x` in all the boxes that apply, and remove the not applicable items -->
- [x] 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).
- [x] 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`.
- [x] In-line docstrings updated.
- [x] Documentation updated, tested `make html` command in the `docs/` folder.

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>
### Description
This allows `default_prepare_batch` to handle batches containing a single tensor or a pair of tensors. Normally if one uses array transforms you'll get an error saying the default batch function needs dictionaries so this will allow such transform sequences to be used without modification.

### Status
**Work in progress**

### Types of changes
<!--- Put an `x` in all the boxes that apply, and remove the not applicable items -->
- [x] 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).
- [x] 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`.
- [x] In-line docstrings updated.
- [ ] Documentation updated, tested `make html` command in the `docs/` folder.

Signed-off-by: Eric Kerfoot <eric.kerfoot@kcl.ac.uk>
Co-authored-by: Wenqi Li <831580+wyli@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Fixes Project-MONAI#4909


### Status
**Ready**

### Types of changes
<!--- Put an `x` in all the boxes that apply, and remove the not applicable items -->
- [x] 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.

Signed-off-by: Wenqi Li <wenqil@nvidia.com>
Fixes Project-MONAI#4554. 

Requires latest Ignite RC.

Also improves ClientAlgo docstrings formatting.

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

### Status
**Ready**

### Types of changes
<!--- Put an `x` in all the boxes that apply, and remove the not applicable items -->
- [x] 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.

Signed-off-by: Holger Roth <hroth@nvidia.com>
Signed-off-by: Nic Ma <nma@nvidia.com>
Signed-off-by: monai-bot <monai.miccai2019@gmail.com>
Co-authored-by: Nic Ma <nma@nvidia.com>
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>
Signed-off-by: Eric Kerfoot <eric.kerfoot@kcl.ac.uk>

### Description
Numpy arrays with type uint16, uint32, and uint64 need to be converted to signed versions before conversion to Pytorch tensors. This is relevant because MR data is often stored in uint16 format.

### Status
**Ready**

### Types of changes
<!--- Put an `x` in all the boxes that apply, and remove the not applicable items -->
- [x] 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).
- [x] 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.

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

### Description
Using `view` to avoid copying doesn't actually work as intended in the type conversion to use `astype`.

### Status
**Ready**

### Types of changes
<!--- Put an `x` in all the boxes that apply, and remove the not applicable items -->
- [x] 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.

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>
…roject-MONAI#5087)

### Description
Part of the requested improvements Project-MONAI#5085 

Planned fixes
- [x] fold number is not being updated in generate()
- [x] put absolute paths in the bundle configs
- [x] break the auto-generated auto_config into multiple files.

### Status
WIP

### Types of changes
<!--- Put an `x` in all the boxes that apply, and remove the not applicable items -->
- [x] 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.

Signed-off-by: Mingxin Zheng <18563433+mingxin-zheng@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Nic Ma <nma@nvidia.com>
### Description
This PR remove "Status" from PR template. The Status was very useful before GitHub introduced *Draft* PR. I believe right now it is redundant to have this and sometimes conflicting (e.g., Status Ready <> Draft PR), so I believe it is time to remove the "Status" from PR template.


### Types of changes
<!--- Put an `x` in all the boxes that apply, and remove the not applicable items -->
- [x] Non-breaking change (fix or new feature that would not break existing functionality).

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

Fixes # .

### Description
Fix docstring in auto3dseg

### Status
**Work in progress**

### Types of changes
<!--- Put an `x` in all the boxes that apply, and remove the not applicable items -->
- [x] 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.

Signed-off-by: KumoLiu <yunl@nvidia.com>
Signed-off-by: Wenqi Li <wenqil@nvidia.com>
Co-authored-by: Wenqi Li <wenqil@nvidia.com>
Co-authored-by: Wenqi Li <831580+wyli@users.noreply.github.com>
Signed-off-by: Wenqi Li <wenqil@nvidia.com>
Fixes Project-MONAI#5070 .

### Description

The batch size for the contrastive loss is estimated automatically

### Types of changes
<!--- Put an `x` in all the boxes that apply, and remove the not
applicable items -->
- [x] 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).
- [x] 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`.
- [x] In-line docstrings updated.
- [ ] Documentation updated, tested `make html` command in the `docs/`
folder.

Signed-off-by: a-parida12 <abhijeet.parida@tum.de>
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>
@wyli

wyli commented Sep 6, 2022

Copy link
Copy Markdown
Contributor

/build

@wyli wyli enabled auto-merge (squash) September 6, 2022 23:00
@wyli

wyli commented Sep 6, 2022

Copy link
Copy Markdown
Contributor

/build

1 similar comment
@wyli

wyli commented Sep 7, 2022

Copy link
Copy Markdown
Contributor

/build

@wyli wyli merged commit fb6d950 into Project-MONAI:dev Sep 7, 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.

add support for UNET++

9 participants