From d5ac5e818f3adbdc33a4e9379c346e60f77c6d8b Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@inria.fr>
Date: Wed, 16 Sep 2015 12:59:07 +0000
Subject: [PATCH] Also make StarPU-MPI initialization assume that in the
simgrid-mpi case we do not have any outer mpi initialization
---
runtime/starpu/control/runtime_control.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/runtime/starpu/control/runtime_control.c b/runtime/starpu/control/runtime_control.c
index f032ac513..16a55300a 100644
--- a/runtime/starpu/control/runtime_control.c
+++ b/runtime/starpu/control/runtime_control.c
@@ -105,7 +105,9 @@ int RUNTIME_init_scheduler( MORSE_context_t *morse, int ncpus, int ncudas, int n
#if defined(CHAMELEON_USE_MPI)
{
int flag = 0;
+#if !defined(CHAMELEON_SIMULATION)
MPI_Initialized( &flag );
+#endif
starpu_mpi_init(NULL, NULL, !flag);
starpu_mpi_comm_rank(MPI_COMM_WORLD, &(morse->my_mpi_rank));
starpu_mpi_comm_size(MPI_COMM_WORLD, &(morse->mpi_comm_size));
--
GitLab