Merge branch release-2018

[alexxy/gromacs.git] / src / gromacs / gpu_utils / gpu_utils.cu

diff --git a/src/gromacs/gpu_utils/gpu_utils.cu b/src/gromacs/gpu_utils/gpu_utils.cu
index 4f2656b18cdd1dfb7bacc44ca6074132260fc146..d464bde726acd56cad8d1d9a12041fe268c21c7a 100644 (file)
--- a/src/gromacs/gpu_utils/gpu_utils.cu
+++ b/src/gromacs/gpu_utils/gpu_utils.cu
@@ -762,7 +762,11 @@ void findGpus(gmx_gpu_info_t *gpu_info)
             }
         }
     }
-    GMX_RELEASE_ASSERT(cudaSuccess == cudaPeekAtLastError(), "We promise to return with clean CUDA state!");
+
+    stat = cudaPeekAtLastError();
+    GMX_RELEASE_ASSERT(stat == cudaSuccess,
+                       gmx::formatString("We promise to return with clean CUDA state, but non-success state encountered: %s: %s",
+                                         cudaGetErrorName(stat), cudaGetErrorString(stat)).c_str());
 
     gpu_info->n_dev   = ndev;
     gpu_info->gpu_dev = devs;