fix version control

fengyuentau · fengyuentau · commit 690e91fa496f · 2024-06-04T15:25:34.000+08:00
diff --git a/benchmark/benchmark.py b/benchmark/benchmark.py
@@ -9,7 +9,8 @@
 from utils import METRICS, DATALOADERS
 
 # Check OpenCV version
-assert cv.__version__ >= "4.10.0", \
+opencv_python_version = lambda str_version: tuple(map(int, (str_version.split("."))))
+assert opencv_python_version(cv.__version__) >= opencv_python_version("4.10.0"), \
        "Please install latest opencv-python for benchmark: python3 -m pip install --upgrade opencv-python"
 
 # Valid combinations of backends and targets
diff --git a/models/face_detection_yunet/demo.py b/models/face_detection_yunet/demo.py
@@ -9,11 +9,12 @@
 import numpy as np
 import cv2 as cv
 
-from yunet import YuNet
-
 # Check OpenCV version
-assert cv.__version__ >= "4.10.0", \
-       "Please install latest opencv-python to try this demo: python3 -m pip install --upgrade opencv-python"
+opencv_python_version = lambda str_version: tuple(map(int, (str_version.split("."))))
+assert opencv_python_version(cv.__version__) >= opencv_python_version("4.10.0"), \
+       "Please install latest opencv-python for benchmark: python3 -m pip install --upgrade opencv-python"
+
+from yunet import YuNet
 
 # Valid combinations of backends and targets
 backend_target_pairs = [
diff --git a/models/face_recognition_sface/demo.py b/models/face_recognition_sface/demo.py
@@ -10,15 +10,16 @@
 import numpy as np
 import cv2 as cv
 
+# Check OpenCV version
+opencv_python_version = lambda str_version: tuple(map(int, (str_version.split("."))))
+assert opencv_python_version(cv.__version__) >= opencv_python_version("4.10.0"), \
+       "Please install latest opencv-python for benchmark: python3 -m pip install --upgrade opencv-python"
+
 from sface import SFace
 
 sys.path.append('../face_detection_yunet')
 from yunet import YuNet
 
-# Check OpenCV version
-assert cv.__version__ >= "4.10.0", \
-       "Please install latest opencv-python to try this demo: python3 -m pip install --upgrade opencv-python"
-
 # Valid combinations of backends and targets
 backend_target_pairs = [
     [cv.dnn.DNN_BACKEND_OPENCV, cv.dnn.DNN_TARGET_CPU],
diff --git a/models/facial_expression_recognition/demo.py b/models/facial_expression_recognition/demo.py
@@ -6,15 +6,16 @@
 import numpy as np
 import cv2 as cv
 
+# Check OpenCV version
+opencv_python_version = lambda str_version: tuple(map(int, (str_version.split("."))))
+assert opencv_python_version(cv.__version__) >= opencv_python_version("4.10.0"), \
+       "Please install latest opencv-python for benchmark: python3 -m pip install --upgrade opencv-python"
+
 from facial_fer_model import FacialExpressionRecog
 
 sys.path.append('../face_detection_yunet')
 from yunet import YuNet
 
-# Check OpenCV version
-assert cv.__version__ >= "4.10.0", \
-       "Please install latest opencv-python to try this demo: python3 -m pip install --upgrade opencv-python"
-
 # Valid combinations of backends and targets
 backend_target_pairs = [
     [cv.dnn.DNN_BACKEND_OPENCV, cv.dnn.DNN_TARGET_CPU],
diff --git a/models/handpose_estimation_mediapipe/demo.py b/models/handpose_estimation_mediapipe/demo.py
@@ -4,15 +4,16 @@
 import numpy as np
 import cv2 as cv
 
+# Check OpenCV version
+opencv_python_version = lambda str_version: tuple(map(int, (str_version.split("."))))
+assert opencv_python_version(cv.__version__) >= opencv_python_version("4.10.0"), \
+       "Please install latest opencv-python for benchmark: python3 -m pip install --upgrade opencv-python"
+
 from mp_handpose import MPHandPose
 
 sys.path.append('../palm_detection_mediapipe')
 from mp_palmdet import MPPalmDet
 
-# Check OpenCV version
-assert cv.__version__ >= "4.10.0", \
-       "Please install latest opencv-python to try this demo: python3 -m pip install --upgrade opencv-python"
-
 # Valid combinations of backends and targets
 backend_target_pairs = [
     [cv.dnn.DNN_BACKEND_OPENCV, cv.dnn.DNN_TARGET_CPU],
diff --git a/models/human_segmentation_pphumanseg/demo.py b/models/human_segmentation_pphumanseg/demo.py
@@ -9,11 +9,12 @@
 import numpy as np
 import cv2 as cv
 
-from pphumanseg import PPHumanSeg
-
 # Check OpenCV version
-assert cv.__version__ >= "4.10.0", \
-       "Please install latest opencv-python to try this demo: python3 -m pip install --upgrade opencv-python"
+opencv_python_version = lambda str_version: tuple(map(int, (str_version.split("."))))
+assert opencv_python_version(cv.__version__) >= opencv_python_version("4.10.0"), \
+       "Please install latest opencv-python for benchmark: python3 -m pip install --upgrade opencv-python"
+
+from pphumanseg import PPHumanSeg
 
 # Valid combinations of backends and targets
 backend_target_pairs = [
diff --git a/models/image_classification_mobilenet/demo.py b/models/image_classification_mobilenet/demo.py
@@ -3,11 +3,12 @@
 import numpy as np
 import cv2 as cv
 
-from mobilenet import MobileNet
-
 # Check OpenCV version
-assert cv.__version__ >= "4.10.0", \
-       "Please install latest opencv-python to try this demo: python3 -m pip install --upgrade opencv-python"
+opencv_python_version = lambda str_version: tuple(map(int, (str_version.split("."))))
+assert opencv_python_version(cv.__version__) >= opencv_python_version("4.10.0"), \
+       "Please install latest opencv-python for benchmark: python3 -m pip install --upgrade opencv-python"
+
+from mobilenet import MobileNet
 
 # Valid combinations of backends and targets
 backend_target_pairs = [
diff --git a/models/image_classification_ppresnet/demo.py b/models/image_classification_ppresnet/demo.py
@@ -9,11 +9,12 @@
 import numpy as np
 import cv2 as cv
 
-from ppresnet import PPResNet
-
 # Check OpenCV version
-assert cv.__version__ >= "4.10.0", \
-       "Please install latest opencv-python to try this demo: python3 -m pip install --upgrade opencv-python"
+opencv_python_version = lambda str_version: tuple(map(int, (str_version.split("."))))
+assert opencv_python_version(cv.__version__) >= opencv_python_version("4.10.0"), \
+       "Please install latest opencv-python for benchmark: python3 -m pip install --upgrade opencv-python"
+
+from ppresnet import PPResNet
 
 # Valid combinations of backends and targets
 backend_target_pairs = [
diff --git a/models/license_plate_detection_yunet/demo.py b/models/license_plate_detection_yunet/demo.py
@@ -3,11 +3,12 @@
 import numpy as np
 import cv2 as cv
 
-from lpd_yunet import LPD_YuNet
-
 # Check OpenCV version
-assert cv.__version__ >= "4.10.0", \
-       "Please install latest opencv-python to try this demo: python3 -m pip install --upgrade opencv-python"
+opencv_python_version = lambda str_version: tuple(map(int, (str_version.split("."))))
+assert opencv_python_version(cv.__version__) >= opencv_python_version("4.10.0"), \
+       "Please install latest opencv-python for benchmark: python3 -m pip install --upgrade opencv-python"
+
+from lpd_yunet import LPD_YuNet
 
 # Valid combinations of backends and targets
 backend_target_pairs = [
diff --git a/models/object_detection_nanodet/demo.py b/models/object_detection_nanodet/demo.py
@@ -2,11 +2,12 @@
 import cv2 as cv
 import argparse
 
-from nanodet import NanoDet
-
 # Check OpenCV version
-assert cv.__version__ >= "4.10.0", \
-       "Please install latest opencv-python to try this demo: python3 -m pip install --upgrade opencv-python"
+opencv_python_version = lambda str_version: tuple(map(int, (str_version.split("."))))
+assert opencv_python_version(cv.__version__) >= opencv_python_version("4.10.0"), \
+       "Please install latest opencv-python for benchmark: python3 -m pip install --upgrade opencv-python"
+
+from nanodet import NanoDet
 
 # Valid combinations of backends and targets
 backend_target_pairs = [
diff --git a/models/object_detection_yolox/demo.py b/models/object_detection_yolox/demo.py
@@ -2,11 +2,12 @@
 import cv2 as cv
 import argparse
 
-from yolox import YoloX
-
 # Check OpenCV version
-assert cv.__version__ >= "4.10.0", \
-       "Please install latest opencv-python to try this demo: python3 -m pip install --upgrade opencv-python"
+opencv_python_version = lambda str_version: tuple(map(int, (str_version.split("."))))
+assert opencv_python_version(cv.__version__) >= opencv_python_version("4.10.0"), \
+       "Please install latest opencv-python for benchmark: python3 -m pip install --upgrade opencv-python"
+
+from yolox import YoloX
 
 # Valid combinations of backends and targets
 backend_target_pairs = [
diff --git a/models/object_tracking_vittrack/demo.py b/models/object_tracking_vittrack/demo.py
@@ -6,11 +6,12 @@
 import numpy as np
 import cv2 as cv
 
-from vittrack import VitTrack
-
 # Check OpenCV version
-assert cv.__version__ >= "4.10.0", \
-       "Please install latest opencv-python to try this demo: python3 -m pip install --upgrade opencv-python"
+opencv_python_version = lambda str_version: tuple(map(int, (str_version.split("."))))
+assert opencv_python_version(cv.__version__) >= opencv_python_version("4.10.0"), \
+       "Please install latest opencv-python for benchmark: python3 -m pip install --upgrade opencv-python"
+
+from vittrack import VitTrack
 
 # Valid combinations of backends and targets
 backend_target_pairs = [
diff --git a/models/optical_flow_estimation_raft/demo.py b/models/optical_flow_estimation_raft/demo.py
@@ -3,11 +3,12 @@
 import cv2 as cv
 import numpy as np
 
-from raft import Raft
-
 # Check OpenCV version
-assert cv.__version__ >= "4.10.0", \
-       "Please install latest opencv-python to try this demo: python3 -m pip install --upgrade opencv-python"
+opencv_python_version = lambda str_version: tuple(map(int, (str_version.split("."))))
+assert opencv_python_version(cv.__version__) >= opencv_python_version("4.10.0"), \
+       "Please install latest opencv-python for benchmark: python3 -m pip install --upgrade opencv-python"
+
+from raft import Raft
 
 parser = argparse.ArgumentParser(description='RAFT (https://github.com/princeton-vl/RAFT)')
 parser.add_argument('--input1', '-i1', type=str,
diff --git a/models/palm_detection_mediapipe/demo.py b/models/palm_detection_mediapipe/demo.py
@@ -3,11 +3,12 @@
 import numpy as np
 import cv2 as cv
 
-from mp_palmdet import MPPalmDet
-
 # Check OpenCV version
-assert cv.__version__ >= "4.10.0", \
-       "Please install latest opencv-python to try this demo: python3 -m pip install --upgrade opencv-python"
+opencv_python_version = lambda str_version: tuple(map(int, (str_version.split("."))))
+assert opencv_python_version(cv.__version__) >= opencv_python_version("4.10.0"), \
+       "Please install latest opencv-python for benchmark: python3 -m pip install --upgrade opencv-python"
+
+from mp_palmdet import MPPalmDet
 
 # Valid combinations of backends and targets
 backend_target_pairs = [
diff --git a/models/person_detection_mediapipe/demo.py b/models/person_detection_mediapipe/demo.py
@@ -3,11 +3,12 @@
 import numpy as np
 import cv2 as cv
 
-from mp_persondet import MPPersonDet
-
 # Check OpenCV version
-assert cv.__version__ >= "4.10.0", \
-       "Please install latest opencv-python to try this demo: python3 -m pip install --upgrade opencv-python"
+opencv_python_version = lambda str_version: tuple(map(int, (str_version.split("."))))
+assert opencv_python_version(cv.__version__) >= opencv_python_version("4.10.0"), \
+       "Please install latest opencv-python for benchmark: python3 -m pip install --upgrade opencv-python"
+
+from mp_persondet import MPPersonDet
 
 # Valid combinations of backends and targets
 backend_target_pairs = [
diff --git a/models/person_reid_youtureid/demo.py b/models/person_reid_youtureid/demo.py
@@ -10,11 +10,12 @@
 import numpy as np
 import cv2 as cv
 
-from youtureid import YoutuReID
-
 # Check OpenCV version
-assert cv.__version__ >= "4.10.0", \
-       "Please install latest opencv-python to try this demo: python3 -m pip install --upgrade opencv-python"
+opencv_python_version = lambda str_version: tuple(map(int, (str_version.split("."))))
+assert opencv_python_version(cv.__version__) >= opencv_python_version("4.10.0"), \
+       "Please install latest opencv-python for benchmark: python3 -m pip install --upgrade opencv-python"
+
+from youtureid import YoutuReID
 
 # Valid combinations of backends and targets
 backend_target_pairs = [
diff --git a/models/pose_estimation_mediapipe/demo.py b/models/pose_estimation_mediapipe/demo.py
@@ -4,15 +4,16 @@
 import numpy as np
 import cv2 as cv
 
+# Check OpenCV version
+opencv_python_version = lambda str_version: tuple(map(int, (str_version.split("."))))
+assert opencv_python_version(cv.__version__) >= opencv_python_version("4.10.0"), \
+       "Please install latest opencv-python for benchmark: python3 -m pip install --upgrade opencv-python"
+
 from mp_pose import MPPose
 
 sys.path.append('../person_detection_mediapipe')
 from mp_persondet import MPPersonDet
 
-# Check OpenCV version
-assert cv.__version__ >= "4.10.0", \
-       "Please install latest opencv-python to try this demo: python3 -m pip install --upgrade opencv-python"
-
 # Valid combinations of backends and targets
 backend_target_pairs = [
     [cv.dnn.DNN_BACKEND_OPENCV, cv.dnn.DNN_TARGET_CPU],
diff --git a/models/qrcode_wechatqrcode/demo.py b/models/qrcode_wechatqrcode/demo.py
@@ -9,11 +9,12 @@
 import numpy as np
 import cv2 as cv
 
-from wechatqrcode import WeChatQRCode
-
 # Check OpenCV version
-assert cv.__version__ >= "4.10.0", \
-       "Please install latest opencv-python to try this demo: python3 -m pip install --upgrade opencv-python"
+opencv_python_version = lambda str_version: tuple(map(int, (str_version.split("."))))
+assert opencv_python_version(cv.__version__) >= opencv_python_version("4.10.0"), \
+       "Please install latest opencv-python for benchmark: python3 -m pip install --upgrade opencv-python"
+
+from wechatqrcode import WeChatQRCode
 
 # Valid combinations of backends and targets
 backend_target_pairs = [
diff --git a/models/text_detection_ppocr/demo.py b/models/text_detection_ppocr/demo.py
@@ -9,11 +9,12 @@
 import numpy as np
 import cv2 as cv
 
-from ppocr_det import PPOCRDet
-
 # Check OpenCV version
-assert cv.__version__ >= "4.10.0", \
-       "Please install latest opencv-python to try this demo: python3 -m pip install --upgrade opencv-python"
+opencv_python_version = lambda str_version: tuple(map(int, (str_version.split("."))))
+assert opencv_python_version(cv.__version__) >= opencv_python_version("4.10.0"), \
+       "Please install latest opencv-python for benchmark: python3 -m pip install --upgrade opencv-python"
+
+from ppocr_det import PPOCRDet
 
 # Valid combinations of backends and targets
 backend_target_pairs = [
diff --git a/models/text_recognition_crnn/demo.py b/models/text_recognition_crnn/demo.py
@@ -10,15 +10,16 @@
 import numpy as np
 import cv2 as cv
 
+# Check OpenCV version
+opencv_python_version = lambda str_version: tuple(map(int, (str_version.split("."))))
+assert opencv_python_version(cv.__version__) >= opencv_python_version("4.10.0"), \
+       "Please install latest opencv-python for benchmark: python3 -m pip install --upgrade opencv-python"
+
 from crnn import CRNN
 
 sys.path.append('../text_detection_ppocr')
 from ppocr_det import PPOCRDet
 
-# Check OpenCV version
-assert cv.__version__ >= "4.10.0", \
-       "Please install latest opencv-python to try this demo: python3 -m pip install --upgrade opencv-python"
-
 # Valid combinations of backends and targets
 backend_target_pairs = [
     [cv.dnn.DNN_BACKEND_OPENCV, cv.dnn.DNN_TARGET_CPU],
