mpi/tests: minor fixes

mpi/tests/gather.c

@@ -29,9 +29,7 @@ int main(int argc, char **argv)
 
 	if (size<3)
 	{
-		if (rank == 0)
-			FPRINTF(stderr, "We need more than 2 processes.\n");
-
+		FPRINTF(stderr, "We need more than 2 processes.\n");
 		MPI_Finalize();
 		return STARPU_TEST_SKIPPED;
 	}
@@ -69,8 +67,7 @@ int main(int argc, char **argv)
 
 	starpu_mpi_shutdown();
 	starpu_shutdown();
-
 	MPI_Finalize();
 
-	return ret;
+	return 0;
 }

mpi/tests/gather2.c

@@ -27,9 +27,7 @@ int main(int argc, char **argv)
 
 	if (size<3)
 	{
-		if (rank == 0)
-			FPRINTF(stderr, "We need more than 2 processes.\n");
-
+		FPRINTF(stderr, "We need more than 2 processes.\n");
 		MPI_Finalize();
 		return STARPU_TEST_SKIPPED;
 	}
@@ -91,8 +89,7 @@ int main(int argc, char **argv)
 
 	starpu_mpi_shutdown();
 	starpu_shutdown();
-
 	MPI_Finalize();
 
-	return ret;
+	return 0;
 }

mpi/tests/insert_task_compute.c

@@ -55,7 +55,7 @@ int test(int rank, int node, int *before, int *after, int task_insert, int data_
 		goto nodata;
 	}
 
-	FPRINTF_MPI(stderr, "Testing with task_insert=%d - data_array=%d - node=%d\n", task_insert, data_array, node);
+	FPRINTF_MPI(stderr, "Testing with node=%d - task_insert=%d - data_array=%d - \n", node, task_insert, data_array);
 
 	for(i=0 ; i<2 ; i++)
 	{
@@ -193,6 +193,7 @@ enodev:
 	}
 
 nodata:
+	MPI_Barrier(MPI_COMM_WORLD);
 	starpu_mpi_shutdown();
 	starpu_shutdown();
 

mpi/tests/mpi_earlyrecv2.c

@@ -202,7 +202,8 @@ int exchange_complex(int rank, int detached)
 
 int main(int argc, char **argv)
 {
-	int ret=0, rank, size;
+	int ret=0, global_ret=0;
+	int rank, size;
 
 	MPI_Init(&argc, &argv);
 	MPI_Comm_rank(MPI_COMM_WORLD, &rank);
@@ -210,9 +211,7 @@ int main(int argc, char **argv)
 
 	if (size%2 != 0)
 	{
-		if (rank == 0)
-			FPRINTF(stderr, "We need a even number of processes.\n");
-
+		FPRINTF(stderr, "We need a even number of processes.\n");
 		MPI_Finalize();
 		return STARPU_TEST_SKIPPED;
 	}
@@ -223,16 +222,22 @@ int main(int argc, char **argv)
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_mpi_init");
 
 	ret = exchange_variable(rank, 0);
-	if (ret == 0)
-		ret = exchange_variable(rank, 1);
-	if (ret == 0)
-		ret = exchange_void(rank, 0);
-	if (ret == 0)
-		ret = exchange_void(rank, 1);
-	if (ret == 0)
-		ret = exchange_complex(rank, 0);
-	if (ret == 0)
-		ret = exchange_complex(rank, 1);
+	if (ret != 0) global_ret = ret;
+
+	ret = exchange_variable(rank, 1);
+	if (ret != 0) global_ret = ret;
+
+	ret = exchange_void(rank, 0);
+	if (ret != 0) global_ret = ret;
+
+	ret = exchange_void(rank, 1);
+	if (ret != 0) global_ret = ret;
+
+	ret = exchange_complex(rank, 0);
+	if (ret != 0) global_ret = ret;
+
+	ret = exchange_complex(rank, 1);
+	if (ret != 0) global_ret = ret;
 
 	starpu_mpi_shutdown();
 	starpu_shutdown();

mpi/tests/mpi_earlyrecv2_sync.c

@@ -207,7 +207,8 @@ int exchange_complex(int rank)
 
 int main(int argc, char **argv)
 {
-	int ret=0, rank, size;
+	int ret=0, global_ret=0;
+	int rank, size;
 
 	MPI_Init(&argc, &argv);
 	MPI_Comm_rank(MPI_COMM_WORLD, &rank);
@@ -215,21 +216,21 @@ int main(int argc, char **argv)
 
 	if (size%2 != 0)
 	{
-		if (rank == 0)
-			FPRINTF(stderr, "We need a even number of processes.\n");
-
+		FPRINTF(stderr, "We need a even number of processes.\n");
 		MPI_Finalize();
 		return STARPU_TEST_SKIPPED;
 	}
 
 	ret = exchange_variable(rank);
-	ret = exchange_variable(rank);
-//	if (ret == 0)
-//	ret = exchange_void(rank);
-//	if (ret == 0)
-//		ret = exchange_complex(rank);
+	if (ret != 0) global_ret = ret;
+
+	ret = exchange_void(rank);
+	if (ret != 0) global_ret = ret;
+
+	ret = exchange_complex(rank);
+	if (ret != 0) global_ret = ret;
 
 	MPI_Finalize();
 
-	return ret;
+	return global_ret;
 }