Skip to content

Fix the CUDA_VSERION number issue #3414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danpovey merged 1 commit into from
Jun 25, 2019
Merged

Fix the CUDA_VSERION number issue #3414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/cudamatrix/cu-device.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -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));
Expand Down Expand Up @@ -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_));
}
Expand Down
4 changes: 2 additions & 2 deletions src/cudamatrix/cu-device.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include "cudamatrix/cu-allocator.h"
#include "cudamatrix/cu-common.h"

#if CUDA_VERSION >= 9100
#if CUDA_VERSION >= 9010
#include <cusolverDn.h>
#else
// cusolver not supported.
Expand Down Expand Up @@ -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
Expand Down