Browse Source

simgrid: Keep mpi process creation without actor data as it was before, for compatibility

Samuel Thibault 5 years ago
parent
commit
56c9af17fd
2 changed files with 6 additions and 2 deletions
  1. 3 1
      mpi/src/mpi/starpu_mpi_mpi.c
  2. 3 1
      mpi/src/nmad/starpu_mpi_nmad.c

+ 3 - 1
mpi/src/mpi/starpu_mpi_mpi.c

@@ -1150,8 +1150,10 @@ static void *_starpu_mpi_progress_thread_func(void *arg)
 	int i;
 	for (i = 0; i < *(argc_argv->argc); i++)
 		argv_cpy[i] = strdup((*(argc_argv->argv))[i]);
+#ifdef HAVE_SG_ACTOR_DATA
 	_starpu_simgrid_actor_create("main", smpi_simulated_main_, _starpu_simgrid_get_host_by_name("MAIN"), *(argc_argv->argc), argv_cpy);
-#ifndef HAVE_SG_ACTOR_DATA
+#else
+	MSG_process_create_with_arguments("main", smpi_simulated_main_, NULL, _starpu_simgrid_get_host_by_name("MAIN"), *(argc_argv->argc), argv_cpy);
 	/* And set TSD for us */
 	void **tsd;
 	_STARPU_CALLOC(tsd, MAX_TSD + 1, sizeof(void*));

+ 3 - 1
mpi/src/nmad/starpu_mpi_nmad.c

@@ -503,8 +503,10 @@ static void *_starpu_mpi_progress_thread_func(void *arg)
 	int i;
 	for (i = 0; i < *(argc_argv->argc); i++)
 		argv_cpy[i] = strdup((*(argc_argv->argv))[i]);
+#ifdef HAVE_SG_ACTOR_DATA
 	_starpu_simgrid_actor_create("main", smpi_simulated_main_, _starpu_simgrid_get_host_by_name("MAIN"), *(argc_argv->argc), argv_cpy);
-#ifndef HAVE_SG_ACTOR_DATA
+#else
+	MSG_process_create_with_arguments("main", smpi_simulated_main_, NULL, _starpu_simgrid_get_host_by_name("MAIN"), *(argc_argv->argc), argv_cpy);
 	/* And set TSD for us */
 	void **tsd;
 	_STARPU_CALLOC(tsd, MAX_TSD + 1, sizeof(void*));