remove support for opencv 2 (#201)

mmcv/__init__.py

@@ -3,7 +3,6 @@
 from .arraymisc import *
 from .fileio import *
 from .image import *
-from .opencv_info import *
 from .utils import *
 from .version import __version__
 from .video import *

mmcv/image/io.py

@@ -3,16 +3,10 @@ import os.path as osp
 
 import cv2
 import numpy as np
+from cv2 import IMREAD_COLOR, IMREAD_GRAYSCALE, IMREAD_UNCHANGED
 
-from mmcv.opencv_info import USE_OPENCV2
 from mmcv.utils import check_file_exist, is_str, mkdir_or_exist
 
-if not USE_OPENCV2:
-    from cv2 import IMREAD_COLOR, IMREAD_GRAYSCALE, IMREAD_UNCHANGED
-else:
-    from cv2 import CV_LOAD_IMAGE_COLOR as IMREAD_COLOR
-    from cv2 import CV_LOAD_IMAGE_GRAYSCALE as IMREAD_GRAYSCALE
-    from cv2 import CV_LOAD_IMAGE_UNCHANGED as IMREAD_UNCHANGED
 try:
     from turbojpeg import TJCS_RGB, TJPF_BGR, TJPF_GRAY, TurboJPEG
 except ImportError:

mmcv/opencv_info.py

-# Copyright (c) Open-MMLab. All rights reserved.
-import cv2
-
-
-def use_opencv2():
-    try:
-        major_version = cv2.__version__.split('.')[0]
-    except TypeError:  # solves doc generation issue
-        major_version = 4
-    return major_version == '2'
-
-
-USE_OPENCV2 = use_opencv2()

mmcv/video/io.py

@@ -3,24 +3,13 @@ import os.path as osp
 from collections import OrderedDict
 
 import cv2
+from cv2 import (CAP_PROP_FOURCC, CAP_PROP_FPS, CAP_PROP_FRAME_COUNT,
+                 CAP_PROP_FRAME_HEIGHT, CAP_PROP_FRAME_WIDTH,
+                 CAP_PROP_POS_FRAMES, VideoWriter_fourcc)
 
-from mmcv.opencv_info import USE_OPENCV2
 from mmcv.utils import (check_file_exist, mkdir_or_exist, scandir,
                         track_progress)
 
-if not USE_OPENCV2:
-    from cv2 import (CAP_PROP_FRAME_WIDTH, CAP_PROP_FRAME_HEIGHT, CAP_PROP_FPS,
-                     CAP_PROP_FRAME_COUNT, CAP_PROP_FOURCC,
-                     CAP_PROP_POS_FRAMES, VideoWriter_fourcc)
-else:
-    from cv2.cv import CV_CAP_PROP_FRAME_WIDTH as CAP_PROP_FRAME_WIDTH
-    from cv2.cv import CV_CAP_PROP_FRAME_HEIGHT as CAP_PROP_FRAME_HEIGHT
-    from cv2.cv import CV_CAP_PROP_FPS as CAP_PROP_FPS
-    from cv2.cv import CV_CAP_PROP_FRAME_COUNT as CAP_PROP_FRAME_COUNT
-    from cv2.cv import CV_CAP_PROP_FOURCC as CAP_PROP_FOURCC
-    from cv2.cv import CV_CAP_PROP_POS_FRAMES as CAP_PROP_POS_FRAMES
-    from cv2.cv import CV_FOURCC as VideoWriter_fourcc
-
 
 class Cache(object):