Merge release-5-0 into master

[alexxy/gromacs.git] / src / gromacs / gmxlib / gmx_detect_hardware.cpp

diff --git a/src/gromacs/gmxlib/gmx_detect_hardware.cpp b/src/gromacs/gmxlib/gmx_detect_hardware.cpp
index 711e83e6742579a6cb11d41b3c01e8fff8c89f38..96ea3c3db17b10c0d3a6d24fe914a94e730d061b 100644 (file)
--- a/src/gromacs/gmxlib/gmx_detect_hardware.cpp
+++ b/src/gromacs/gmxlib/gmx_detect_hardware.cpp
@@ -279,7 +279,7 @@ void gmx_check_hw_runconf_consistency(FILE                *fplog,
 {
     int      npppn;
     char     th_or_proc[STRLEN], th_or_proc_plural[STRLEN], pernode[STRLEN];
-    gmx_bool btMPI, bMPI, bMaxMpiThreadsSet, bNthreadsAuto, bEmulateGPU;
+    gmx_bool btMPI, bMPI, bNthreadsAuto, bEmulateGPU;
 
     assert(hwinfo);
     assert(cr);
@@ -310,7 +310,6 @@ void gmx_check_hw_runconf_consistency(FILE                *fplog,
     /* GPU emulation detection is done later, but we need here as well
      * -- uncool, but there's no elegant workaround */
     bEmulateGPU       = (getenv("GMX_EMULATE_GPU") != NULL);
-    bMaxMpiThreadsSet = (getenv("GMX_MAX_MPI_THREADS") != NULL);
 
     if (hwinfo->gpu_info.n_dev_compatible > 0)
     {
@@ -381,10 +380,10 @@ void gmx_check_hw_runconf_consistency(FILE                *fplog,
                    could automatically start. */
                 gmx_fatal(FARGS,
                           "%d GPU%s provided, but only %d PP thread-MPI thread%s coud be started.\n"
-                          "%s requires one PP tread-MPI thread per GPU; use fewer GPUs%s.",
+                          "%s requires one PP tread-MPI thread per GPU; use fewer GPUs.",
                           ngpu_use, gpu_use_plural,
                           npppn, th_or_proc_plural,
-                          ShortProgram(), bMaxMpiThreadsSet ? "\nor allow more threads to be used" : "");
+                          ShortProgram());
             }
 
             if (!hw_opt->gpu_opt.bUserSet && npppn < ngpu_comp)
@@ -393,12 +392,11 @@ void gmx_check_hw_runconf_consistency(FILE                *fplog,
                    limited the number GPUs used. */
                 md_print_warn(cr, fplog,
                               "NOTE: %d GPU%s were detected, but only %d PP thread-MPI thread%s can be started.\n"
-                              "      %s can use one GPU per PP tread-MPI thread, so only %d GPU%s will be used.%s\n",
+                              "      %s can use one GPU per PP tread-MPI thread, so only %d GPU%s will be used.\n",
                               ngpu_comp, gpu_comp_plural,
                               npppn, th_or_proc_plural,
                               ShortProgram(), npppn,
-                              npppn > 1 ? "s" : "",
-                              bMaxMpiThreadsSet ? "\n      Also, you can allow more threads to be used by increasing GMX_MAX_MPI_THREADS" : "");
+                              npppn > 1 ? "s" : "");
             }
         }