Print better CUDA error messages

diff --git a/src/cuda/cuda_error_check.cuh b/src/cuda/cuda_error_check.cuh
index 3b7ed556031b4a7d458385cd11ba8ef6589c006b..5b61c65dca1887702332a41afe5389bb8785923b 100644 (file)
--- a/src/cuda/cuda_error_check.cuh
+++ b/src/cuda/cuda_error_check.cuh
@@ -4,15 +4,15 @@
 //Code taken from https://codeyarns.com/2011/03/02/how-to-do-error-checking-in-cuda/
 #include <iostream>
 
-#define CudaSafeCall( err ) __cudaSafeCall( err, __FILE__, __LINE__ )
+#define CudaSafeCall( err ) __cudaSafeCall( err, #err, __FILE__, __LINE__ )
 #define CudaCheckError()    __cudaCheckError( __FILE__, __LINE__ )
 
-static inline void __cudaSafeCall( cudaError err, const char *file, const int line )
+static inline void __cudaSafeCall( cudaError err, const char *text, const char *file, const int line )
 {
     if ( cudaSuccess != err )
     {
-        fprintf( stderr, "cudaSafeCall() failed at %s:%i : %s\n",
-                 file, line, cudaGetErrorString( err ) );
+        fprintf( stderr, "%s:%i: %s: %s\n",
+                 file, line, text, cudaGetErrorString( err ) );
         exit( -1 );
     }