Skip to content

Commit 6f4e5cb

Browse files
remove device set
Signed-off-by: Yiheng Wang <[email protected]>
1 parent ea2355b commit 6f4e5cb

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

monai/data/meta_tensor.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,6 @@ def ensure_torch_and_prune_meta(
537537
simple_keys: bool = False,
538538
pattern: str | None = None,
539539
sep: str = ".",
540-
device: None | str | torch.device = None,
541540
):
542541
"""
543542
Convert the image to MetaTensor (when meta is not None). If `affine` is in the `meta` dictionary,
@@ -552,15 +551,12 @@ def ensure_torch_and_prune_meta(
552551
sep: combined with `pattern`, used to match and delete keys in the metadata (nested dictionary).
553552
default is ".", see also :py:class:`monai.transforms.DeleteItemsd`.
554553
e.g. ``pattern=".*_code$", sep=" "`` removes any meta keys that ends with ``"_code"``.
555-
device: target device to put the Tensor data.
556554
557555
Returns:
558556
By default, a `MetaTensor` is returned.
559557
However, if `get_track_meta()` is `False` or meta=None, a `torch.Tensor` is returned.
560558
"""
561-
img = convert_to_tensor(
562-
im, track_meta=get_track_meta() and meta is not None, device=device
563-
) # potentially ascontiguousarray
559+
img = convert_to_tensor(im, track_meta=get_track_meta() and meta is not None) # potentially ascontiguousarray
564560
# if not tracking metadata, return `torch.Tensor`
565561
if not isinstance(img, MetaTensor):
566562
return img
@@ -572,7 +568,7 @@ def ensure_torch_and_prune_meta(
572568
if simple_keys:
573569
# ensure affine is of type `torch.Tensor`
574570
if MetaKeys.AFFINE in meta:
575-
meta[MetaKeys.AFFINE] = convert_to_tensor(meta[MetaKeys.AFFINE], device=device) # bc-breaking
571+
meta[MetaKeys.AFFINE] = convert_to_tensor(meta[MetaKeys.AFFINE]) # bc-breaking
576572
remove_extra_metadata(meta) # bc-breaking
577573

578574
if pattern is not None:

monai/transforms/io/array.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ def __init__(
164164
e.g. ``prune_meta_pattern=".*_code$", prune_meta_sep=" "`` removes meta keys that ends with ``"_code"``.
165165
expanduser: if True cast filename to Path and call .expanduser on it, otherwise keep filename as is.
166166
args: additional parameters for reader if providing a reader name.
167-
device: target device to put the loaded image.
168167
kwargs: additional parameters for reader if providing a reader name.
169168
170169
Note:
@@ -186,7 +185,6 @@ def __init__(
186185
self.pattern = prune_meta_pattern
187186
self.sep = prune_meta_sep
188187
self.expanduser = expanduser
189-
self.device = device
190188

191189
self.readers: list[ImageReader] = []
192190
for r in SUPPORTED_READERS: # set predefined readers as default
@@ -291,15 +289,15 @@ def __call__(self, filename: Sequence[PathLike] | PathLike, reader: ImageReader
291289
)
292290
img_array: NdarrayOrTensor
293291
img_array, meta_data = reader.get_data(img)
294-
img_array = convert_to_dst_type(img_array, dst=img_array, dtype=self.dtype, device=self.device)[0]
292+
img_array = convert_to_dst_type(img_array, dst=img_array, dtype=self.dtype)[0]
295293
if not isinstance(meta_data, dict):
296294
raise ValueError(f"`meta_data` must be a dict, got type {type(meta_data)}.")
297295
# make sure all elements in metadata are little endian
298296
meta_data = switch_endianness(meta_data, "<")
299297

300298
meta_data[Key.FILENAME_OR_OBJ] = f"{ensure_tuple(filename)[0]}" # Path obj should be strings for data loader
301299
img = MetaTensor.ensure_torch_and_prune_meta(
302-
img_array, meta_data, self.simple_keys, pattern=self.pattern, sep=self.sep, device=self.device
300+
img_array, meta_data, self.simple_keys, pattern=self.pattern, sep=self.sep
303301
)
304302
if self.ensure_channel_first:
305303
img = EnsureChannelFirst()(img)

0 commit comments

Comments
 (0)