-
Notifications
You must be signed in to change notification settings - Fork 1.4k
ENH: support additional dtypes in pad_nd #8672
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.
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
Open
shubham-61969
wants to merge
7
commits into
Project-MONAI:dev
Choose a base branch
from
shubham-61969:7842-pad-nd-more-dtypes
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+119
−9
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
df7711d
ENH: support additional dtypes in pad_nd
shubham-61969 ad9f60a
FIX: ensure pad_nd handles value kwarg correctly across modes
shubham-61969 399cf0d
FIX: clean pad_nd fallback handling and mode-specific kwargs in test
shubham-61969 7aa63e7
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] dd26dea
FIX: align pad_nd behavior and tests with MONAI conventions
shubham-61969 96c115e
Resolve merge conflict in pad_nd tests
shubham-61969 6440db6
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| # Copyright (c) MONAI Consortium | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| """ | ||
| Tests for pad_nd dtype support and backend selection. | ||
| Validates PyTorch padding preference and NumPy fallback behavior. | ||
| """ | ||
| from __future__ import annotations | ||
|
|
||
| import unittest | ||
| from unittest.mock import Mock, patch | ||
|
|
||
| from parameterized.parameterized import parameterized | ||
|
|
||
| import torch | ||
|
|
||
| import monai.transforms.croppad.functional as F | ||
| from monai.transforms.croppad.functional import pad_nd | ||
|
|
||
|
|
||
| class TestPadNdDtypes(unittest.TestCase): | ||
| def test_pad_uses_pt_for_bool(self): | ||
| """Test that pad_nd uses PyTorch backend for bool dtype in constant mode.""" | ||
| img = torch.ones((1, 4, 4), dtype=torch.bool) | ||
| to_pad = [(0, 0), (1, 1), (2, 2)] | ||
| with patch.object(F, "_pt_pad", wraps=F._pt_pad) as mock_pt, patch.object(F, "_np_pad", wraps=F._np_pad) as mock_np: | ||
| out = pad_nd(img, to_pad, mode="constant", value=0) | ||
|
|
||
| self.assertTrue(mock_pt.called) | ||
| self.assertFalse(mock_np.called) | ||
| self.assertEqual(out.dtype, img.dtype) | ||
| self.assertEqual(out.shape, (1, 6, 8)) | ||
|
|
||
| def test_pad_falls_back_to_np_if_pt_raises(self): | ||
| """Test that pad_nd falls back to NumPy when PyTorch raises NotImplementedError.""" | ||
| img = torch.ones((1, 4, 4), dtype=torch.bool) | ||
| to_pad = [(0, 0), (1, 1), (2, 2)] | ||
| with ( | ||
| patch.object(F, "_pt_pad", new=Mock(side_effect=NotImplementedError("no"))) as mock_pt, | ||
| patch.object(F, "_np_pad", wraps=F._np_pad) as mock_np, | ||
| ): | ||
| out = pad_nd(img, to_pad, mode="constant", value=0) | ||
|
|
||
| self.assertTrue(mock_pt.called) | ||
| self.assertTrue(mock_np.called) | ||
| self.assertEqual(out.dtype, img.dtype) | ||
| self.assertEqual(out.shape, (1, 6, 8)) | ||
|
|
||
| @parameterized.expand([ | ||
| torch.bool, | ||
| torch.int8, | ||
| torch.int16, | ||
| torch.int32, | ||
| torch.int64, | ||
| torch.uint8, | ||
| torch.float32, | ||
| ]) | ||
| def test_pad_dtype_no_error_and_dtype_preserved(self, dtype): | ||
| """Test that pad_nd handles various dtypes without error and preserves dtype.""" | ||
| img = torch.ones((1, 4, 4), dtype=dtype) | ||
| to_pad = [(0, 0), (1, 1), (2, 2)] | ||
| out = pad_nd(img, to_pad, mode="constant", value=0) | ||
|
|
||
| self.assertEqual(out.shape, (1, 6, 8)) | ||
| self.assertEqual(out.dtype, img.dtype) | ||
|
|
||
| @parameterized.expand([ | ||
| ("constant", torch.bool), | ||
| ("constant", torch.int8), | ||
| ("constant", torch.float32), | ||
| ("reflect", torch.bool), | ||
| ("reflect", torch.int8), | ||
| ("reflect", torch.float32), | ||
| ("replicate", torch.bool), | ||
| ("replicate", torch.int8), | ||
| ("replicate", torch.float32), | ||
| ]) | ||
| def test_pad_multiple_modes_dtype_preserved(self, mode, dtype): | ||
| """Test that pad_nd preserves dtype across multiple padding modes.""" | ||
| img = torch.ones((1, 4, 4), dtype=dtype) | ||
| to_pad = [(0, 0), (1, 1), (2, 2)] | ||
|
|
||
| kwargs = {"value": 0} if mode == "constant" else {} | ||
| out = pad_nd(img, to_pad, mode=mode, **kwargs) | ||
|
|
||
| self.assertEqual(out.shape, (1, 6, 8)) | ||
| self.assertEqual(out.dtype, img.dtype) | ||
|
|
||
| def test_value_with_non_constant_mode_raises(self): | ||
| """Test that pad_nd raises ValueError when 'value' is provided with non-constant mode.""" | ||
| img = torch.ones((1, 4, 4)) | ||
| to_pad = [(0, 0), (1, 1), (2, 2)] | ||
| with self.assertRaises(ValueError): | ||
| pad_nd(img, to_pad, mode="reflect", **{"value": 0}) | ||
|
|
||
|
|
||
| if __name__ == "__main__": | ||
| unittest.main() | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In MONAI we use
unittestandparameterizedpackages for tests and notpytest, specifically we use test classes and methods for unit tests rather than functions. Please reformulate these tests to use these packages according the style of other tests that are present here. It might make sense to add your tests to an existing file rather than a new one, have a look at existing files to see if it does make sense that way.