From ad6741590ff23e2916b81436749e55418a2249e1 Mon Sep 17 00:00:00 2001 From: Hang Lyu Date: Tue, 25 Jun 2019 17:56:43 -0400 Subject: [PATCH] Fix the CUDA_VSERION number issue --- src/cudamatrix/cu-device.cc | 6 +++--- src/cudamatrix/cu-device.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cudamatrix/cu-device.cc b/src/cudamatrix/cu-device.cc index c9614332c92..a41ebccd51e 100644 --- a/src/cudamatrix/cu-device.cc +++ b/src/cudamatrix/cu-device.cc @@ -111,7 +111,7 @@ void CuDevice::Initialize() { CUBLAS_SAFE_CALL(cublasCreate(&cublas_handle_)); CUBLAS_SAFE_CALL(cublasSetStream(cublas_handle_, cudaStreamPerThread)); -#if CUDA_VERSION >= 9100 +#if CUDA_VERSION >= 9010 CUSOLVER_SAFE_CALL(cusolverDnCreate(&cusolverdn_handle_)); CUSOLVER_SAFE_CALL(cusolverDnSetStream(cusolverdn_handle_, cudaStreamPerThread)); @@ -271,7 +271,7 @@ void CuDevice::FinalizeActiveGpu() { CUBLAS_SAFE_CALL(cublasCreate(&cublas_handle_)); CUBLAS_SAFE_CALL(cublasSetStream(cublas_handle_, cudaStreamPerThread)); -#if CUDA_VERSION >= 9100 +#if CUDA_VERSION >= 9010 CUSOLVER_SAFE_CALL(cusolverDnCreate(&cusolverdn_handle_)); CUSOLVER_SAFE_CALL(cusolverDnSetStream(cusolverdn_handle_, cudaStreamPerThread)); @@ -573,7 +573,7 @@ CuDevice::~CuDevice() { if (curand_handle_) { CURAND_SAFE_CALL(curandDestroyGenerator(curand_handle_)); } -#if CUDA_VERSION >= 9100 +#if CUDA_VERSION >= 9010 if (cusolverdn_handle_) { CUSOLVER_SAFE_CALL(cusolverDnDestroy(cusolverdn_handle_)); } diff --git a/src/cudamatrix/cu-device.h b/src/cudamatrix/cu-device.h index 37ff2fd8f0c..9341f180069 100644 --- a/src/cudamatrix/cu-device.h +++ b/src/cudamatrix/cu-device.h @@ -37,7 +37,7 @@ #include "cudamatrix/cu-allocator.h" #include "cudamatrix/cu-common.h" -#if CUDA_VERSION >= 9100 +#if CUDA_VERSION >= 9010 #include #else // cusolver not supported. @@ -94,7 +94,7 @@ class CuDevice { inline cusparseHandle_t GetCusparseHandle() { return cusparse_handle_; } inline curandGenerator_t GetCurandHandle() { return curand_handle_; } inline cusolverDnHandle_t GetCusolverDnHandle() { -#if CUDA_VERSION < 9100 +#if CUDA_VERSION < 9010 KALDI_ERR << "CUDA VERSION '" << CUDA_VERSION << "' not new enough to support " << "cusolver. Upgrade to at least 9.1"; #endif