From df2b4edfcc047106a56751e529700c947acbae1b Mon Sep 17 00:00:00 2001 From: Emmanuel Benazera Date: Sun, 3 Nov 2024 12:46:42 +0000 Subject: [PATCH] chore: openCV 4.10 --- build.sh | 8 ++++---- ci/devel-trt.Dockerfile | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.sh b/build.sh index a7584669f..8bc42e31e 100755 --- a/build.sh +++ b/build.sh @@ -131,11 +131,11 @@ show_interactive_platform_selector() { if [[ ${BUILD_OPENCV} == "ON" ]]; then echo "Opencv will be built from source" # Build OpenCV 4 with CUDA -DEEPDETECT_OPENCV4_BUILD_PATH="$(git rev-parse --show-toplevel)/build/opencv/opencv-4.7.0/build" +DEEPDETECT_OPENCV4_BUILD_PATH="$(git rev-parse --show-toplevel)/build/opencv/opencv-4.10.0/build" if [ ! -d opencv ]; then echo "Downloading opencv" -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 -cd "opencv-4.7.0" && mkdir build && cd build +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 +cd "opencv-4.10.0" && mkdir build && cd build else cd $DEEPDETECT_OPENCV4_BUILD_PATH fi @@ -162,7 +162,7 @@ cmake -D CMAKE_BUILD_TYPE=DEBUG \ -D OPENCV_ENABLE_NONFREE=ON \ -D BUILD_opencv_python2=OFF \ -D BUILD_opencv_python3=OFF \ --D OPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-4.7.0/modules \ +-D OPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-4.10.0/modules \ -D INSTALL_PYTHON_EXAMPLES=OFF \ -D INSTALL_C_EXAMPLES=OFF \ -D BUILD_EXAMPLES=OFF \ diff --git a/ci/devel-trt.Dockerfile b/ci/devel-trt.Dockerfile index 0c4abf2ae..a88b6e75d 100644 --- a/ci/devel-trt.Dockerfile +++ b/ci/devel-trt.Dockerfile @@ -90,8 +90,8 @@ RUN wget http://www.deepdetect.com/stuff/Video_Codec_SDK_11.1.5.zip && unzip Vid 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/ # Build OpenCV 4 with CUDA -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 -RUN cd /tmp/opencv/opencv-4.7.0 && mkdir build && cd build && cmake -D CMAKE_BUILD_TYPE=RELEASE \ +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 +RUN cd /tmp/opencv/opencv-4.10.0 && mkdir build && cd build && cmake -D CMAKE_BUILD_TYPE=RELEASE \ -D CMAKE_INSTALL_PREFIX=/usr/local/ \ -D CMAKE_LIBRARY_PATH=/usr/local/cuda/lib64/stubs \ -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 -D OPENCV_ENABLE_NONFREE=ON \ -D BUILD_opencv_python2=OFF \ -D BUILD_opencv_python3=OFF \ --D OPENCV_EXTRA_MODULES_PATH=/tmp/opencv/opencv_contrib-4.7.0/modules \ +-D OPENCV_EXTRA_MODULES_PATH=/tmp/opencv/opencv_contrib-4.10.0/modules \ -D INSTALL_PYTHON_EXAMPLES=OFF \ -D INSTALL_C_EXAMPLES=OFF \ -D BUILD_EXAMPLES=OFF .. -WORKDIR /tmp/opencv/opencv-4.7.0/build +WORKDIR /tmp/opencv/opencv-4.10.0/build RUN make -j20 RUN make install