[src,build] Removed cusolver for now (not needed yet; caused build pr…

…oblems) (#3276)
kaldi-asr · Apr 27, 2019 · 203ce37 · 203ce37
1 parent da4e2b8
commit 203ce37
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 16 deletions.
diff --git a/src/cudamatrix/cu-common.h b/src/cudamatrix/cu-common.h
@@ -51,15 +51,6 @@
   } \
 }
 
-#define CUSOLVER_SAFE_CALL(fun) \
-{ \
-  int32 ret; \
-  if ((ret = (fun)) != 0) { \
-    KALDI_ERR << "cusolverStatus_t " << ret << " : \"" << ret << "\" returned from '" << #fun << "'"; \
-  } \
-}
-
-
 #define CUSPARSE_SAFE_CALL(fun) \
 { \
   int32 ret; \

diff --git a/src/cudamatrix/cu-device.h b/src/cudamatrix/cu-device.h
@@ -27,7 +27,6 @@
 #include <cublas_v2.h>
 #include <cusparse.h>
 #include <curand.h>
-#include <cusolverDn.h>
 #include <map>
 #include <string>
 #include <iostream>
@@ -84,7 +83,6 @@ class CuDevice {
   inline cublasHandle_t GetCublasHandle() { return cublas_handle_; }
   inline cusparseHandle_t GetCusparseHandle() { return cusparse_handle_; }
   inline curandGenerator_t GetCurandHandle() { return curand_handle_; }
-  inline cusolverDnHandle_t GetCusolverDnHandle() { return cusolverdn_handle_; }
 
   inline void SeedGpu() {
     if (CuDevice::Instantiate().Enabled()) {
@@ -306,7 +304,6 @@ class CuDevice {
   cublasHandle_t cublas_handle_;
   cusparseHandle_t cusparse_handle_;
   curandGenerator_t curand_handle_;
-  cusolverDnHandle_t cusolverdn_handle_;
 }; // class CuDevice
 
 
@@ -325,9 +322,6 @@ inline cublasHandle_t GetCublasHandle() {
   return CuDevice::Instantiate().GetCublasHandle(); 
 }
 
-inline cusolverDnHandle_t GetCusolverDnHandle() { 
-  return CuDevice::Instantiate().GetCusolverDnHandle(); 
-}
 // A more convenient way to get the handle to use cuSPARSE APIs.
 inline cusparseHandle_t GetCusparseHandle() { 
   return CuDevice::Instantiate().GetCusparseHandle(); 

diff --git a/src/makefiles/cuda_64bit.mk b/src/makefiles/cuda_64bit.mk
@@ -14,4 +14,4 @@ CUDA_FLAGS = --machine 64 -DHAVE_CUDA \
              --verbose -Xcompiler "$(CXXFLAGS)"
 
 CUDA_LDFLAGS += -L$(CUDATKDIR)/lib64 -Wl,-rpath,$(CUDATKDIR)/lib64
-CUDA_LDLIBS += -lcublas -lcusparse -lcusolver -lcudart -lcurand -lnvToolsExt #LDLIBS : The .so libs are loaded later than static libs in implicit rule
+CUDA_LDLIBS += -lcublas -lcusparse -lcudart -lcurand -lnvToolsExt #LDLIBS : The .so libs are loaded later than static libs in implicit rule