From eeb5b69f5e4a8b97a6cd6af48d3ff53cd2f04b8b Mon Sep 17 00:00:00 2001 From: Jon Soifer Date: Fri, 24 Jan 2020 14:42:27 -0800 Subject: [PATCH 1/2] Explicitly link to cublasLt --- cmake/modules/CUDA.cmake | 1 + cmake/util/FindCUDA.cmake | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/cmake/modules/CUDA.cmake b/cmake/modules/CUDA.cmake index 785fa945cd87..816d6036f400 100644 --- a/cmake/modules/CUDA.cmake +++ b/cmake/modules/CUDA.cmake @@ -50,6 +50,7 @@ if(USE_CUDA) file(GLOB CONTRIB_CUBLAS_SRCS src/runtime/contrib/cublas/*.cc) list(APPEND RUNTIME_SRCS ${CONTRIB_CUBLAS_SRCS}) list(APPEND TVM_RUNTIME_LINKER_LIBS ${CUDA_CUBLAS_LIBRARY}) + list(APPEND TVM_RUNTIME_LINKER_LIBS ${CUDA_CUBLASLT_LIBRARY}) endif(USE_CUBLAS) else(USE_CUDA) diff --git a/cmake/util/FindCUDA.cmake b/cmake/util/FindCUDA.cmake index 15ae2ccbd8b4..f971c87f20a8 100644 --- a/cmake/util/FindCUDA.cmake +++ b/cmake/util/FindCUDA.cmake @@ -70,6 +70,9 @@ macro(find_cuda use_cuda) find_library(CUDA_CUBLAS_LIBRARY cublas ${CUDA_TOOLKIT_ROOT_DIR}/lib/x64 ${CUDA_TOOLKIT_ROOT_DIR}/lib/Win32) + find_library(CUDA_CUBLASLT_LIBRARY cublaslt + ${CUDA_TOOLKIT_ROOT_DIR}/lib/x64 + ${CUDA_TOOLKIT_ROOT_DIR}/lib/Win32) else(MSVC) find_library(_CUDA_CUDA_LIBRARY cuda PATHS ${CUDA_TOOLKIT_ROOT_DIR} @@ -88,6 +91,9 @@ macro(find_cuda use_cuda) find_library(CUDA_CUBLAS_LIBRARY cublas ${CUDA_TOOLKIT_ROOT_DIR}/lib64 ${CUDA_TOOLKIT_ROOT_DIR}/lib) + find_library(CUDA_CUBLASLT_LIBRARY cublaslt + ${CUDA_TOOLKIT_ROOT_DIR}/lib64 + ${CUDA_TOOLKIT_ROOT_DIR}/lib) endif(MSVC) message(STATUS "Found CUDA_TOOLKIT_ROOT_DIR=" ${CUDA_TOOLKIT_ROOT_DIR}) message(STATUS "Found CUDA_CUDA_LIBRARY=" ${CUDA_CUDA_LIBRARY}) @@ -95,5 +101,6 @@ macro(find_cuda use_cuda) message(STATUS "Found CUDA_NVRTC_LIBRARY=" ${CUDA_NVRTC_LIBRARY}) message(STATUS "Found CUDA_CUDNN_LIBRARY=" ${CUDA_CUDNN_LIBRARY}) message(STATUS "Found CUDA_CUBLAS_LIBRARY=" ${CUDA_CUBLAS_LIBRARY}) + message(STATUS "Found CUDA_CUBLASLT_LIBRARY=" ${CUDA_CUBLASLT_LIBRARY}) endif(CUDA_FOUND) endmacro(find_cuda) From 1ef64b284d31aea7297a478483fa4a2cdfbfb876 Mon Sep 17 00:00:00 2001 From: Jon Soifer Date: Mon, 27 Jan 2020 08:43:37 -0800 Subject: [PATCH 2/2] Only link cublasLt if it's found --- cmake/modules/CUDA.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/modules/CUDA.cmake b/cmake/modules/CUDA.cmake index 816d6036f400..250a65c591e1 100644 --- a/cmake/modules/CUDA.cmake +++ b/cmake/modules/CUDA.cmake @@ -50,7 +50,9 @@ if(USE_CUDA) file(GLOB CONTRIB_CUBLAS_SRCS src/runtime/contrib/cublas/*.cc) list(APPEND RUNTIME_SRCS ${CONTRIB_CUBLAS_SRCS}) list(APPEND TVM_RUNTIME_LINKER_LIBS ${CUDA_CUBLAS_LIBRARY}) - list(APPEND TVM_RUNTIME_LINKER_LIBS ${CUDA_CUBLASLT_LIBRARY}) + if(NOT CUDA_CUBLASLT_LIBRARY STREQUAL "CUDA_CUBLASLT_LIBRARY-NOTFOUND") + list(APPEND TVM_RUNTIME_LINKER_LIBS ${CUDA_CUBLASLT_LIBRARY}) + endif() endif(USE_CUBLAS) else(USE_CUDA)