rename variable *_mpi_* to *_mpi_ms_*

include/starpu.h

@@ -107,8 +107,8 @@ struct starpu_conf
 	unsigned use_explicit_workers_scc_deviceid;
 	unsigned workers_scc_deviceid[STARPU_NMAXWORKERS];
 
-	unsigned use_explicit_workers_mpi_deviceid;
-	unsigned workers_mpi_deviceid[STARPU_NMAXWORKERS];
+	unsigned use_explicit_workers_mpi_ms_deviceid;
+	unsigned workers_mpi_ms_deviceid[STARPU_NMAXWORKERS];
 
 	int bus_calibrate;
 	int calibrate;

src/core/topology.c

@@ -405,7 +405,7 @@ static inline int _starpu_get_next_mpi_deviceid(struct _starpu_machine_config *c
 {
 	unsigned i = ((config->current_mpi_deviceid++) % config->topology.nmpidevices);
 
-	return (int)config->topology.workers_mpi_deviceid[i];
+	return (int)config->topology.workers_mpi_ms_deviceid[i];
 }
 
 static void

src/core/workers.c

@@ -1026,7 +1026,7 @@ int starpu_conf_init(struct starpu_conf *conf)
 	conf->use_explicit_workers_opencl_gpuid = 0; /* TODO */
 	conf->use_explicit_workers_mic_deviceid = 0; /* TODO */
 	conf->use_explicit_workers_scc_deviceid = 0; /* TODO */
-	conf->use_explicit_workers_mpi_deviceid = 0; /* TODO */
+	conf->use_explicit_workers_mpi_ms_deviceid = 0; /* TODO */
 
 	conf->single_combined_worker = starpu_get_env_number("STARPU_SINGLE_COMBINED_WORKER");
 	if (conf->single_combined_worker == -1)

src/core/workers.h

@@ -306,7 +306,7 @@ struct _starpu_machine_topology
 	 */
 	unsigned workers_scc_deviceid[STARPU_NMAXWORKERS];
 
-	unsigned workers_mpi_deviceid[STARPU_NMAXWORKERS];
+	unsigned workers_mpi_ms_deviceid[STARPU_NMAXWORKERS];
 };
 
 struct _starpu_machine_config