Merge branch 'dev' into remove_export

Project-MONAI · Sep 26, 2024 · 7697dcd · 7697dcd
2 parents fdb3876 + acfc508
commit 7697dcd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/monai/transforms/intensity/array.py b/monai/transforms/intensity/array.py
@@ -1411,7 +1411,7 @@ def __call__(self, img: NdarrayOrTensor) -> NdarrayOrTensor:
         else:
             img_t = self._normalize(img=img_t)
 
-        return convert_to_dst_type(img_t, dst=img)[0]
+        return convert_to_dst_type(img_t, dst=img, dtype=self.dtype)[0]
 
 
 class MaskIntensity(Transform):

diff --git a/tests/test_scale_intensity_range_percentiles.py b/tests/test_scale_intensity_range_percentiles.py
@@ -14,6 +14,7 @@
 import unittest
 
 import numpy as np
+import torch
 
 from monai.transforms.intensity.array import ScaleIntensityRangePercentiles
 from tests.utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose
@@ -34,6 +35,7 @@ def test_scaling(self):
         scaler = ScaleIntensityRangePercentiles(lower=lower, upper=upper, b_min=b_min, b_max=b_max, dtype=np.uint8)
         for p in TEST_NDARRAYS:
             result = scaler(p(img))
+            self.assertEqual(result.dtype, torch.uint8)
             assert_allclose(result, p(expected), type_test="tensor", rtol=1e-4)
 
     def test_relative_scaling(self):