Merge pull request #1 from boegel/mpich_fixes

code cleanup in toolchain/mpi.py
rjeschmi · Dec 3, 2014 · 2a2cab7 · 2a2cab7
2 parents 29466b1 + 8a40998
commit 2a2cab7
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/easybuild/tools/toolchain/mpi.py b/easybuild/tools/toolchain/mpi.py
@@ -170,13 +170,14 @@ def mpi_cmd_for(self, cmd, nr_ranks):
         params = {'nr_ranks':nr_ranks, 'cmd':cmd}
 
         # different known mpirun commands
+        mpirun_n_cmd = "mpirun -n %(nr_ranks)d %(cmd)s"
         mpi_cmds = {
-            toolchain.OPENMPI: "mpirun -n %(nr_ranks)d %(cmd)s",  # @UndefinedVariable
+            toolchain.OPENMPI: mpirun_n_cmd,  # @UndefinedVariable
             toolchain.QLOGICMPI: "mpirun -H localhost -np %(nr_ranks)d %(cmd)s",  # @UndefinedVariable
             toolchain.INTELMPI: "mpirun %(mpdbf)s %(nodesfile)s -np %(nr_ranks)d %(cmd)s",  # @UndefinedVariable
-            toolchain.MVAPICH2: "mpirun -n %(nr_ranks)d %(cmd)s",  # @UndefinedVariable
-            toolchain.MPICH2: "mpirun -n %(nr_ranks)d %(cmd)s",  # @UndefinedVariable
-            toolchain.MPICH: "mpirun -n %(nr_ranks)d %(cmd)s",  # @UndefinedVariable
+            toolchain.MVAPICH2: mpirun_n_cmd,  # @UndefinedVariable
+            toolchain.MPICH: mpirun_n_cmd,  # @UndefinedVariable
+            toolchain.MPICH2: mpirun_n_cmd,  # @UndefinedVariable
         }
 
         mpi_family = self.mpi_family()