[SofaCUDA] Dont use both version of cublas (legacy or v2) (#4274)

use either cublasv2 or legacy, not both Co-authored-by: erik pernod <[email protected]>
sofa-framework · Nov 8, 2023 · c00d082 · c00d082
1 parent 22d783b
commit c00d082
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/applications/plugins/SofaCUDA/sofa/gpu/cuda/mycuda.cu b/applications/plugins/SofaCUDA/sofa/gpu/cuda/mycuda.cu
@@ -254,7 +254,7 @@ int mycudaInit(int device)
     }
 
 
-#ifdef SOFA_GPU_CUBLAS
+#if defined(SOFA_GPU_CUBLAS) && !defined(SOFA_GPU_CUBLAS_V2)
     cublasInit();
 #endif
     return 1;

diff --git a/applications/plugins/SofaCUDA/sofa/gpu/cuda/mycuda.h b/applications/plugins/SofaCUDA/sofa/gpu/cuda/mycuda.h
@@ -26,8 +26,12 @@
 #include <string.h>
 
 #ifdef SOFA_GPU_CUBLAS
-#include <cublas.h>
+#if __has_include(<cublas_v2.h>)
+#define SOFA_GPU_CUBLAS_V2
 #include <cublas_v2.h>
+#else
+#include <cublas.h>
+#endif
 #include <cusparse_v2.h>
 #endif
 
@@ -88,7 +92,6 @@ extern "C" {
     extern cusparseMatDescr_t SOFA_GPU_CUDA_API getCusparseMatGeneralDescr();
     extern cusparseMatDescr_t SOFA_GPU_CUDA_API getCusparseMatTriangularUpperDescr();
     extern cusparseMatDescr_t SOFA_GPU_CUDA_API getCusparseMatTriangularLowerDescr();
-
 #endif
 
 #if defined(NDEBUG) && !defined(CUDA_DEBUG)