Merge branch 'release-4-6'

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

diff --git a/src/gromacs/gmxlib/gpu_utils/gpu_utils.cu b/src/gromacs/gmxlib/gpu_utils/gpu_utils.cu
index dcb701f4ac31731c8bd25e33e0fca3441ca56049..eb3e7dd7813f227af57b597337265613e43edf23 100644 (file)
--- a/src/gromacs/gmxlib/gpu_utils/gpu_utils.cu
+++ b/src/gromacs/gmxlib/gpu_utils/gpu_utils.cu
@@ -857,10 +857,7 @@ int get_gpu_device_id(const gmx_gpu_info_t *gpu_info,
 {
     assert(gpu_info);
     assert(gpu_opt);
-    if (idx < 0 && idx >= gpu_opt->ncuda_dev_use)
-    {
-        return -1;
-    }
+    assert(idx >= 0 && idx < gpu_opt->ncuda_dev_use);
 
     return gpu_info->cuda_dev[gpu_opt->cuda_dev_use[idx]].id;
 }