diff --git a/applications/plugins/SofaCUDA/sofa/gpu/cuda/mycuda.cu b/applications/plugins/SofaCUDA/sofa/gpu/cuda/mycuda.cu index 9b680ec7c4a..0034cb6fa43 100644 --- 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 index 46fe9da2f1b..21d87f0738a 100644 --- a/applications/plugins/SofaCUDA/sofa/gpu/cuda/mycuda.h +++ b/applications/plugins/SofaCUDA/sofa/gpu/cuda/mycuda.h @@ -26,8 +26,12 @@ #include #ifdef SOFA_GPU_CUBLAS -#include +#if __has_include() +#define SOFA_GPU_CUBLAS_V2 #include +#else +#include +#endif #include #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)