File tree Expand file tree Collapse file tree 3 files changed +19
-2
lines changed Expand file tree Collapse file tree 3 files changed +19
-2
lines changed Original file line number Diff line number Diff line change @@ -65,7 +65,11 @@ endif()
65
65
66
66
# extract version from the include
67
67
if (CUDNN_INCLUDE_DIR)
68
- file (READ "${CUDNN_INCLUDE_DIR} /cudnn.h" CUDNN_H_CONTENTS)
68
+ if (EXISTS "${CUDNN_INCLUDE_DIR} /cudnn_version.h" )
69
+ file (READ "${CUDNN_INCLUDE_DIR} /cudnn_version.h" CUDNN_H_CONTENTS)
70
+ else ()
71
+ file (READ "${CUDNN_INCLUDE_DIR} /cudnn.h" CUDNN_H_CONTENTS)
72
+ endif ()
69
73
70
74
string (REGEX MATCH "define CUDNN_MAJOR ([0-9]+)" _ "${CUDNN_H_CONTENTS} " )
71
75
set (CUDNN_MAJOR_VERSION ${CMAKE_MATCH_1} CACHE INTERNAL "" )
Original file line number Diff line number Diff line change @@ -31,6 +31,11 @@ endif()
31
31
32
32
if (CUDA_FOUND)
33
33
set (HAVE_CUDA 1)
34
+ if (CUDA_VERSION VERSION_GREATER_EQUAL "11.0" )
35
+ # CUDA 11.0 removes nppicom
36
+ ocv_list_filterout(CUDA_nppi_LIBRARY "nppicom" )
37
+ ocv_list_filterout(CUDA_npp_LIBRARY "nppicom" )
38
+ endif ()
34
39
35
40
if (WITH_CUFFT)
36
41
set (HAVE_CUFFT 1)
Original file line number Diff line number Diff line change @@ -21,7 +21,15 @@ if(OPENCV_DNN_OPENCL AND HAVE_OPENCL)
21
21
add_definitions (-DCV_OCL4DNN=1)
22
22
endif ()
23
23
24
- ocv_option(OPENCV_DNN_CUDA "Build with CUDA support" HAVE_CUDA AND HAVE_CUBLAS AND HAVE_CUDNN)
24
+ if (NOT DEFINED OPENCV_DNN_CUDA AND HAVE_CUDNN AND CUDNN_VERSION VERSION_LESS 8.0)
25
+ message (STATUS "DNN: CUDNN 8.0 is not supported yes. Details: https://github.com/opencv/opencv/issues/17496" )
26
+ endif ()
27
+ ocv_option(OPENCV_DNN_CUDA "Build with CUDA support"
28
+ HAVE_CUDA
29
+ AND HAVE_CUBLAS
30
+ AND HAVE_CUDNN
31
+ AND CUDNN_VERSION VERSION_LESS 8.0
32
+ )
25
33
26
34
if (OPENCV_DNN_CUDA AND HAVE_CUDA AND HAVE_CUBLAS AND HAVE_CUDNN)
27
35
add_definitions (-DCV_CUDA4DNN=1)
You can’t perform that action at this time.
0 commit comments