address coderabbit

Author: aymuos15

monai/transforms/spatial/functional.py

@@ -99,9 +99,10 @@ def spatial_resample(
     src_affine: torch.Tensor = img.peek_pending_affine() if isinstance(img, MetaTensor) else torch.eye(4)
     img = convert_to_tensor(data=img, track_meta=get_track_meta())
     # ensure spatial rank is <= 3
-    spatial_rank = min(get_spatial_ndim(img), 3)
+    max_rank = max(int(img.ndim) - 1, 1)
+    spatial_rank = min(get_spatial_ndim(img), max_rank, 3)
     if (not isinstance(spatial_size, int) or spatial_size != -1) and spatial_size is not None:
-        spatial_rank = min(len(ensure_tuple(spatial_size)), 3)  # infer spatial rank based on spatial_size
+        spatial_rank = min(len(ensure_tuple(spatial_size)), max_rank, 3)  # infer spatial rank based on spatial_size
     src_affine = to_affine_nd(spatial_rank, src_affine).to(torch.float64)
     dst_affine = to_affine_nd(spatial_rank, dst_affine) if dst_affine is not None else src_affine
     dst_affine = convert_to_dst_type(dst_affine, src_affine)[0]

tests/data/meta_tensor/test_spatial_ndim.py

@@ -37,7 +37,7 @@
 PRESERVATION_CASES = [
     ("reshape", lambda t: t.reshape(1, 100), 2),
     ("unsqueeze", lambda t: t.unsqueeze(0), 2),
-    ("squeeze", lambda t: MetaTensor(torch.randn(1, 1, 10, 10), affine=torch.eye(3)).squeeze(1), 2),
+    ("squeeze", lambda t: t.unsqueeze(1).squeeze(1), 2),
     ("clone", lambda t: t.clone(), 2),
     ("deepcopy", lambda t: deepcopy(t), 2),
 ]

tests/transforms/utility/test_splitdim.py

@@ -56,8 +56,8 @@ def test_spatial_ndim_decremented(self):
         self.assertEqual(arr.spatial_ndim, 3)
         out = SplitDim(dim=1, keepdim=False)(arr)
         for item in out:
-            if isinstance(item, MetaTensor):
-                self.assertEqual(item.spatial_ndim, 2)
+            self.assertIsInstance(item, MetaTensor)
+            self.assertEqual(item.spatial_ndim, 2)
 
     def test_spatial_ndim_negative_dim(self):
         """spatial_ndim decremented for keepdim=False with negative dim."""
@@ -67,8 +67,8 @@ def test_spatial_ndim_negative_dim(self):
         self.assertEqual(arr.spatial_ndim, 3)
         out = SplitDim(dim=-1, keepdim=False)(arr)
         for item in out:
-            if isinstance(item, MetaTensor):
-                self.assertEqual(item.spatial_ndim, 2)
+            self.assertIsInstance(item, MetaTensor)
+            self.assertEqual(item.spatial_ndim, 2)
 
     def test_spatial_ndim_channel_dim_no_decrement(self):
         """spatial_ndim not decremented for keepdim=False on channel dim (dim=0)."""
@@ -78,8 +78,8 @@ def test_spatial_ndim_channel_dim_no_decrement(self):
         self.assertEqual(arr.spatial_ndim, 2)
         out = SplitDim(dim=0, keepdim=False)(arr)
         for item in out:
-            if isinstance(item, MetaTensor):
-                self.assertEqual(item.spatial_ndim, 2)
+            self.assertIsInstance(item, MetaTensor)
+            self.assertEqual(item.spatial_ndim, 2)
 
 
 if __name__ == "__main__":