Skip to content

[WIP] Port MONAI Generative utils - #7134

Merged
wyli merged 17 commits into
Project-MONAI:devfrom
marksgraham:6676_port_generative_utils
Oct 30, 2023
Merged

[WIP] Port MONAI Generative utils#7134
wyli merged 17 commits into
Project-MONAI:devfrom
marksgraham:6676_port_generative_utils

Conversation

@marksgraham

@marksgraham marksgraham commented Oct 16, 2023 •
edited
Loading

Copy link
Copy Markdown
Contributor

Towards completing #6676 .

Description

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

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.

@marksgraham

marksgraham commented Oct 17, 2023

Copy link
Copy Markdown
Contributor Author

@ericspod I'm getting mypy errors from unsqueeze_left and unsqueeze_right:

mypy 1.4.1 (compiled: yes)
monai/utils/misc.py:895:5: error: Returning Any from function declared to return "T"  [no-any-return]
monai/utils/misc.py:895:12: error: Value of type "object" is not indexable  [index]
monai/utils/misc.py:895:43: error: "T" has no attribute "ndim"  [attr-defined]
monai/utils/misc.py:900:5: error: Returning Any from function declared to return "T"  [no-any-return]
monai/utils/misc.py:900:12: error: Value of type "object" is not indexable  [index]
monai/utils/misc.py:900:34: error: "T" has no attribute "ndim"  [attr-defined]

so far they only operate on tensors - am I ok to type them specifally for tensors/np arrays to satisfy mypy?

@ericspod

ericspod commented Oct 17, 2023

Copy link
Copy Markdown
Member

am I ok to type them specifally for tensors/np arrays to satisfy mypy?

If you need to yes do that, but we do have NdarrayOrTensor.

marksgraham and others added 7 commits October 17, 2023 15:58
@marksgraham
Fixes mypy issues
355b4d9
@marksgraham
Fix mypy issues and add test
92044d5
@marksgraham
DCO Remediation Commit for Mark Graham <markgraham539@gmail.com>
536ce75 
I, Mark Graham <markgraham539@gmail.com>, hereby add my Signed-off-by to this commit: 7aaeab0
I, Mark Graham <markgraham539@gmail.com>, hereby add my Signed-off-by to this commit: 2090549
I, Mark Graham <markgraham539@gmail.com>, hereby add my Signed-off-by to this commit: 94f57ac
I, Mark Graham <markgraham539@gmail.com>, hereby add my Signed-off-by to this commit: f94e666
I, Mark Graham <markgraham539@gmail.com>, hereby add my Signed-off-by to this commit: 1d95d92
I, Mark Graham <markgraham539@gmail.com>, hereby add my Signed-off-by to this commit: 355b4d9
I, Mark Graham <markgraham539@gmail.com>, hereby add my Signed-off-by to this commit: 92044d5

Signed-off-by: Mark Graham <markgraham539@gmail.com>
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
57e4843 
for more information, see https://pre-commit.ci
@marksgraham
DCO commit
21950bb 
Signed-off-by: Mark Graham <markgraham539@gmail.com>
@marksgraham
Merge branch '6676_port_generative_utils' of github.com:marksgraham/M…
2c72721 
…ONAI into 6676_port_generative_utils
@marksgraham
Merge branch 'dev' into 6676_port_generative_utils
8ee2065
KumoLiu
KumoLiu approved these changes Oct 18, 2023
View reviewed changes

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

Thanks for the PR, few minor comments inline.

Comment thread monai/utils/enums.py
Comment thread tests/test_squeeze_unsqueeze.py Outdated
@KumoLiu
KumoLiu requested review from ericspod and wyli October 18, 2023 03:38
@marksgraham
Adds brief docstrings
f71fda0
@marksgraham
Tests with different datatypes
64e8c9f 
Signed-off-by: Mark Graham <markgraham539@gmail.com>
@marksgraham
DCO Remediation Commit for Mark Graham <markgraham539@gmail.com>
471d25d 
I, Mark Graham <markgraham539@gmail.com>, hereby add my Signed-off-by to this commit: f71fda0

Signed-off-by: Mark Graham <markgraham539@gmail.com>
wyli
wyli reviewed Oct 18, 2023
View reviewed changes
Comment thread monai/utils/component_store.py
@marksgraham marksgraham mentioned this pull request Oct 19, 2023
Closed
@marksgraham
Merge branch 'dev' into 6676_port_generative_utils
595c197 
Signed-off-by: Mark Graham <markgraham539@gmail.com>
@marksgraham
marksgraham marked this pull request as ready for review October 30, 2023 13:27
@marksgraham
Merge branch 'dev' into 6676_port_generative_utils
7d69606 
Signed-off-by: Mark Graham <markgraham539@gmail.com>
@wyli

wyli commented Oct 30, 2023

Copy link
Copy Markdown
Contributor

/build

wyli
wyli approved these changes Oct 30, 2023
View reviewed changes

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

Thanks, it looks good to me.

@wyli
wyli enabled auto-merge (squash) October 30, 2023 15:34
@wyli
wyli merged commit 83f5091 into Project-MONAI:dev Oct 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wyli wyli wyli approved these changes
@KumoLiu KumoLiu KumoLiu approved these changes
@ericspod ericspod Awaiting requested review from ericspod ericspod is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@marksgraham @ericspod @wyli @KumoLiu