Skip to content

Commit e073315

Browse files
committed
chore: openCV 4.10
1 parent 69fcb04 commit e073315

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

build.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,11 @@ show_interactive_platform_selector() {
131131
if [[ ${BUILD_OPENCV} == "ON" ]]; then
132132
echo "Opencv will be built from source"
133133
# Build OpenCV 4 with CUDA
134-
DEEPDETECT_OPENCV4_BUILD_PATH="$(git rev-parse --show-toplevel)/build/opencv/opencv-4.7.0/build"
134+
DEEPDETECT_OPENCV4_BUILD_PATH="$(git rev-parse --show-toplevel)/build/opencv/opencv-4.10.0/build"
135135
if [ ! -d opencv ]; then
136136
echo "Downloading opencv"
137-
mkdir opencv && cd opencv && wget -O opencv.zip https://github.com/opencv/opencv/archive/refs/tags/4.7.0.zip && wget -O opencv_contrib.zip https://github.com/opencv/opencv_contrib/archive/refs/tags/4.7.0.zip && unzip opencv.zip && unzip opencv_contrib.zip
138-
cd "opencv-4.7.0" && mkdir build && cd build
137+
mkdir opencv && cd opencv && wget -O opencv.zip https://github.com/opencv/opencv/archive/refs/tags/4.10.0.zip && wget -O opencv_contrib.zip https://github.com/opencv/opencv_contrib/archive/refs/tags/4.10.0.zip && unzip opencv.zip && unzip opencv_contrib.zip
138+
cd "opencv-4.10.0" && mkdir build && cd build
139139
else
140140
cd $DEEPDETECT_OPENCV4_BUILD_PATH
141141
fi
@@ -162,7 +162,7 @@ cmake -D CMAKE_BUILD_TYPE=DEBUG \
162162
-D OPENCV_ENABLE_NONFREE=ON \
163163
-D BUILD_opencv_python2=OFF \
164164
-D BUILD_opencv_python3=OFF \
165-
-D OPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-4.7.0/modules \
165+
-D OPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-4.10.0/modules \
166166
-D INSTALL_PYTHON_EXAMPLES=OFF \
167167
-D INSTALL_C_EXAMPLES=OFF \
168168
-D BUILD_EXAMPLES=OFF \

ci/devel-trt.Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ RUN wget http://www.deepdetect.com/stuff/Video_Codec_SDK_11.1.5.zip && unzip Vid
9090
RUN cd Video_Codec_SDK_11.1.5 && cp Interface/* /usr/local/cuda/targets/x86_64-linux/include/ && cp Lib/linux/stubs/x86_64/* /usr/local/cuda/targets/x86_64-linux/lib/stubs/
9191

9292
# Build OpenCV 4 with CUDA
93-
RUN mkdir opencv && cd opencv && wget -O opencv.zip https://github.com/opencv/opencv/archive/refs/tags/4.7.0.zip && wget -O opencv_contrib.zip https://github.com/opencv/opencv_contrib/archive/refs/tags/4.7.0.zip && unzip opencv.zip && unzip opencv_contrib.zip
94-
RUN cd /tmp/opencv/opencv-4.7.0 && mkdir build && cd build && cmake -D CMAKE_BUILD_TYPE=RELEASE \
93+
RUN mkdir opencv && cd opencv && wget -O opencv.zip https://github.com/opencv/opencv/archive/refs/tags/4.10.0.zip && wget -O opencv_contrib.zip https://github.com/opencv/opencv_contrib/archive/refs/tags/4.10.0.zip && unzip opencv.zip && unzip opencv_contrib.zip
94+
RUN cd /tmp/opencv/opencv-4.10.0 && mkdir build && cd build && cmake -D CMAKE_BUILD_TYPE=RELEASE \
9595
-D CMAKE_INSTALL_PREFIX=/usr/local/ \
9696
-D CMAKE_LIBRARY_PATH=/usr/local/cuda/lib64/stubs \
9797
-D CMAKE_CXX_FLAGS="-Wl,--allow-shlib-undefined" \
@@ -114,12 +114,12 @@ RUN cd /tmp/opencv/opencv-4.7.0 && mkdir build && cd build && cmake -D CMAKE_BUI
114114
-D OPENCV_ENABLE_NONFREE=ON \
115115
-D BUILD_opencv_python2=OFF \
116116
-D BUILD_opencv_python3=OFF \
117-
-D OPENCV_EXTRA_MODULES_PATH=/tmp/opencv/opencv_contrib-4.7.0/modules \
117+
-D OPENCV_EXTRA_MODULES_PATH=/tmp/opencv/opencv_contrib-4.10.0/modules \
118118
-D INSTALL_PYTHON_EXAMPLES=OFF \
119119
-D INSTALL_C_EXAMPLES=OFF \
120120
-D BUILD_EXAMPLES=OFF ..
121121

122-
WORKDIR /tmp/opencv/opencv-4.7.0/build
122+
WORKDIR /tmp/opencv/opencv-4.10.0/build
123123
RUN make -j20
124124
RUN make install
125125

0 commit comments

Comments
 (0)