Skip to content

Fix VideoDecoder device argument to accept torch.device #607

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Apr 2, 2025
Merged

Fix VideoDecoder device argument to accept torch.device #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7412db
Fix: Convert torch.device to string in VideoDecoder init
soheil-star01 Mar 29, 2025
0a0b482
Test: Add non-regression test for torch.device() in VideoDecoder
soheil-star01 Apr 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/torchcodec/decoders/_video_decoder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from pathlib import Path
from typing import Literal, Optional, Tuple, Union

from torch import device, Tensor
from torch import device as torch_device, Tensor

from torchcodec import Frame, FrameBatch
from torchcodec.decoders import _core as core
Expand Down Expand Up @@ -72,7 +72,7 @@ def __init__(
stream_index: Optional[int] = None,
dimension_order: Literal["NCHW", "NHWC"] = "NCHW",
num_ffmpeg_threads: int = 1,
device: Optional[Union[str, device]] = "cpu",
device: Optional[Union[str, torch_device]] = "cpu",
seek_mode: Literal["exact", "approximate"] = "exact",
):
allowed_seek_modes = ("exact", "approximate")
Expand All @@ -94,6 +94,9 @@ def __init__(
if num_ffmpeg_threads is None:
raise ValueError(f"{num_ffmpeg_threads = } should be an int.")

if isinstance(device, torch_device):
device = str(device)

core.add_video_stream(
self._decoder,
stream_index=stream_index,
Expand Down
5 changes: 5 additions & 0 deletions test/decoders/test_decoders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,11 @@ def test_getitem_slice(self, device, seek_mode):
# See https://github.com/pytorch/torchcodec/issues/428
assert_frames_equal(sliced, ref)

def test_device_instance(self):
# Non-regression test for https://github.com/pytorch/torchcodec/issues/602
decoder = VideoDecoder(NASA_VIDEO.path, device=torch.device("cpu"))
assert isinstance(decoder.metadata, VideoStreamMetadata)

@pytest.mark.parametrize("device", cpu_and_cuda())
@pytest.mark.parametrize("seek_mode", ("exact", "approximate"))
def test_getitem_fails(self, device, seek_mode):
Expand Down
Loading