Sync with latest Darknet sources

src/Detector/darknet/CMakeLists.txt

@@ -76,10 +76,6 @@ set(DARKNET_HEADER_FILES ${DARKNET_HEADER_FILES} include/darknet.h include/yolo_
 
 file(GLOB DARKNET_CUDA_FILES src/*.cu)
 
-add_definitions(-DYOLO_DETECTOR_EXPORTS)
-add_definitions(-DLIB_EXPORTS)
-add_definitions(-DGPU)
-add_definitions(-DCUDNN)
 # add_definitions(-DOPENCV)
 
 #if(NOT CMAKE_DEBUG_POSTFIX)
@@ -107,6 +103,13 @@ set(YOLO_LIBS
 
 target_link_libraries(${libname} ${YOLO_LIBS})
 
+target_compile_definitions(${libname} PRIVATE -DYOLO_DETECTOR_EXPORTS)
+target_compile_definitions(${libname} PRIVATE -DLIB_EXPORTS)
+target_compile_definitions(${libname} PRIVATE -DGPU)
+target_compile_definitions(${libname} PRIVATE -DCUDNN)
+target_compile_definitions(${libname} PRIVATE -DCUDNN_HALF)
+
+
 install(TARGETS ${libname}
         EXPORT MTTrackingExports
         ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib

src/Detector/darknet/cmake/FindCUDNN.cmake

@@ -1,180 +1,104 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
+# Distributed under the OSI-approved BSD 3-Clause License.
+# Copyright Stefano Sinigardi
+
 #.rst:
 # FindCUDNN
-# -------
-#
-# Find CUDNN library
-#
-# Valiables that affect result:
-# <VERSION>, <REQUIRED>, <QUIETLY>: as usual
-#
-# <EXACT> : as usual, plus we do find '5.1' version if you wanted '5' 
-#           (not if you wanted '5.0', as usual)   
+# --------
 #
-# Result variables
+# Result Variables
 # ^^^^^^^^^^^^^^^^
 #
-# This module will set the following variables in your project:
+# This module will set the following variables in your project::
 #
-# ``CUDNN_INCLUDE``
-#   where to find cudnn.h.
-# ``CUDNN_LIBRARY``
-#   the libraries to link against to use CUDNN.
-# ``CUDNN_FOUND``
-#   If false, do not try to use CUDNN.
-# ``CUDNN_VERSION``
-#   Version of the CUDNN library we looked for 
+#  ``CUDNN_FOUND``
+#    True if CUDNN found on the local system
 #
-# Exported functions
-# ^^^^^^^^^^^^^^^^
-# function(CUDNN_INSTALL version __dest_libdir [__dest_incdir])
-#  This function will try to download and install CUDNN.
-#  CUDNN5 and CUDNN6 are supported.
+#  ``CUDNN_INCLUDE_DIRS``
+#    Location of CUDNN header files.
 #
+#  ``CUDNN_LIBRARIES``
+#    The CUDNN libraries.
+#
+#  ``CuDNN::CuDNN``
+#    The CUDNN target
 #
 
-function(CUDNN_INSTALL version dest_libdir dest_incdir dest_bindir)
-  message(STATUS "CUDNN_INSTALL: Installing CUDNN ${version}, lib:${dest_libdir}, inc:${dest_incdir}, bin:${dest_bindir}")
-  string(REGEX REPLACE "-rc$" "" version_base "${version}")
-  set(tar_libdir cuda/lib64)
-  set(tar_incdir cuda/include)
-
-  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    set(url_extension tgz)
-    if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
-      set(url_arch_name linux-x64 )
-    elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "ppc")
-      set(url_arch_name linux-ppc64le ) 
-      #  TX1 has to be installed via JetPack
-    endif()
-  elseif  (APPLE)
-    set(url_extension tgz)
-    set(tar_libdir cuda/lib)
-    set(url_arch_name osx-x64)
-  elseif(WIN32)
-    set(url_extension zip)
-    set(tar_bindir cuda/bin)
-    set(tar_libdir cuda/lib/x64)
-    if(CMAKE_SYSTEM_VERSION MATCHES "10")
-      set(url_arch_name windows10-x64)
-    else()
-      set(url_arch_name windows7-x64)
-    endif()
-  endif()
-
-  # Download and install CUDNN locally if not found on the system
-  if(url_arch_name) 
-    set(download_dir ${CMAKE_CURRENT_BINARY_DIR}/downloads/cudnn${version})
-    file(MAKE_DIRECTORY ${download_dir})
-    set(cudnn_filename cudnn-${CUDA_VERSION}-${url_arch_name}-v${version}.${url_extension})
-    set(base_url http://developer.download.nvidia.com/compute/redist/cudnn)
-    set(cudnn_url ${base_url}/v${version_base}/${cudnn_filename})
-    set(cudnn_file ${download_dir}/${cudnn_filename})
-
-    if(NOT EXISTS ${cudnn_file})
-      message(STATUS "Downloading CUDNN library from NVIDIA...")
-      file(DOWNLOAD ${cudnn_url} ${cudnn_file}
-	SHOW_PROGRESS STATUS cudnn_status
-	)
-    execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzvf ${cudnn_file} WORKING_DIRECTORY ${download_dir} RESULT_VARIABLE cudnn_status)
-
-      if(NOT "${cudnn_status}" MATCHES "0")
-	message(STATUS "Was not able to download CUDNN from ${cudnn_url}. Please install CuDNN manually from https://developer.nvidia.com/cuDNN")
-      endif()
-    endif()
-
-    if(dest_bindir AND tar_bindir)
-      file(COPY ${download_dir}/${tar_bindir}/ DESTINATION ${dest_bindir})
-    endif()
-
-    if(dest_incdir)
-      file(COPY ${download_dir}/${tar_incdir}/ DESTINATION  ${dest_incdir})
-    endif()
-
-    file(COPY ${download_dir}/${tar_libdir}/ DESTINATION  ${dest_libdir} )
-
-    get_filename_component(dest_dir ${dest_libdir} DIRECTORY)
-
-    set(CUDNN_ROOT_DIR ${dest_dir} PARENT_SCOPE)
-    unset(CUDNN_LIBRARY CACHE)
-    unset(CUDNN_INCLUDE_DIR CACHE)
-
-  endif(url_arch_name)
-endfunction()
-
-#####################################################
-
-find_package(PkgConfig)
-pkg_check_modules(PC_CUDNN QUIET CUDNN)
-
-get_filename_component(__libpath_cudart "${CUDA_CUDART_LIBRARY}" PATH)
-
-# We use major only in library search as major/minor is not entirely consistent among platforms.
-# Also, looking for exact minor version of .so is in general not a good idea.
-# More strict enforcement of minor/patch version is done if/when the header file is examined.
-if(CUDNN_FIND_VERSION_EXACT)
-  SET(__cudnn_ver_suffix ".${CUDNN_FIND_VERSION_MAJOR}")
-  SET(__cudnn_lib_win_name cudnn64_${CUDNN_FIND_VERSION_MAJOR})
-else()
-  SET(__cudnn_lib_win_name cudnn64)
+include(FindPackageHandleStandardArgs)
+
+find_path(CUDNN_INCLUDE_DIR NAMES cudnn.h cudnn_v8.h cudnn_v7.h
+  HINTS $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{CUDA_HOME} $ENV{CUDNN_ROOT_DIR} /usr/include
+  PATH_SUFFIXES cuda/include include)
+find_library(CUDNN_LIBRARY NAMES cudnn cudnn8 cudnn7
+  HINTS $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{CUDA_HOME} $ENV{CUDNN_ROOT_DIR} /usr/lib/x86_64-linux-gnu/
+  PATH_SUFFIXES lib lib64 cuda/lib cuda/lib64 lib/x64 cuda/lib/x64)
+if(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn.h")
+  file(READ ${CUDNN_INCLUDE_DIR}/cudnn.h CUDNN_HEADER_CONTENTS)
+elseif(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn_v8.h")
+  file(READ ${CUDNN_INCLUDE_DIR}/cudnn_v8.h CUDNN_HEADER_CONTENTS)
+elseif(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn_v7.h")
+  file(READ ${CUDNN_INCLUDE_DIR}/cudnn_v7.h CUDNN_HEADER_CONTENTS)
 endif()
-
-find_library(CUDNN_LIBRARY 
-  NAMES libcudnn.so${__cudnn_ver_suffix} libcudnn${__cudnn_ver_suffix}.dylib ${__cudnn_lib_win_name}
-  PATHS $ENV{LD_LIBRARY_PATH} ${__libpath_cudart} ${CUDNN_ROOT_DIR} ${PC_CUDNN_LIBRARY_DIRS} ${CMAKE_INSTALL_PREFIX}
-  PATH_SUFFIXES lib lib64 bin
-  DOC "CUDNN library." )
-
-if(CUDNN_LIBRARY)
-  SET(CUDNN_MAJOR_VERSION ${CUDNN_FIND_VERSION_MAJOR})
-  set(CUDNN_VERSION ${CUDNN_MAJOR_VERSION})
-  get_filename_component(__found_cudnn_root ${CUDNN_LIBRARY} PATH)
-  find_path(CUDNN_INCLUDE_DIR 
-    NAMES cudnn.h
-    HINTS ${PC_CUDNN_INCLUDE_DIRS} ${CUDNN_ROOT_DIR} ${CUDA_TOOLKIT_INCLUDE} ${__found_cudnn_root}
-    PATH_SUFFIXES include 
-    DOC "Path to CUDNN include directory." )
+if(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn_version.h")
+  file(READ "${CUDNN_INCLUDE_DIR}/cudnn_version.h" CUDNN_VERSION_H_CONTENTS)
+  string(APPEND CUDNN_HEADER_CONTENTS "${CUDNN_VERSION_H_CONTENTS}")
+  unset(CUDNN_VERSION_H_CONTENTS)
+elseif(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn_version_v8.h")
+  file(READ "${CUDNN_INCLUDE_DIR}/cudnn_version_v8.h" CUDNN_VERSION_H_CONTENTS)
+  string(APPEND CUDNN_HEADER_CONTENTS "${CUDNN_VERSION_H_CONTENTS}")
+  unset(CUDNN_VERSION_H_CONTENTS)
+elseif(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn_version_v7.h")
+  file(READ "${CUDNN_INCLUDE_DIR}/cudnn_version_v7.h" CUDNN_VERSION_H_CONTENTS)
+  string(APPEND CUDNN_HEADER_CONTENTS "${CUDNN_VERSION_H_CONTENTS}")
+  unset(CUDNN_VERSION_H_CONTENTS)
 endif()
-
-if(CUDNN_LIBRARY AND CUDNN_INCLUDE_DIR)
-  file(READ ${CUDNN_INCLUDE_DIR}/cudnn.h CUDNN_VERSION_FILE_CONTENTS)
+if(CUDNN_HEADER_CONTENTS)
   string(REGEX MATCH "define CUDNN_MAJOR * +([0-9]+)"
-    CUDNN_MAJOR_VERSION "${CUDNN_VERSION_FILE_CONTENTS}")
+               _CUDNN_VERSION_MAJOR "${CUDNN_HEADER_CONTENTS}")
   string(REGEX REPLACE "define CUDNN_MAJOR * +([0-9]+)" "\\1"
-    CUDNN_MAJOR_VERSION "${CUDNN_MAJOR_VERSION}")
+               _CUDNN_VERSION_MAJOR "${_CUDNN_VERSION_MAJOR}")
   string(REGEX MATCH "define CUDNN_MINOR * +([0-9]+)"
-    CUDNN_MINOR_VERSION "${CUDNN_VERSION_FILE_CONTENTS}")
+               _CUDNN_VERSION_MINOR "${CUDNN_HEADER_CONTENTS}")
   string(REGEX REPLACE "define CUDNN_MINOR * +([0-9]+)" "\\1"
-    CUDNN_MINOR_VERSION "${CUDNN_MINOR_VERSION}")
+               _CUDNN_VERSION_MINOR "${_CUDNN_VERSION_MINOR}")
   string(REGEX MATCH "define CUDNN_PATCHLEVEL * +([0-9]+)"
-    CUDNN_PATCH_VERSION "${CUDNN_VERSION_FILE_CONTENTS}")
+               _CUDNN_VERSION_PATCH "${CUDNN_HEADER_CONTENTS}")
   string(REGEX REPLACE "define CUDNN_PATCHLEVEL * +([0-9]+)" "\\1"
-    CUDNN_PATCH_VERSION "${CUDNN_PATCH_VERSION}")  
-  set(CUDNN_VERSION ${CUDNN_MAJOR_VERSION}.${CUDNN_MINOR_VERSION})
-endif()
-
-if(CUDNN_MAJOR_VERSION)
-  ## Fixing the case where 5.1 does not fit 'exact' 5.
-  if(CUDNN_FIND_VERSION_EXACT AND NOT CUDNN_FIND_VERSION_MINOR)
-    if("${CUDNN_MAJOR_VERSION}" STREQUAL "${CUDNN_FIND_VERSION_MAJOR}")
-      set(CUDNN_VERSION ${CUDNN_FIND_VERSION})
-    endif()
+               _CUDNN_VERSION_PATCH "${_CUDNN_VERSION_PATCH}")
+  if(NOT _CUDNN_VERSION_MAJOR)
+    set(CUDNN_VERSION "?")
+  else()
+    set(CUDNN_VERSION "${_CUDNN_VERSION_MAJOR}.${_CUDNN_VERSION_MINOR}.${_CUDNN_VERSION_PATCH}")
   endif()
-else()
-  # Try to set CUDNN version from config file
-  set(CUDNN_VERSION ${PC_CUDNN_CFLAGS_OTHER})
 endif()
 
-find_package_handle_standard_args(
-  CUDNN 
-  FOUND_VAR CUDNN_FOUND
-  REQUIRED_VARS CUDNN_LIBRARY 
-  VERSION_VAR   CUDNN_VERSION
-  )
+set(CUDNN_INCLUDE_DIRS ${CUDNN_INCLUDE_DIR})
+set(CUDNN_LIBRARIES ${CUDNN_LIBRARY})
+mark_as_advanced(CUDNN_LIBRARY CUDNN_INCLUDE_DIR)
 
-if(CUDNN_FOUND)
-  set(CUDNN_LIBRARIES ${CUDNN_LIBRARY})
-  set(CUDNN_INCLUDE_DIRS ${CUDNN_INCLUDE_DIR})
-  set(CUDNN_DEFINITIONS ${PC_CUDNN_CFLAGS_OTHER})
-endif()  
+find_package_handle_standard_args(CUDNN
+      REQUIRED_VARS  CUDNN_INCLUDE_DIR CUDNN_LIBRARY
+      VERSION_VAR    CUDNN_VERSION
+)
+
+if(WIN32)
+  set(CUDNN_DLL_DIR ${CUDNN_INCLUDE_DIR})
+  list(TRANSFORM CUDNN_DLL_DIR APPEND "/../bin")
+  find_file(CUDNN_LIBRARY_DLL NAMES cudnn64_${CUDNN_VERSION_MAJOR}.dll PATHS ${CUDNN_DLL_DIR})
+endif()
+
+if( CUDNN_FOUND AND NOT TARGET CuDNN::CuDNN )
+  if( EXISTS "${CUDNN_LIBRARY_DLL}" )
+    add_library( CuDNN::CuDNN      SHARED IMPORTED )
+    set_target_properties( CuDNN::CuDNN PROPERTIES
+      IMPORTED_LOCATION                 "${CUDNN_LIBRARY_DLL}"
+      IMPORTED_IMPLIB                   "${CUDNN_LIBRARY}"
+      INTERFACE_INCLUDE_DIRECTORIES     "${CUDNN_INCLUDE_DIR}"
+      IMPORTED_LINK_INTERFACE_LANGUAGES "C" )
+  else()
+    add_library( CuDNN::CuDNN      UNKNOWN IMPORTED )
+    set_target_properties( CuDNN::CuDNN PROPERTIES
+      IMPORTED_LOCATION                 "${CUDNN_LIBRARY}"
+      INTERFACE_INCLUDE_DIRECTORIES     "${CUDNN_INCLUDE_DIR}"
+      IMPORTED_LINK_INTERFACE_LANGUAGES "C" )
+  endif()
+endif()