rename STARPU_MPI in STARPU_MPI_MS + add MPI_MS_TYPE and not use MPI MS slave in a reduction test

include/schedulers/starpu_heteroprio.h

@@ -42,6 +42,7 @@ enum starpu_heteroprio_types
 	STARPU_CUDA_IDX,
 	STARPU_OPENCL_IDX,
 	STARPU_MIC_IDX,
+	STARPU_MPI_MS_IDX,
 	STARPU_SCC_IDX,
 // This will be the number of archs
 	STARPU_NB_TYPES
@@ -54,7 +55,7 @@ static const unsigned starpu_heteroprio_types_to_arch[STARPU_NB_TYPES+1] =
 	STARPU_OPENCL,
 	STARPU_MIC,
 	STARPU_SCC,
-    STARPU_MPI,
+    STARPU_MPI_MS,
 	0
 };
 

include/starpu_task.h

@@ -42,7 +42,7 @@ extern "C"
 #define STARPU_OPENCL	((1ULL)<<6)
 #define STARPU_MIC	((1ULL)<<7)
 #define STARPU_SCC	((1ULL)<<8)
-#define STARPU_MPI	((1ULL)<<9)
+#define STARPU_MPI_MS	((1ULL)<<9)
 
 #define STARPU_CODELET_SIMGRID_EXECUTE	(1<<0)
 #define STARPU_CUDA_ASYNC	(1<<0)

src/core/task.c

@@ -489,7 +489,7 @@ void _starpu_codelet_check_deprecated_fields(struct starpu_codelet *cl)
 		}
 	if (some_impl && is_where_unset)
 	{
-		cl->where |= STARPU_MPI;
+		cl->where |= STARPU_MPI_MS;
 	}
 
 	some_impl = 0;
@@ -513,7 +513,7 @@ void _starpu_codelet_check_deprecated_fields(struct starpu_codelet *cl)
 		}
 	if (some_impl && is_where_unset)
 	{
-		cl->where |= STARPU_MIC|STARPU_SCC|STARPU_MPI;
+		cl->where |= STARPU_MIC|STARPU_SCC|STARPU_MPI_MS;
 	}
 }
 

src/core/topology.c

@@ -945,8 +945,8 @@ _starpu_init_mpi_config (struct _starpu_machine_config *config,
 		config->workers[worker_idx].perf_arch.devices[0].ncores = 1;
 		config->workers[worker_idx].devid = mpi_idx;
 		config->workers[worker_idx].subworkerid = mpicore_id;
-		config->workers[worker_idx].worker_mask = STARPU_MPI;
-		config->worker_mask |= STARPU_MPI;
+		config->workers[worker_idx].worker_mask = STARPU_MPI_MS;
+		config->worker_mask |= STARPU_MPI_MS;
 	}
 
 	topology->nworkers += topology->nmpicores[mpi_idx];

src/core/workers.c

@@ -207,7 +207,7 @@ uint32_t _starpu_worker_exists(struct starpu_task *task)
 		return 1;
 #endif
 #ifdef STARPU_USE_MPI_MASTER_SLAVE
-	if ((task->cl->where & STARPU_MPI) &&
+	if ((task->cl->where & STARPU_MPI_MS) &&
 	    _starpu_worker_exists_and_can_execute(task, STARPU_MPI_WORKER))
 		return 1;
 #endif

tests/datawizard/manual_reduction.c

@@ -175,6 +175,7 @@ int main(int argc, char **argv)
 
 	starpu_conf_init(&conf);
 	conf.nmic = 0;
+	conf.nmpi_ms = 0;
 	conf.nscc = 0;
 
 	variable = INIT_VALUE;