From ef564d0c4690267ebb55df859de29aa93a91cb35 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@inria.fr>
Date: Wed, 16 Sep 2015 12:53:59 +0000
Subject: [PATCH] Assume that there is no outer init in mpi-simulation case
(SMPI doesn't support yet anyway)
---
control/control.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/control/control.c b/control/control.c
index 7a1a754b4..859b5eb24 100644
--- a/control/control.c
+++ b/control/control.c
@@ -97,6 +97,10 @@ int MORSE_InitPar(int ncpus, int ncudas, int nthreads_per_worker)
}
#if defined(CHAMELEON_USE_MPI)
+# if defined(CHAMELEON_SIMULATION)
+ /* Assuming that there was no outer init (which SMPI doesn't support anyway) */
+ morse->mpi_outer_init = 0;
+# else
{
int flag = 0, provided = 0;
MPI_Initialized( &flag );
@@ -105,6 +109,7 @@ int MORSE_InitPar(int ncpus, int ncudas, int nthreads_per_worker)
MPI_Init_thread( NULL, NULL, MPI_THREAD_MULTIPLE, &provided );
}
}
+# endif
#endif
#if defined(CHAMELEON_USE_MAGMA)
magma_init();
--
GitLab