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
- CMakeLists.txt +1 -1
- demo.py +5 -4
CMakeLists.txt
CHANGED
|
@@ -3,7 +3,7 @@ set(project_name "opencv_zoo_object_detection_nanodet")
|
|
| 3 |
|
| 4 |
PROJECT (${project_name})
|
| 5 |
|
| 6 |
-
set(OPENCV_VERSION "4.
|
| 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
|
@@ -2,11 +2,12 @@ import numpy as np
|
|
| 2 |
import cv2 as cv
|
| 3 |
import argparse
|
| 4 |
|
| 5 |
-
from nanodet import NanoDet
|
| 6 |
-
|
| 7 |
# Check OpenCV version
|
| 8 |
-
|
| 9 |
-
|
|
|
|
|
|
|
|
|
|
| 10 |
|
| 11 |
# Valid combinations of backends and targets
|
| 12 |
backend_target_pairs = [
|
|
|
|
| 2 |
import cv2 as cv
|
| 3 |
import argparse
|
| 4 |
|
|
|
|
|
|
|
| 5 |
# Check OpenCV version
|
| 6 |
+
opencv_python_version = lambda str_version: tuple(map(int, (str_version.split("."))))
|
| 7 |
+
assert opencv_python_version(cv.__version__) >= opencv_python_version("4.10.0"), \
|
| 8 |
+
"Please install latest opencv-python for benchmark: python3 -m pip install --upgrade opencv-python"
|
| 9 |
+
|
| 10 |
+
from nanodet import NanoDet
|
| 11 |
|
| 12 |
# Valid combinations of backends and targets
|
| 13 |
backend_target_pairs = [
|