ONNX
ytfeng commited on
Commit
7da703f
·
1 Parent(s): 7ce0102

bump opencv version to 4.10.0 (#260)

Browse files

* bump opencv version to 4.10.0

* doc: version change

* fix version control

* fix version control for efficient sam

Files changed (2) hide show
  1. CMakeLists.txt +1 -1
  2. demo.py +5 -4
CMakeLists.txt CHANGED
@@ -3,7 +3,7 @@ set(project_name "opencv_zoo_text_recognition_crnn")
3
 
4
  PROJECT (${project_name})
5
 
6
- set(OPENCV_VERSION "4.9.0")
7
  set(OPENCV_INSTALLATION_PATH "" CACHE PATH "Where to look for OpenCV installation")
8
  find_package(OpenCV ${OPENCV_VERSION} REQUIRED HINTS ${OPENCV_INSTALLATION_PATH})
9
  # Find OpenCV, you may need to set OpenCV_DIR variable
 
3
 
4
  PROJECT (${project_name})
5
 
6
+ set(OPENCV_VERSION "4.10.0")
7
  set(OPENCV_INSTALLATION_PATH "" CACHE PATH "Where to look for OpenCV installation")
8
  find_package(OpenCV ${OPENCV_VERSION} REQUIRED HINTS ${OPENCV_INSTALLATION_PATH})
9
  # Find OpenCV, you may need to set OpenCV_DIR variable
demo.py CHANGED
@@ -10,15 +10,16 @@ import argparse
10
  import numpy as np
11
  import cv2 as cv
12
 
 
 
 
 
 
13
  from crnn import CRNN
14
 
15
  sys.path.append('../text_detection_ppocr')
16
  from ppocr_det import PPOCRDet
17
 
18
- # Check OpenCV version
19
- assert cv.__version__ >= "4.9.0", \
20
- "Please install latest opencv-python to try this demo: python3 -m pip install --upgrade opencv-python"
21
-
22
  # Valid combinations of backends and targets
23
  backend_target_pairs = [
24
  [cv.dnn.DNN_BACKEND_OPENCV, cv.dnn.DNN_TARGET_CPU],
 
10
  import numpy as np
11
  import cv2 as cv
12
 
13
+ # Check OpenCV version
14
+ opencv_python_version = lambda str_version: tuple(map(int, (str_version.split("."))))
15
+ assert opencv_python_version(cv.__version__) >= opencv_python_version("4.10.0"), \
16
+ "Please install latest opencv-python for benchmark: python3 -m pip install --upgrade opencv-python"
17
+
18
  from crnn import CRNN
19
 
20
  sys.path.append('../text_detection_ppocr')
21
  from ppocr_det import PPOCRDet
22
 
 
 
 
 
23
  # Valid combinations of backends and targets
24
  backend_target_pairs = [
25
  [cv.dnn.DNN_BACKEND_OPENCV, cv.dnn.DNN_TARGET_CPU],