From bf9a73f1e89420ab8e4c4cfd003e4dcab1bf17a2 Mon Sep 17 00:00:00 2001 From: clnowacki Date: Tue, 2 Apr 2024 09:53:37 -0400 Subject: [PATCH 1/3] changed Opencv to version 4.9.0 --- openmpf_build/Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/openmpf_build/Dockerfile b/openmpf_build/Dockerfile index e0e9f07e..99a55153 100644 --- a/openmpf_build/Dockerfile +++ b/openmpf_build/Dockerfile @@ -73,18 +73,18 @@ RUN --mount=type=tmpfs,target=/var/cache/apt \ RUN --mount=type=tmpfs,target=/tmp \ mkdir /tmp/opencv-contrib; \ - wget -O- 'https://github.com/opencv/opencv_contrib/archive/4.5.5.tar.gz' \ + wget -O- 'https://github.com/opencv/opencv_contrib/archive/4.9.0.tar.gz' \ | tar --extract --gzip --directory /tmp/opencv-contrib; \ mkdir /tmp/opencv; \ cd /tmp/opencv; \ - wget -O- 'https://github.com/opencv/opencv/archive/4.5.5.tar.gz' \ + wget -O- 'https://github.com/opencv/opencv/archive/4.9.0.tar.gz' \ | tar --extract --gzip; \ - cd opencv-4.5.5; \ + cd opencv-4.9.0; \ sed -i '315s/.*/ return min((int)sysconf( _SC_NPROCESSORS_ONLN ), 4);/' modules/videoio/src/cap_ffmpeg_impl.hpp; \ mkdir build; \ cd build; \ export OpenBLAS_HOME=/usr/lib/x86_64-linux-gnu/openblas-pthread; \ - cmake -DCMAKE_INSTALL_PREFIX:PATH='/opt/opencv-4.5.5' \ + cmake -DCMAKE_INSTALL_PREFIX:PATH='/opt/opencv-4.9.0' \ -DWITH_IPP=false \ -DBUILD_EXAMPLES=false \ -DBUILD_TESTS=false \ @@ -96,10 +96,10 @@ RUN --mount=type=tmpfs,target=/tmp \ -DWITH_CUDNN=true \ -DOPENCV_DNN_CUDA=true \ -DBUILD_CUDA_STUBS=true \ - -DOPENCV_EXTRA_MODULES_PATH=/tmp/opencv-contrib/opencv_contrib-4.5.5/modules \ + -DOPENCV_EXTRA_MODULES_PATH=/tmp/opencv-contrib/opencv_contrib-4.9.0/modules \ ..; \ make --jobs "$(nproc)" install; \ - ln --symbolic '/opt/opencv-4.5.5/include/opencv4/opencv2' /usr/local/include/opencv2; + ln --symbolic '/opt/opencv-4.9.0/include/opencv4/opencv2' /usr/local/include/opencv2; RUN --mount=type=tmpfs,target=/tmp \ From caa5dfe28d34e11b784bc8fa398ebe342523557b Mon Sep 17 00:00:00 2001 From: clnowacki Date: Wed, 3 Apr 2024 09:01:50 -0400 Subject: [PATCH 2/3] updated cpp_component_build/Dockerfile to use OpenCV 4.9.0 --- components/cpp_component_build/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/cpp_component_build/Dockerfile b/components/cpp_component_build/Dockerfile index f8413c00..3feccfc6 100644 --- a/components/cpp_component_build/Dockerfile +++ b/components/cpp_component_build/Dockerfile @@ -60,7 +60,7 @@ RUN --mount=type=tmpfs,target=/var/cache/apt \ /usr/lib/x86_64-linux-gnu/libcudnn*.a; \ ln --symbolic /usr/bin/cmake /usr/bin/cmake3; -COPY --from=openmpf_build /opt/opencv-4.5.5 /opt/opencv-4.5.5 +COPY --from=openmpf_build /opt/opencv-4.9.0 /opt/opencv-4.9.0 COPY --from=openmpf_build /usr/local/bin/ffmpeg /usr/local/bin/ffprobe /usr/local/bin/ @@ -71,7 +71,7 @@ RUN mkdir /home/mpf; echo 'find_package(mpfCMakeHelpers REQUIRED)' > /home/mpf/C COPY --from=openmpf_build /build-artifacts/mpf-sdk-install/include /home/mpf/mpf-sdk-install/include COPY --from=openmpf_build /build-artifacts/mpf-sdk-install/lib /home/mpf/mpf-sdk-install/lib -RUN echo '/opt/opencv-4.5.5/lib' > /etc/ld.so.conf.d/opencv.conf; \ +RUN echo '/opt/opencv-4.9.0/lib' > /etc/ld.so.conf.d/opencv.conf; \ echo '/home/mpf/mpf-sdk-install/lib' > /etc/ld.so.conf.d/mpf.conf; \ ldconfig From 64bdd0a121136a25df430a8d388e3b526622be01 Mon Sep 17 00:00:00 2001 From: clnowacki Date: Tue, 9 Apr 2024 11:32:01 -0400 Subject: [PATCH 3/3] removed patch that capped the number of threads used with ffmpeg --- openmpf_build/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/openmpf_build/Dockerfile b/openmpf_build/Dockerfile index 99a55153..1b4a14fb 100644 --- a/openmpf_build/Dockerfile +++ b/openmpf_build/Dockerfile @@ -80,7 +80,6 @@ RUN --mount=type=tmpfs,target=/tmp \ wget -O- 'https://github.com/opencv/opencv/archive/4.9.0.tar.gz' \ | tar --extract --gzip; \ cd opencv-4.9.0; \ - sed -i '315s/.*/ return min((int)sysconf( _SC_NPROCESSORS_ONLN ), 4);/' modules/videoio/src/cap_ffmpeg_impl.hpp; \ mkdir build; \ cd build; \ export OpenBLAS_HOME=/usr/lib/x86_64-linux-gnu/openblas-pthread; \