From 252c9a715e15f687ec84351b26be987e88f6c193 Mon Sep 17 00:00:00 2001 From: vurusovs Date: Tue, 16 Jan 2024 23:53:26 -0800 Subject: [PATCH] Add `CUDNN_INCLUDE_DIR` --- modules/nvidia_plugin/CMakeLists.txt | 14 ++++++++++---- modules/nvidia_plugin/src/CMakeLists.txt | 1 + 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/modules/nvidia_plugin/CMakeLists.txt b/modules/nvidia_plugin/CMakeLists.txt index 4a40aee55..94c786878 100644 --- a/modules/nvidia_plugin/CMakeLists.txt +++ b/modules/nvidia_plugin/CMakeLists.txt @@ -92,6 +92,8 @@ find_library(CUDNN_PATH ${HAS_REQUIRED} HINTS "$ENV{CUDNN_PATH}" "${CUDA_TOOLKIT_ROOT_DIR}" "${CUDA_PATH}" "$ENV{CUDA_PATH}" PATH_SUFFIXES nvidia/current lib64 lib/x64 lib) +get_filename_component(CUDNN_INCLUDE_DIR "${CUDNN_PATH}" DIRECTORY) +get_filename_component(CUDNN_INCLUDE_DIR "${CUDNN_INCLUDE_DIR}/../../include" REALPATH) if(CUDAToolkit_VERSION_MAJOR LESS_EQUAL 10) set(CUTENSOR_LIB_DIRS lib/10.2 libcutensor/10.2) @@ -118,14 +120,18 @@ endif() message("-- [nvidia_gpu] CUTENSOR_PATH ${CUTENSOR_PATH}") message("-- [nvidia_gpu] CUTENSOR_INCLUDE_DIR ${CUTENSOR_INCLUDE_DIR}") message("-- [nvidia_gpu] CUDNN_PATH ${CUDNN_PATH}") +message("-- [nvidia_gpu] CUDNN_INCLUDE_DIR ${CUDNN_INCLUDE_DIR}") message("-- [nvidia_gpu] CUBLAS_PATH ${CUBLAS_PATH}") add_library(CUDA::cudnn SHARED IMPORTED) -set_target_properties(CUDA::cudnn PROPERTIES IMPORTED_LOCATION "${CUDNN_PATH}") -set_target_properties(CUDA::cudnn PROPERTIES IMPORTED_IMPLIB "${CUDNN_PATH}") +set_target_properties(CUDA::cudnn PROPERTIES IMPORTED_LOCATION "${CUDNN_PATH}" + IMPORTED_IMPLIB "${CUDNN_PATH}" + INTERFACE_INCLUDE_DIRECTORIES "${CUDNN_INCLUDE_DIR}") + add_library(CUDA::cutensor SHARED IMPORTED) -set_target_properties(CUDA::cutensor PROPERTIES IMPORTED_LOCATION "${CUTENSOR_PATH}") -set_target_properties(CUDA::cutensor PROPERTIES IMPORTED_IMPLIB "${CUTENSOR_PATH}") +set_target_properties(CUDA::cutensor PROPERTIES IMPORTED_LOCATION "${CUTENSOR_PATH}" + IMPORTED_IMPLIB "${CUTENSOR_PATH}" + INTERFACE_INCLUDE_DIRECTORIES "${CUTENSOR_INCLUDE_DIR}") if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES) if(CUDAToolkit_VERSION_MAJOR LESS_EQUAL 10) diff --git a/modules/nvidia_plugin/src/CMakeLists.txt b/modules/nvidia_plugin/src/CMakeLists.txt index e95f98e4e..2924867c9 100644 --- a/modules/nvidia_plugin/src/CMakeLists.txt +++ b/modules/nvidia_plugin/src/CMakeLists.txt @@ -51,6 +51,7 @@ target_include_directories(${OBJ_NAME} ) target_include_directories(${OBJ_NAME} PUBLIC + "${CUDNN_INCLUDE_DIR}" "${CUTENSOR_INCLUDE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}" "${OpenVINONVIDIAGpuPlugin_SOURCE_DIR}/include"