merge trunk

mpi/Makefile.am

@@ -26,6 +26,13 @@ versinclude_HEADERS = 					\
 	include/starpu_mpi_lb.h				\
 	include/fstarpu_mpi_mod.f90
 
+recheck:
+	RET=0 ; \
+	for i in $(SUBDIRS) ; do \
+		make -C $$i recheck || RET=1 ; \
+	done ; \
+	exit $$RET
+
 showcheck:
 	RET=0 ; \
 	for i in $(SUBDIRS) ; do \

nmad/Makefile.am

@@ -1,7 +1,7 @@
 # StarPU --- Runtime system for heterogeneous multicore architectures.
 #
-# Copyright (C) 2009-2013  Université de Bordeaux
-# Copyright (C) 2010, 2011, 2012  Centre National de la Recherche Scientifique
+# Copyright (C) 2009-2013, 2015  Université de Bordeaux
+# Copyright (C) 2010, 2011, 2012, 2013, 2017  CNRS
 #
 # StarPU is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -17,11 +17,19 @@
 SUBDIRS=src tests examples
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libstarpumpi.pc starpumpi-1.0.pc starpumpi-1.1.pc  starpumpi-1.2.pc starpumpi-1.3.pc
+pkgconfig_DATA = libstarpumpi.pc starpumpi-1.0.pc starpumpi-1.1.pc starpumpi-1.2.pc starpumpi-1.3.pc
 
 versincludedir = $(includedir)/starpu/$(STARPU_EFFECTIVE_VERSION)
 versinclude_HEADERS = 					\
-	include/starpu_mpi.h
+	include/starpu_mpi.h				\
+	include/fstarpu_mpi_mod.f90
+
+recheck:
+	RET=0 ; \
+	for i in $(SUBDIRS) ; do \
+		make -C $$i recheck || RET=1 ; \
+	done ; \
+	exit $$RET
 
 showcheck:
 	RET=0 ; \

nmad/examples/Makefile.am

@@ -60,9 +60,9 @@ else
 TESTS_ENVIRONMENT 	=	STARPU_WORKERS_NOBIND=1 STARPU_NCPU=4 top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)" $(MPI) $(LOADER_BIN)
 endif
 
-#if STARPU_MPI_CHECK
+if STARPU_MPI_CHECK
 TESTS			=	$(starpu_mpi_EXAMPLES)
-#endif
+endif
 
 check_PROGRAMS = $(LOADER) $(starpu_mpi_EXAMPLES)
 starpu_mpi_EXAMPLES =

nmad/tests/Makefile.am

@@ -57,9 +57,9 @@ else
 TESTS_ENVIRONMENT 	=	STARPU_WORKERS_NOBIND=1 STARPU_NCPU=4 top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)" $(MPI) $(LOADER_BIN)
 endif
 
-#if STARPU_MPI_CHECK
+if STARPU_MPI_CHECK
 TESTS			=	$(starpu_mpi_TESTS)
-#endif
+endif
 
 check_PROGRAMS = $(LOADER) $(starpu_mpi_TESTS)