factorize some MPI MASTER-SLAVE variables

examples/Makefile.am

@@ -179,17 +179,16 @@ LOADER_BIN		=	$(top_builddir)/examples/loader-cross.sh
 endif
 
 if STARPU_USE_MPI_MASTER_SLAVE
-MPI 			= $(MPIEXEC) $(MPIEXEC_ARGS) -np 4
-LOADER_BIN2		= $(MPI) $(LOADER_BIN)
+LOADER_BIN2		= $(MPI_LAUNCHER) $(LOADER_BIN)
 else
 LOADER_BIN2		= $(LOADER_BIN)
 endif
 
 if STARPU_HAVE_AM111
-TESTS_ENVIRONMENT	=	top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)"
+TESTS_ENVIRONMENT	=	$(MPI_RUN_ARGS) top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)"
 LOG_COMPILER		=	$(LOADER_BIN2)
 else
-TESTS_ENVIRONMENT	=	top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)" $(LOADER_BIN2)
+TESTS_ENVIRONMENT	=	$(MPI_RUN_ARGS) top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)" $(LOADER_BIN2)
 endif
 
 endif

examples/stencil/Makefile.am

@@ -90,10 +90,10 @@ MPI = $(MPIEXEC) $(MPIEXEC_ARGS) -np 4
 endif
 
 if STARPU_HAVE_AM111
-TESTS_ENVIRONMENT	=	top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)"
+TESTS_ENVIRONMENT	=	$(MPI_RUN_ARGS) top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)"
 LOG_COMPILER		=	$(MPI) $(LOADER_BIN)
 else
-TESTS_ENVIRONMENT	=	top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)" $(MPI) $(LOADER_BIN)
+TESTS_ENVIRONMENT	=	$(MPI_RUN_ARGS) top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)" $(MPI) $(LOADER_BIN)
 endif
 
 endif

starpu.mk

@@ -13,6 +13,22 @@
 #
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 
+
+if STARPU_USE_MPI_MASTER_SLAVE
+if STARPU_QUICK_CHECK
+export MPIEXEC_TIMEOUT=60
+else 
+if STARPU_LONG_CHECK
+export MPIEXEC_TIMEOUT=1800
+else
+export MPIEXEC_TIMEOUT=300
+endif
+endif
+
+MPI_LAUNCHER 			= $(MPIEXEC)  $(MPIEXEC_ARGS) -np 4
+MPI_RUN_ARGS			= STARPU_WORKERS_NOBIND=1 STARPU_NCPU=4
+endif
+
 showcheck:
 	-cat $(TEST_LOGS) /dev/null
 	@! grep -q "ERROR: AddressSanitizer: " $(TEST_LOGS) /dev/null

tests/Makefile.am

@@ -108,19 +108,7 @@ LOADER_BIN		=	$(top_builddir)/tests/loader-cross.sh
 endif
 
 if STARPU_USE_MPI_MASTER_SLAVE
-if STARPU_QUICK_CHECK
-export MPIEXEC_TIMEOUT=60
-else 
-if STARPU_LONG_CHECK
-export MPIEXEC_TIMEOUT=1800
-else
-export MPIEXEC_TIMEOUT=300
-endif
-endif
-
-MPI 			= $(MPIEXEC)  $(MPIEXEC_ARGS) -np 4
-LOADER_BIN2		= $(MPI) $(LOADER_BIN)
-MPI_RUN_ARGS		= STARPU_WORKERS_NOBIND=1 STARPU_NCPU=4
+LOADER_BIN2		= $(MPI_LAUNCHER) $(LOADER_BIN)
 else
 LOADER_BIN2		= $(LOADER_BIN)
 endif

tools/Makefile.am

@@ -192,9 +192,7 @@ LOADER_BIN		=	$(top_builddir)/tests/loader-cross.sh
 endif
 
 if STARPU_USE_MPI_MASTER_SLAVE 
-MPI		= $(MPIEXEC)  $(MPIEXEC_ARGS) -np 4
-LOADER_BIN2	= $(MPI) $(LOADER_BIN)
-MPI_RUN_ARGS	= STARPU_WORKERS_NOBIND=1 STARPU_NCPU=4
+LOADER_BIN2	= $(MPI_LAUNCHER) $(LOADER_BIN)
 else
 LOADER_BIN2	= $(LOADER_BIN)
 endif