Skip to content

skip RandAffine if possible#2151

Merged
wyli merged 5 commits intoProject-MONAI:devfrom
rijobro:2124-RandAffine_skip
May 6, 2021
Merged

skip RandAffine if possible#2151
wyli merged 5 commits intoProject-MONAI:devfrom
rijobro:2124-RandAffine_skip

Conversation

@rijobro
Copy link
Copy Markdown
Contributor

@rijobro rijobro commented May 6, 2021

Fixes #2124.

Description

Skip RandAffine if possible.

Status

Ready

Types of changes

  • Non-breaking change (fix or new feature that would not break existing functionality).
  • Integration tests passed locally by running ./runtests.sh -f -u --net --coverage.
  • Quick tests passed locally by running ./runtests.sh --quick --unittests.
  • In-line docstrings updated.
  • Documentation updated, tested make html command in the docs/ folder.

Signed-off-by: Richard Brown <[email protected]>
@rijobro
Copy link
Copy Markdown
Contributor Author

rijobro commented May 6, 2021

When debugging, I put a print statement to verify that the first unit test skips the resampling, as expected.

@wyli
Copy link
Copy Markdown
Contributor

wyli commented May 6, 2021

thanks, need something like

        if not self.rand_affine.do_transform and self.rand_affine.spatial_size is None:
            for idx, key in enumerate(self.keys):
                if self.rand_affine.resampler.as_tensor_output:
                    d[key] = torch.tensor(key)
                elif torch.is_tensor(d[key]):                    
                    d[key] = d[key].cpu().numpy()
            return d

for RandAffined

need to double-check the output data type, make sure that the PR doesn't change the dtype for integer image

@rijobro
Copy link
Copy Markdown
Contributor Author

rijobro commented May 6, 2021

also need to think about the inverse for RandAffined...

@rijobro
Copy link
Copy Markdown
Contributor Author

rijobro commented May 6, 2021

@wyli why would the dtype change if the image isn't modified? Because of the torch/numpy conversion?

Signed-off-by: Richard Brown <[email protected]>
@wyli
Copy link
Copy Markdown
Contributor

wyli commented May 6, 2021

the root cause is that the current resampling requires floats...

out = torch.nn.functional.grid_sample(
img.unsqueeze(0).float(),
grid.unsqueeze(0).float(),

if we bypass the resample step, I feel the datatype might be different, but I haven't checked all the details...

Copy link
Copy Markdown
Contributor

@wyli wyli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks!

@wyli wyli merged commit e816d18 into Project-MONAI:dev May 6, 2021
@rijobro rijobro deleted the 2124-RandAffine_skip branch May 7, 2021 08:24
@wyli
Copy link
Copy Markdown
Contributor

wyli commented May 7, 2021

the dev branch had its 1024th merged pull request 🎉

@rijobro
Copy link
Copy Markdown
Contributor Author

rijobro commented May 7, 2021

that was quick, it's only a few weeks old! 😅

yanielc pushed a commit to yanielc/MONAI that referenced this pull request May 10, 2021
* skip RandAffine if possible

Signed-off-by: Richard Brown <[email protected]>

* add randaffined

Signed-off-by: Richard Brown <[email protected]>

* mypy fix

Signed-off-by: Richard Brown <[email protected]>

* check consistency

Signed-off-by: Richard Brown <[email protected]>
Signed-off-by: Yaniel Cabrera <[email protected]>
yanielc pushed a commit to yanielc/MONAI that referenced this pull request May 13, 2021
* skip RandAffine if possible

Signed-off-by: Richard Brown <[email protected]>

* add randaffined

Signed-off-by: Richard Brown <[email protected]>

* mypy fix

Signed-off-by: Richard Brown <[email protected]>

* check consistency

Signed-off-by: Richard Brown <[email protected]>
Signed-off-by: Yaniel Cabrera <[email protected]>
yanielc pushed a commit to yanielc/MONAI that referenced this pull request May 13, 2021
* skip RandAffine if possible

Signed-off-by: Richard Brown <[email protected]>

* add randaffined

Signed-off-by: Richard Brown <[email protected]>

* mypy fix

Signed-off-by: Richard Brown <[email protected]>

* check consistency

Signed-off-by: Richard Brown <[email protected]>
Signed-off-by: Yaniel Cabrera <[email protected]>
wyli pushed a commit that referenced this pull request May 26, 2021
* skip RandAffine if possible

Signed-off-by: Richard Brown <[email protected]>

* add randaffined

Signed-off-by: Richard Brown <[email protected]>

* mypy fix

Signed-off-by: Richard Brown <[email protected]>

* check consistency

Signed-off-by: Richard Brown <[email protected]>
wyli pushed a commit that referenced this pull request May 26, 2021
* skip RandAffine if possible

Signed-off-by: Richard Brown <[email protected]>

* add randaffined

Signed-off-by: Richard Brown <[email protected]>

* mypy fix

Signed-off-by: Richard Brown <[email protected]>

* check consistency

Signed-off-by: Richard Brown <[email protected]>
wyli pushed a commit that referenced this pull request May 26, 2021
* skip RandAffine if possible

Signed-off-by: Richard Brown <[email protected]>

* add randaffined

Signed-off-by: Richard Brown <[email protected]>

* mypy fix

Signed-off-by: Richard Brown <[email protected]>

* check consistency

Signed-off-by: Richard Brown <[email protected]>
wyli pushed a commit that referenced this pull request May 26, 2021
* skip RandAffine if possible

Signed-off-by: Richard Brown <[email protected]>

* add randaffined

Signed-off-by: Richard Brown <[email protected]>

* mypy fix

Signed-off-by: Richard Brown <[email protected]>

* check consistency

Signed-off-by: Richard Brown <[email protected]>
wyli pushed a commit that referenced this pull request May 26, 2021
* skip RandAffine if possible

Signed-off-by: Richard Brown <[email protected]>

* add randaffined

Signed-off-by: Richard Brown <[email protected]>

* mypy fix

Signed-off-by: Richard Brown <[email protected]>

* check consistency

Signed-off-by: Richard Brown <[email protected]>
wyli pushed a commit that referenced this pull request May 27, 2021
* skip RandAffine if possible

Signed-off-by: Richard Brown <[email protected]>

* add randaffined

Signed-off-by: Richard Brown <[email protected]>

* mypy fix

Signed-off-by: Richard Brown <[email protected]>

* check consistency

Signed-off-by: Richard Brown <[email protected]>
wyli pushed a commit that referenced this pull request May 27, 2021
* skip RandAffine if possible

Signed-off-by: Richard Brown <[email protected]>

* add randaffined

Signed-off-by: Richard Brown <[email protected]>

* mypy fix

Signed-off-by: Richard Brown <[email protected]>

* check consistency

Signed-off-by: Richard Brown <[email protected]>
wyli pushed a commit that referenced this pull request May 27, 2021
* skip RandAffine if possible

Signed-off-by: Richard Brown <[email protected]>

* add randaffined

Signed-off-by: Richard Brown <[email protected]>

* mypy fix

Signed-off-by: Richard Brown <[email protected]>

* check consistency

Signed-off-by: Richard Brown <[email protected]>
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.

RandAffine/RandAffined skipping the resampling if do_transform is False

2 participants