Merge branch 'fix/starpu_detect_mpi_init_conf' into 'master'

Really use starpu_mpi_init_conf if detected

See merge request !193

runtime/starpu/control/runtime_control.c

@@ -44,7 +44,7 @@ static int chameleon_starpu_init( starpu_conf_t *conf )
         starpu_fxt_autostart_profiling(0);
 #endif
 
-#  ifdef HAVE_STARPU_MPI_INIT_CONF
+#  if defined(HAVE_STARPU_MPI_INIT_CONF)
         hres = starpu_mpi_init_conf(NULL, NULL, !flag, MPI_COMM_WORLD, conf);
 #  else
         hres = starpu_init(conf);
@@ -52,9 +52,8 @@ static int chameleon_starpu_init( starpu_conf_t *conf )
             return hres;
         }
         starpu_mpi_init(NULL, NULL, !flag);
-    }
 #  endif
-
+    }
 #else
 
     hres = starpu_init(conf);

runtime/starpu/include/chameleon_starpu.h.in

@@ -35,6 +35,7 @@
 #cmakedefine HAVE_STARPU_MPI_COMM_RANK
 #cmakedefine HAVE_STARPU_MPI_CACHED_RECEIVE
 #cmakedefine HAVE_STARPU_MPI_COMM_GET_ATTR
+#cmakedefine HAVE_STARPU_MPI_INIT_CONF
 
 #if defined(CHAMELEON_USE_MPI)
 #include <starpu_mpi.h>