From 1ae29301c1d87077b0d62c06752b5487dfc5de7a Mon Sep 17 00:00:00 2001
From: Philippe SWARTVAGHER <philippe.swartvagher@inria.fr>
Date: Wed, 12 Feb 2020 13:28:27 +0100
Subject: [PATCH] Really use starpu_mpi_init_conf if detected
---
runtime/starpu/control/runtime_control.c | 5 ++---
runtime/starpu/include/chameleon_starpu.h.in | 1 +
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/runtime/starpu/control/runtime_control.c b/runtime/starpu/control/runtime_control.c
index a0f05c045..d455238b7 100644
--- a/runtime/starpu/control/runtime_control.c
+++ b/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);
diff --git a/runtime/starpu/include/chameleon_starpu.h.in b/runtime/starpu/include/chameleon_starpu.h.in
index 223e5d045..7fb15f321 100644
--- a/runtime/starpu/include/chameleon_starpu.h.in
+++ b/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>
--
GitLab