diff --git a/test/test_video_gpu_decoder.py b/test/test_video_gpu_decoder.py index e208c6b97d8..fef9bc6dc9e 100644 --- a/test/test_video_gpu_decoder.py +++ b/test/test_video_gpu_decoder.py @@ -3,7 +3,7 @@ import pytest import torch -from torchvision.io import _HAS_VIDEO_DECODER, VideoReader +from torchvision.io import _HAS_GPU_VIDEO_DECODER, VideoReader try: import av @@ -13,7 +13,7 @@ VIDEO_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), "assets", "videos") -@pytest.mark.skipif(_HAS_VIDEO_DECODER is False, reason="Didn't compile with support for gpu decoder") +@pytest.mark.skipif(_HAS_GPU_VIDEO_DECODER is False, reason="Didn't compile with support for gpu decoder") class TestVideoGPUDecoder: @pytest.mark.skipif(av is None, reason="PyAV unavailable") @pytest.mark.parametrize( diff --git a/torchvision/io/__init__.py b/torchvision/io/__init__.py index a1eb6c7e649..bb3bf293670 100644 --- a/torchvision/io/__init__.py +++ b/torchvision/io/__init__.py @@ -5,9 +5,9 @@ from ..utils import _log_api_usage_once try: - from ._load_gpu_decoder import _HAS_VIDEO_DECODER + from ._load_gpu_decoder import _HAS_GPU_VIDEO_DECODER except ModuleNotFoundError: - _HAS_VIDEO_DECODER = False + _HAS_GPU_VIDEO_DECODER = False from ._video_opt import ( Timebase, VideoMetaData, @@ -119,7 +119,7 @@ def __init__(self, path: str, stream: str = "video", num_threads: int = 0, devic self.is_cuda = False device = torch.device(device) if device.type == "cuda": - if not _HAS_VIDEO_DECODER: + if not _HAS_GPU_VIDEO_DECODER: raise RuntimeError("Not compiled with GPU decoder support.") self.is_cuda = True if device.index is None: @@ -218,7 +218,7 @@ def set_current_stream(self, stream: str) -> bool: "_read_video_timestamps_from_memory", "_probe_video_from_memory", "_HAS_VIDEO_OPT", - "_HAS_VIDEO_DECODER", + "_HAS_GPU_VIDEO_DECODER", "_read_video_clip_from_memory", "_read_video_meta_data", "VideoMetaData", diff --git a/torchvision/io/_load_gpu_decoder.py b/torchvision/io/_load_gpu_decoder.py index bfcea9a67c3..f7869f0a9d1 100644 --- a/torchvision/io/_load_gpu_decoder.py +++ b/torchvision/io/_load_gpu_decoder.py @@ -3,6 +3,6 @@ try: _load_library("Decoder") - _HAS_VIDEO_DECODER = True + _HAS_GPU_VIDEO_DECODER = True except (ImportError, OSError): - _HAS_VIDEO_DECODER = False + _HAS_GPU_VIDEO_DECODER = False