mpi: communication statistics can only be enabled at execution time by setting the environment variable STARPU_COMM_STATS

ChangeLog

@@ -36,7 +36,7 @@ New features:
   * SOCL
         - Manual mapping of commands on specific devices is now possible
   * New interface: COO matrix.
-  * Communication statistics for MPI can also be enabled at execution
+  * Communication statistics for MPI can only be enabled at execution
     time by defining the environment variable STARPU_COMM_STATS
 
 Changes:

configure.ac

@@ -1126,18 +1126,6 @@ if test x$use_mpi = xyes; then
 	AC_DEFINE(STARPU_USE_MPI,[],[whether the StarPU MPI library is available])
 fi
 
-AC_MSG_CHECKING(whether communication statistics should be generated)
-AC_ARG_ENABLE(comm-stats, [AS_HELP_STRING([--enable-comm-stats],
-			[enable communication statistics (only valid with the StarPU MPI library])],
-			enable_comm_stats=$enableval, enable_comm_stats=no)
-AC_MSG_RESULT($enable_comm_stats)
-AC_SUBST(STATS, $enable_comm_stats)
-AC_SUBST(STARPU_COMM_STATS, $enable_comm_stats)
-
-if test x$enable_comm_stats = xyes; then
-        AC_DEFINE(STARPU_COMM_STATS, [1], [enable communication statistics])
-fi
-
 ###############################################################################
 #                                                                             #
 #                               StarPU-Top                                    #

doc/chapters/configuration.texi

@@ -167,11 +167,6 @@ enabled when the GCC compiler provides a plug-in support.
 Use the @command{mpicc} compiler at @var{path}, for starpumpi
 (@pxref{StarPU MPI support}).
 
-@item --enable-comm-stats
-@anchor{enable-comm-stats}
-Enable communication statistics for starpumpi (@pxref{StarPU MPI
-support}).
-
 @end table
 
 @node Advanced configuration
@@ -418,8 +413,7 @@ of the libOpenCL.so file of the OCL ICD implementation.
 @item @code{STARPU_COMM_STATS}
 Communication statistics for starpumpi (@pxref{StarPU MPI support})
 will be enabled when the environment variable @code{STARPU_COMM_STATS}
-is defined. The statistics can also be enabled by configuring StarPU
-with the option @code{--enable-comm-stats} (@pxref{enable-comm-stats}).
+is defined to an value other than 0.
 
 @end table
 

mpi/src/starpu_mpi_stats.c

@@ -27,19 +27,15 @@ static int stats_enabled=0;
 
 void _starpu_mpi_comm_amounts_init(MPI_Comm comm)
 {
-#ifdef STARPU_COMM_STATS
-	stats_enabled = 1;
-#else
 	stats_enabled = starpu_get_env_number("STARPU_COMM_STATS");
 	if (stats_enabled == -1)
 	{
 		stats_enabled = 0;
 	}
-#endif /* STARPU_COMM_STATS */
 
 	if (stats_enabled == 0) return;
 
-	if (!getenv("STARPU_SILENT")) fprintf(stderr,"Warning: StarPU was configured with --enable-comm-stats or is executed with STARPU_COMM_STATS=1, which slows down a bit\n");
+	if (!getenv("STARPU_SILENT")) fprintf(stderr,"Warning: StarPU is executed with STARPU_COMM_STATS=1, which slows down a bit\n");
 
 	MPI_Comm_size(comm, &world_size);
 	_STARPU_MPI_DEBUG("allocating for %d nodes\n", world_size);