OpenCV4 upgrade with CUDA (#174)

Author: brosenberg42

cpp/DarknetDetection/CMakeLists.txt

@@ -31,7 +31,7 @@ set(CMAKE_CXX_STANDARD 11)
 
 include(../ComponentSetup.cmake)
 
-find_package(OpenCV 3.4.7 EXACT REQUIRED PATHS /opt/opencv-3.4.7 COMPONENTS opencv_core opencv_highgui)
+find_package(OpenCV 4.5.0 EXACT REQUIRED PATHS /opt/opencv-4.5.0 COMPONENTS opencv_core opencv_highgui)
 
 
 find_package(mpfComponentInterface REQUIRED)
@@ -42,7 +42,7 @@ find_package(Qt4 REQUIRED)
 get_plugin_build_location(DarknetDetection pluginLocation)
 
 if (DEFINED ENV{MPF_DISABLE_CUDA_BUILD})
-    set(DARKNET_BUILD_CUDA OFF)
+set(DARKNET_BUILD_CUDA OFF)
     message(
     "The CUDA version of Darknet will not be built because the MPF_DISABLE_CUDA_BUILD environment variable was set.")
 else()
@@ -86,4 +86,4 @@ endif()
 add_executable(sample_darknet_detector sample_darknet_detector.cpp)
 target_link_libraries(sample_darknet_detector mpfDarknetDetection)
 
-add_subdirectory(test)
+add_subdirectory(test)

cpp/DarknetDetection/Dockerfile

@@ -36,13 +36,9 @@ RUN mkdir /weights && curl --location https://pjreddie.com/media/files/yolov3.we
 # Build Component
 FROM ${BUILD_REGISTRY}openmpf_cpp_component_build:${BUILD_TAG} as build_component
 
-RUN yum-config-manager --add-repo http://developer.download.nvidia.com/compute/cuda/repos/rhel7/x86_64 \
-    && VERSION=9-0-9.0.176-1 \
-    && yum install -y --nogpgcheck cuda-minimal-build-$VERSION cuda-cublas-dev-$VERSION cuda-curand-dev-$VERSION \
+RUN yum install --nogpgcheck -y cuda-curand-dev-10-2 \
     && yum clean all \
-    && rm -rf /var/cache/yum/* \
-    && ln -s cuda-9.0 /usr/local/cuda \
-    && echo '/usr/local/cuda/lib64' >> /etc/ld.so.conf.d/cuda.conf
+    && rm -rf /var/cache/yum/*;
 
 COPY . .
 
@@ -53,18 +49,7 @@ RUN if [ "${RUN_TESTS,,}" == true ]; then cd $BUILD_DIR/test && ./DarknetDetecti
 
 
 ####################################################
-FROM ${BUILD_REGISTRY}openmpf_cpp_executor:${BUILD_TAG}
-
-RUN yum-config-manager --add-repo http://developer.download.nvidia.com/compute/cuda/repos/rhel7/x86_64 \
-    && yum install -y --nogpgcheck cuda-cudart-9-0-9.0.176-1 \
-    && yum clean all \
-    && rm -rf /var/cache/yum/* \
-    && ln -s cuda-9.0 /usr/local/cuda \
-    && echo '/usr/local/cuda/lib64' >> /etc/ld.so.conf.d/cuda.conf
-
-# Environment variables required by nvidia runtime.
-ENV NVIDIA_VISIBLE_DEVICES all
-ENV NVIDIA_DRIVER_CAPABILITIES compute,utility
+FROM ${BUILD_REGISTRY}openmpf_cpp_executor:${BUILD_TAG} as darknet_component
 
 COPY --from=download_weights /weights $PLUGINS_DIR/DarknetDetection/models
 
@@ -83,3 +68,21 @@ LABEL org.label-schema.license="Apache 2.0" \
       org.label-schema.vcs-url="https://github.com/openmpf/openmpf-components" \
       org.label-schema.vendor="MITRE"
 
+
+####################################################
+FROM darknet_component as sample_executable
+
+COPY --from=build_component $BUILD_DIR/sample_darknet_detector /opt/mpf/
+
+COPY --from=build_component $BUILD_DIR/test/data /opt/mpf/test-data
+
+RUN ln -s /opt/mpf/plugins /opt/mpf/plugin
+
+ENV LD_LIBRARY_PATH $PLUGINS_DIR/DarknetDetection/lib
+
+ENTRYPOINT ["/opt/mpf/sample_darknet_detector"]
+
+
+####################################################
+# Set final image when no --target specified.
+FROM darknet_component

cpp/DarknetDetection/darknet_lib/CMakeLists.txt

@@ -78,8 +78,6 @@ set(DARKNET_LIB_SRC_FILES
     src/yolo_layer.c
     src/iseg_layer.c)
 
-find_package(OpenCV 3.4.7 EXACT REQUIRED PATHS /opt/opencv-3.4.7 COMPONENTS opencv_core opencv_highgui)
-
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 # Darknet fails to compile when all optimizations are disabled, which is the default for debug builds.
@@ -91,9 +89,8 @@ else()
 endif()
 
 add_library(darknet_lib ${DARKNET_LIB_SRC_FILES})
-target_compile_definitions(darknet_lib PUBLIC -DOPENCV)
 target_include_directories(darknet_lib PUBLIC include)
-target_link_libraries(darknet_lib m pthread ${OpenCV_LIBS})
+target_link_libraries(darknet_lib m pthread)
 
 
 if (DARKNET_BUILD_CUDA)
@@ -125,9 +122,9 @@ if (DARKNET_BUILD_CUDA)
 
     CUDA_ADD_LIBRARY(darknet_lib_cuda ${DARKNET_LIB_SRC_FILES} ${DARKNET_CUDA_SRC_FILES})
     CUDA_ADD_CUBLAS_TO_TARGET(darknet_lib_cuda)
-    target_compile_definitions(darknet_lib_cuda PUBLIC -DOPENCV -DGPU)
+    target_compile_definitions(darknet_lib_cuda PUBLIC -DGPU)
 
     target_include_directories(darknet_lib_cuda PUBLIC include ${CUDA_INCLUDE_DIRS})
-    target_link_libraries(darknet_lib_cuda m pthread ${OpenCV_LIBS} ${CUDA_curand_LIBRARY})
+    target_link_libraries(darknet_lib_cuda m pthread ${CUDA_curand_LIBRARY})
 endif()
 

cpp/DarknetDetection/darknet_wrapper/CMakeLists.txt

@@ -30,7 +30,7 @@ project(darknet-wrapper)
 set(CMAKE_CXX_STANDARD 11)
 
 
-find_package(OpenCV 3.4.7 EXACT REQUIRED PATHS /opt/opencv-3.4.7 COMPONENTS opencv_core opencv_highgui)
+find_package(OpenCV 4.5.0 EXACT REQUIRED PATHS /opt/opencv-4.5.0 COMPONENTS opencv_core opencv_highgui)
 
 find_package(mpfComponentInterface REQUIRED)
 find_package(mpfDetectionComponentApi REQUIRED)

cpp/DarknetDetection/sample_darknet_detector.cpp

@@ -28,6 +28,8 @@
 #include <QCoreApplication>
 #include <iomanip>
 #include <chrono>
+#include <opencv2/core/cuda.hpp>
+
 
 #include "DarknetDetection.h"
 
@@ -37,9 +39,26 @@ using namespace MPF::COMPONENT;
 void print_tracks(const std::vector<MPFVideoTrack> &tracks);
 
 int main(int argc, char* argv[]) {
+    if (argc == 2) {
+        std::string arg1 = argv[1];
+        if (arg1 == "gpu-info") {
+            int cuda_device_count = cv::cuda::getCudaEnabledDeviceCount();
+            std::cout << "Cuda device count: " << cuda_device_count << std::endl;
+            if (cuda_device_count > 0) {
+                for (int i = 0; i < cuda_device_count; i++) {
+                    std::cout << "==== Device #" << i << " ====" << std::endl;
+                    cv::cuda::printCudaDeviceInfo(i);
+                    std::cout << "=================================" << std::endl;
+                }
+            }
+            return EXIT_SUCCESS;
+        }
+    }
+
     if (argc < 3) {
         std::cout << "Usage: " << argv[0] << " <uri> <model_name> [gpu_index]" << std::endl;
         std::cout << "Usage: " << argv[0] << " <uri> <model_name> <start_frame> <end_frame> [gpu_index] [queue_capacity]" << std::endl;
+        std::cout << "Usage: " << argv[0] << " gpu-info" << std::endl;
         return 1;
     }
 

cpp/DarknetDetection/test/test_darknet_detection.cpp

@@ -26,8 +26,8 @@
 
 
 #include <gtest/gtest.h>
-#include <opencv2/imgcodecs.hpp>
-#include <opencv/cv.hpp>
+
+#include <opencv2/core.hpp>
 
 #include <MPFDetectionComponent.h>
 #include <MPFVideoCapture.h>

cpp/DlibFaceDetection/CMakeLists.txt

@@ -31,13 +31,14 @@ project(dlib-face-detection)
 set(CMAKE_CXX_STANDARD 11)
 
 set(USE_AVX_INSTRUCTIONS ON)
-set(DLIB_DIR /apps/source/dlib-sources/dlib-18.18/dlib)
+set(DLIB_USE_CUDA OFF)
+set(DLIB_DIR /apps/source/dlib-sources/dlib-19.20/dlib)
 include(${DLIB_DIR}/cmake)
 set_property(TARGET dlib PROPERTY POSITION_INDEPENDENT_CODE ON)
 
 include(../ComponentSetup.cmake)
 
-find_package(OpenCV 3.4.7 EXACT REQUIRED PATHS /opt/opencv-3.4.7 COMPONENTS opencv_highgui)
+find_package(OpenCV 4.5.0 EXACT REQUIRED PATHS /opt/opencv-4.5.0 COMPONENTS opencv_highgui)
 find_package(mpfComponentInterface REQUIRED)
 find_package(mpfDetectionComponentApi REQUIRED)
 find_package(mpfComponentUtils REQUIRED)
@@ -56,4 +57,4 @@ configure_mpf_component(DlibFaceDetection TARGETS mpfDlibFaceDetection)
 add_subdirectory(test)
 
 add_executable(sample_dlib_face_detector sample_dlib_face_detector.cpp)
-target_link_libraries(sample_dlib_face_detector mpfDlibFaceDetection)
+target_link_libraries(sample_dlib_face_detector mpfDlibFaceDetection)

cpp/DlibFaceDetection/DlibFaceDetection.cpp

@@ -667,7 +667,7 @@ vector<MPFImageLocation> DlibFaceDetection::GetDetectionsFromImageData(const MPF
     if (verbosity > 0) {
         //    Draw a rectangle onto the input image for each detection
         if (imshow_on) {
-            namedWindow("original image", CV_WINDOW_AUTOSIZE);
+            namedWindow("original image", cv::WINDOW_AUTOSIZE);
             imshow("original image", image);
             waitKey(5);
         }
@@ -679,7 +679,7 @@ vector<MPFImageLocation> DlibFaceDetection::GetDetectionsFromImageData(const MPF
             cv::rectangle(image, object, CV_RGB(0, 0, 0), 2);
         }
         if (imshow_on) {
-            namedWindow("new image", CV_WINDOW_AUTOSIZE);
+            namedWindow("new image", cv::WINDOW_AUTOSIZE);
             imshow("new image", image);
             //0 waits indefinitely for input, which could cause problems when run as a component
             waitKey(5);

cpp/DlibFaceDetection/Dockerfile

@@ -35,7 +35,7 @@ RUN yum install --assumeyes bzip2 \
     && rm --recursive /var/cache/yum/*
 
 RUN mkdir --parents /apps/source/dlib-sources; \
-    curl --location 'http://dlib.net/files/dlib-18.18.tar.bz2' \
+    curl --location 'http://dlib.net/files/dlib-19.20.tar.bz2' \
         | tar --extract --bzip2 --directory /apps/source/dlib-sources
 
 

cpp/KeywordTagging/CMakeLists.txt

@@ -35,7 +35,8 @@ message("Package in ${PACKAGE_DIR}")
 find_package(mpfComponentInterface REQUIRED)
 find_package(mpfDetectionComponentApi REQUIRED)
 find_package(mpfComponentUtils REQUIRED)
-find_package(OpenCV 3.4.7 EXACT REQUIRED PATHS /opt/opencv-3.4.7 COMPONENTS opencv_core)
+find_package(OpenCV 4.5.0 EXACT REQUIRED PATHS /opt/opencv-4.5.0 COMPONENTS opencv_core)
+
 find_package(Qt4 REQUIRED)
 
 find_package(Boost 1.53.0 COMPONENTS regex locale filesystem)