mpi/tests: small fixes

mpi/tests/Makefile.am

@@ -160,8 +160,7 @@ starpu_mpi_TESTS +=				\
 
 if STARPU_USE_MPI_MPI
 starpu_mpi_TESTS +=				\
-	load_balancer \
-	multiple_comms
+	load_balancer
 endif
 endif
 
@@ -219,6 +218,7 @@ noinst_PROGRAMS +=				\
 	insert_task_seq				\
 	insert_task_tags			\
 	multiple_send				\
+	multiple_comms				\
 	mpi_scatter_gather			\
 	mpi_reduction				\
 	user_defined_datatype			\

mpi/tests/multiple_comms.c

@@ -1,10 +1,31 @@
+/* StarPU --- Runtime system for heterogeneous multicore architectures.
+ *
+ * Copyright (C) 2024-2024  University of Bordeaux, CNRS (LaBRI UMR 5800), Inria
+ *
+ * StarPU is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or (at
+ * your option) any later version.
+ *
+ * StarPU is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * See the GNU Lesser General Public License in COPYING.LGPL for more details.
+ */
+
 #include <starpu_mpi.h>
 #include "helper.h"
 
-int main(int argc, char ** argv){
-	//we will only use three processes for now
+int main(int argc, char ** argv)
+{
 	int my_rank, size, rsize;
-	int ret = starpu_mpi_init_conf(&argc, &argv, 1, MPI_COMM_WORLD, NULL);
+	int ret;
+	int mpi_init;
+
+	MPI_INIT_THREAD(&argc, &argv, MPI_THREAD_SERIALIZED, &mpi_init);
+
+	ret = starpu_mpi_init_conf(&argc, &argv, 1, MPI_COMM_WORLD, NULL);
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_mpi_init_conf");
 
 	starpu_mpi_comm_rank(MPI_COMM_WORLD, &my_rank);
@@ -14,39 +35,49 @@ int main(int argc, char ** argv){
 	MPI_Comm_dup(MPI_COMM_WORLD, &new_world);
 	MPI_Comm_set_name(new_world, "application duplicated comm");
 	starpu_mpi_comm_register(new_world);
-	if(size < 2){
+	if(size < 2)
+	{
 		fprintf(stderr, "We need at least 2 processes.\n");
-    starpu_mpi_shutdown();
+		starpu_mpi_shutdown();
+		if (!mpi_init)
+			MPI_Finalize();
 		return STARPU_TEST_SKIPPED;
 	}
+
 	//we want an even number of processes
 	rsize = size%2 != 0 ? size-1 : size;
-	if(my_rank < rsize ){
+	if(my_rank < rsize)
+	{
 		starpu_data_handle_t send_handles[rsize];
 		starpu_data_handle_t recv_handles[rsize];
-
-		int * stabs[rsize];
-		int * rtabs[rsize];
-		for(int i = 0; i < rsize; i++){
+
+		int *stabs[rsize];
+		int *rtabs[rsize];
+		int i;
+		for(i = 0; i < rsize; i++)
+		{
 			stabs[i] = malloc(sizeof(int)*100);
 			rtabs[i] = malloc(sizeof(int)*100);
 		}
-		for(int i = 0; i < 100; i++)
+		for(i = 0; i < 100; i++)
 			stabs[my_rank][i] = my_rank * 100 + i;
-		for(int i = 0; i < rsize; i++){
-			starpu_variable_data_register( send_handles + i, STARPU_MAIN_RAM, (uintptr_t)stabs[i], 100* sizeof(int));
-			starpu_variable_data_register( recv_handles + i, STARPU_MAIN_RAM, (uintptr_t)rtabs[i], 100 *sizeof(int));
+		for(i = 0; i < rsize; i++)
+		{
+			starpu_variable_data_register(send_handles + i, STARPU_MAIN_RAM, (uintptr_t)stabs[i], 100* sizeof(int));
+			starpu_variable_data_register(recv_handles + i, STARPU_MAIN_RAM, (uintptr_t)rtabs[i], 100 *sizeof(int));
 		}
 		starpu_mpi_req reqs[4];
 
-		if(my_rank%2 == 0){
+		if(my_rank%2 == 0)
+		{
 			starpu_mpi_isend(send_handles[my_rank], &reqs[0], (my_rank+1)%rsize, 12, MPI_COMM_WORLD);
 			starpu_mpi_isend(send_handles[my_rank], &reqs[1], my_rank==0?rsize-1:my_rank-1, 12, new_world);
 
 			starpu_mpi_irecv(recv_handles[(my_rank+1)%rsize], &reqs[2], (my_rank+1)%rsize, 13,MPI_COMM_WORLD);
 			starpu_mpi_irecv(recv_handles[my_rank==0?rsize-1:my_rank-1], &reqs[3], my_rank==0?rsize-1:my_rank-1, 13,new_world);
 		}
-		else{
+		else
+		{
 			starpu_mpi_irecv(recv_handles[my_rank==0?rsize-1:my_rank-1], &reqs[0], my_rank==0?rsize-1:my_rank-1, 12, MPI_COMM_WORLD);
 			starpu_mpi_irecv(recv_handles[(my_rank+1)%rsize], &reqs[1], (my_rank+1)%rsize, 12, new_world);
 
@@ -56,7 +87,7 @@ int main(int argc, char ** argv){
 		int nb_req=4;
 		while (nb_req)
 		{
-			int r=0;
+			int r;
 			for(r=0 ; r<4 ; r++)
 			{
 				if (reqs[r])
@@ -74,14 +105,20 @@ int main(int argc, char ** argv){
 				}
 			}
 		}
-		for(int i = 0; i < rsize; i++){
+		for(i = 0; i < rsize; i++)
+		{
 			starpu_data_unregister(send_handles[i]);
 			starpu_data_unregister(recv_handles[i]);
 			free(stabs[i]);
 			free(rtabs[i]);
 		}
 	}
+
 	starpu_mpi_barrier(MPI_COMM_WORLD);
 	starpu_mpi_shutdown();
-	return 0;
+
+	if (!mpi_init)
+		MPI_Finalize();
+
+	return EXIT_SUCCESS;
 }