mpi master mode: implement starpu_mpi_ms_register_kernel and starpu_mpi_ms_get_kernel (by renaming internal functions)

include/starpu_mpi_ms.h

@@ -36,5 +36,5 @@ starpu_mpi_ms_kernel_t starpu_mpi_ms_get_kernel(starpu_mpi_ms_func_symbol_t symb
 }
 #endif
 
-#endif /* STARPU_USE_MIC */
-#endif /* __STARPU_MIC_H__ */
+#endif /* STARPU_USE_MPI_MASTER_SLAVE */
+#endif /* __STARPU_MPI_MS_H__ */

src/drivers/mpi/driver_mpi_common.c

@@ -48,9 +48,9 @@ static void _starpu_mpi_set_src_node_id()
                 else if (id_proc == DRIVER_MPI_MASTER_NODE_DEFAULT)
                 {
                         /* Only one node prints the error message. */
-                        _STARPU_DISP("The node you specify to be the master is "
-                                        "greater than the total number of nodes.\n"
-                                        "Taking node %d by default...\n", DRIVER_MPI_MASTER_NODE_DEFAULT);
+                        _STARPU_MSG("The node (%d) you specify to be the master is "
+				    "greater than the total number of nodes (%d). "
+				    "StarPU will use node %d.\n", node_id, nb_proc, DRIVER_MPI_MASTER_NODE_DEFAULT);
                 }
         }
 
@@ -481,7 +481,7 @@ void _starpu_mpi_common_measure_bandwidth_latency(double bandwidth_dtod[STARPU_M
         _STARPU_MALLOC(buf, SIZE_BANDWIDTH);
         memset(buf, 0, SIZE_BANDWIDTH);
 
-        unsigned sender, receiver;
+        int sender, receiver;
         for(sender = 0; sender < nb_proc; sender++)
         {
                 for(receiver = 0; receiver < nb_proc; receiver++)

src/drivers/mpi/driver_mpi_source.c

@@ -136,7 +136,7 @@ int _starpu_mpi_copy_sink_to_sink_async(void *src, unsigned src_node, void *dst,
 }
 
 
-int _starpu_mpi_ms_src_register_kernel(starpu_mpi_ms_func_symbol_t *symbol, const char *func_name)
+int starpu_mpi_ms_register_kernel(starpu_mpi_ms_func_symbol_t *symbol, const char *func_name)
 {
         unsigned int func_name_size = (strlen(func_name) + 1) * sizeof(char);
 
@@ -185,7 +185,7 @@ int _starpu_mpi_ms_src_register_kernel(starpu_mpi_ms_func_symbol_t *symbol, cons
 }
 
 
-starpu_mpi_ms_kernel_t _starpu_mpi_ms_src_get_kernel(starpu_mpi_ms_func_symbol_t symbol)
+starpu_mpi_ms_kernel_t starpu_mpi_ms_get_kernel(starpu_mpi_ms_func_symbol_t symbol)
 {
         int workerid = starpu_worker_get_id();
 
@@ -232,9 +232,9 @@ starpu_mpi_ms_kernel_t _starpu_mpi_ms_src_get_kernel_from_codelet(struct starpu_
 		{
 			starpu_mpi_ms_func_symbol_t symbol;
 
-			_starpu_mpi_ms_src_register_kernel(&symbol, func_name);
+			starpu_mpi_ms_register_kernel(&symbol, func_name);
 
-			kernel = _starpu_mpi_ms_src_get_kernel(symbol);
+			kernel = starpu_mpi_ms_get_kernel(symbol);
 		}
 	}
 	STARPU_ASSERT_MSG(kernel, "when STARPU_MPI_MS is defined in 'where', mpi_ms_funcs or cpu_funcs_name has to be defined and the function be non-static");
@@ -265,9 +265,9 @@ void(* _starpu_mpi_ms_src_get_kernel_from_job(const struct _starpu_mp_node *node
                 {
                         starpu_mpi_ms_func_symbol_t symbol;
 
-                        _starpu_mpi_ms_src_register_kernel(&symbol, func_name);
+                        starpu_mpi_ms_register_kernel(&symbol, func_name);
 
-                        kernel = _starpu_mpi_ms_src_get_kernel(symbol);
+                        kernel = starpu_mpi_ms_get_kernel(symbol);
                 }
         }
         STARPU_ASSERT(kernel);