[FBcode->GH] Move loading Decoder.so to a separate file to avoid buil…

…ding it internally (#5183)
pytorch · Jan 10, 2022 · d675c0c · d675c0c
1 parent ffd0d23
commit d675c0c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/torchvision/io/__init__.py b/torchvision/io/__init__.py
@@ -3,10 +3,14 @@
 import torch
 
 from ..utils import _log_api_usage_once
+
+try:
+    from ._load_gpu_decoder import _HAS_VIDEO_DECODER
+except ModuleNotFoundError:
+    _HAS_VIDEO_DECODER = False
 from ._video_opt import (
     Timebase,
     VideoMetaData,
-    _HAS_VIDEO_DECODER,
     _HAS_VIDEO_OPT,
     _probe_video_from_file,
     _probe_video_from_memory,

diff --git a/torchvision/io/_load_gpu_decoder.py b/torchvision/io/_load_gpu_decoder.py
@@ -0,0 +1,8 @@
+from ..extension import _load_library
+
+
+try:
+    _load_library("Decoder")
+    _HAS_VIDEO_DECODER = True
+except (ImportError, OSError):
+    _HAS_VIDEO_DECODER = False
diff --git a/torchvision/io/_video_opt.py b/torchvision/io/_video_opt.py
@@ -14,12 +14,6 @@
 except (ImportError, OSError):
     _HAS_VIDEO_OPT = False
 
-try:
-    _load_library("Decoder")
-    _HAS_VIDEO_DECODER = True
-except (ImportError, OSError):
-    _HAS_VIDEO_DECODER = False
-
 default_timebase = Fraction(0, 1)