Bladeren bron

When we check examples, use 3 slaves

Corentin Salingue 8 jaren geleden
bovenliggende
commit
d1f8acc04e
2 gewijzigde bestanden met toevoegingen van 12 en 4 verwijderingen
  1. 6 2
      examples/Makefile.am
  2. 6 2
      examples/stencil/Makefile.am

+ 6 - 2
examples/Makefile.am

@@ -176,11 +176,15 @@ LOADER			=
 LOADER_BIN		=	$(top_builddir)/examples/loader-cross.sh
 endif
 
+if STARPU_USE_MPI_MASTER_SLAVE
+MPI = $(MPIEXEC) $(MPIEXEC_ARGS) -np 4
+endif
+
 if STARPU_HAVE_AM111
 TESTS_ENVIRONMENT	=	top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)"
-LOG_COMPILER		=	$(LOADER_BIN)
+LOG_COMPILER		=	$(MPI) $(LOADER_BIN)
 else
-TESTS_ENVIRONMENT	=	top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)" $(LOADER_BIN)
+TESTS_ENVIRONMENT	=	top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)" $(MPI) $(LOADER_BIN)
 endif
 
 endif

+ 6 - 2
examples/stencil/Makefile.am

@@ -79,11 +79,15 @@ LOADER			=
 LOADER_BIN		=	$(top_builddir)/examples/stencil/loader-cross.sh
 endif
 
+if STARPU_USE_MPI_MASTER_SLAVE
+MPI = $(MPIEXEC) $(MPIEXEC_ARGS) -np 4
+endif
+
 if STARPU_HAVE_AM111
 TESTS_ENVIRONMENT	=	top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)"
-LOG_COMPILER		=	$(LOADER_BIN)
+LOG_COMPILER		=	$(MPI) $(LOADER_BIN)
 else
-TESTS_ENVIRONMENT	=	top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)" $(LOADER_BIN)
+TESTS_ENVIRONMENT	=	top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)" $(MPI) $(LOADER_BIN)
 endif
 
 endif