Skip to content

6208 fix-endoscopic-tool-segmentation-ckpt-export #6209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
wyli merged 5 commits into from
Mar 21, 2023
Merged

6208 fix-endoscopic-tool-segmentation-ckpt-export #6209

wyli merged 5 commits into from
Mar 21, 2023

Conversation

@binliunls
Copy link
Contributor

@binliunls binliunls commented Mar 21, 2023 •
edited
Loading

Fixes #6208 .

Description

  1. Add pre_conv as a parameter to FlexibleUNet to make the model forward compatible.
  2. Update the torch.Tensor type hint in the UpCat function to fit the torchscript requirement.

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.

binliunls and others added 4 commits March 21, 2023 08:57
@binliunls
add pre_conv parameter to FlexibleUNet and update the type hint in ba…
a0c8fcd 
…sic unet

Signed-off-by: binliu <binliu@nvidia.com>
@binliunls
update the import order
f9ee375 
Signed-off-by: binliu <binliu@nvidia.com>
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
982bad5 
for more information, see https://pre-commit.ci
@binliunls
change the type hint to Union to avoid being fixed by pre commit
f4b9838 
Signed-off-by: binliu <binliu@nvidia.com>
@binliunls binliunls requested review from Nic-Ma and wyli March 21, 2023 09:18
@binliunls
Copy link
Contributor Author

binliunls commented Mar 21, 2023 •
edited
Loading

Hi @wyli ,
I think the torchscript doesn't support the | expression in the typehint like x : torch.Tensor | None. However when I tried to change it to Optional[torch.Tensor], the pre-commit.ci always changed it back to the | expression. Could you please give me some advices on how to make the change possible?

Thanks,
Bin

@wyli
Copy link
Contributor

wyli commented Mar 21, 2023

sure, I can have a look

@wyli wyli force-pushed the 6208-fix-endoscopic-tool-segmentation-ckpt-export branch from 442d123 to fa1bb08 Compare March 21, 2023 09:41
@wyli
workaround for typing tensorrt
8b78144 
Signed-off-by: Wenqi Li <wenqil@nvidia.com>
@wyli wyli force-pushed the 6208-fix-endoscopic-tool-segmentation-ckpt-export branch from fa1bb08 to 8b78144 Compare March 21, 2023 09:42
@binliunls binliunls mentioned this pull request Mar 21, 2023
Merged
8 tasks
@wyli wyli changed the base branch from dev to auto-update March 21, 2023 09:47
@wyli wyli merged commit 0ea3b85 into Project-MONAI:auto-update Mar 21, 2023
@wyli wyli mentioned this pull request Mar 21, 2023
Merged
wyli added a commit that referenced this pull request Mar 21, 2023
@monai-bot @mingxin-zheng
@binliunls @pre-commit-ci @wyli
auto updates/misc integration fixes (#6211)
843da82 
Signed-off-by: monai-bot <monai.miccai2019@gmail.com>

merging #6210 (fixes
#6207)
merging #6209 (fixes
#6208)
fixes #6171

---------

Signed-off-by: monai-bot <monai.miccai2019@gmail.com>
Signed-off-by: Mingxin Zheng <18563433+mingxin-zheng@users.noreply.github.com>
Signed-off-by: binliu <binliu@nvidia.com>
Signed-off-by: Wenqi Li <wenqil@nvidia.com>
Co-authored-by: Mingxin Zheng <18563433+mingxin-zheng@users.noreply.github.com>
Co-authored-by: binliunls <107988372+binliunls@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Wenqi Li <wenqil@nvidia.com>
jak0bw pushed a commit to jak0bw/MONAI that referenced this pull request Mar 28, 2023
@monai-bot @mingxin-zheng
@binliunls @pre-commit-ci @wyli @jak0bw
auto updates/misc integration fixes (Project-MONAI#6211)
03d096f 
Signed-off-by: monai-bot <monai.miccai2019@gmail.com>

merging Project-MONAI#6210 (fixes
Project-MONAI#6207)
merging Project-MONAI#6209 (fixes
Project-MONAI#6208)
fixes Project-MONAI#6171

---------

Signed-off-by: monai-bot <monai.miccai2019@gmail.com>
Signed-off-by: Mingxin Zheng <18563433+mingxin-zheng@users.noreply.github.com>
Signed-off-by: binliu <binliu@nvidia.com>
Signed-off-by: Wenqi Li <wenqil@nvidia.com>
Co-authored-by: Mingxin Zheng <18563433+mingxin-zheng@users.noreply.github.com>
Co-authored-by: binliunls <107988372+binliunls@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Wenqi Li <wenqil@nvidia.com>
jak0bw pushed a commit to jak0bw/MONAI that referenced this pull request Mar 28, 2023
@monai-bot @mingxin-zheng
@binliunls @pre-commit-ci @wyli @jak0bw
auto updates/misc integration fixes (Project-MONAI#6211)
903f9ee 
Signed-off-by: monai-bot <monai.miccai2019@gmail.com>

merging Project-MONAI#6210 (fixes
Project-MONAI#6207)
merging Project-MONAI#6209 (fixes
Project-MONAI#6208)
fixes Project-MONAI#6171

---------

Signed-off-by: monai-bot <monai.miccai2019@gmail.com>
Signed-off-by: Mingxin Zheng <18563433+mingxin-zheng@users.noreply.github.com>
Signed-off-by: binliu <binliu@nvidia.com>
Signed-off-by: Wenqi Li <wenqil@nvidia.com>
Co-authored-by: Mingxin Zheng <18563433+mingxin-zheng@users.noreply.github.com>
Co-authored-by: binliunls <107988372+binliunls@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Wenqi Li <wenqil@nvidia.com>
@binliunls binliunls deleted the 6208-fix-endoscopic-tool-segmentation-ckpt-export branch March 30, 2023 15:53
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

@Nic-Ma Nic-Ma Awaiting requested review from Nic-Ma

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Cannot convert the endoscopic_tool_segmentation pretrained model to torchscrpit

2 participants

@binliunls @wyli