Drop now-spurious starpu_shutdown calls

doc/doxygen/chapters/410_mpi_support.doxy

@@ -186,7 +186,6 @@ int main(int argc, char **argv)
     starpu_task_wait_for_all();
 
     starpu_mpi_shutdown();
-    starpu_shutdown();
 
     if (rank == last_rank)
     {

mpi/examples/comm/comm.c

@@ -146,7 +146,6 @@ int main(int argc, char **argv)
 	}
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 	MPI_Comm_free(&newcomm);
         MPI_Finalize();
 	return 0;

mpi/examples/comm/mix_comm.c

@@ -178,7 +178,6 @@ int main(int argc, char **argv)
 	starpu_data_unregister(data[2]);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 	MPI_Comm_free(&newcomm);
         MPI_Finalize();
 	return 0;

mpi/examples/complex/mpi_complex.c

@@ -58,7 +58,6 @@ int main(int argc, char **argv)
 				fprintf(stderr, "We need at least 1 CPU.\n");
 		}
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		return 77;
 	}
 
@@ -106,7 +105,6 @@ int main(int argc, char **argv)
 	starpu_data_unregister(handle2);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	return (rank == 0) ? !compare : 0;
 }

mpi/examples/matrix_decomposition/mpi_cholesky.c

@@ -47,7 +47,6 @@ int main(int argc, char **argv)
 			FPRINTF(stderr, "We need at least 1 CPU or CUDA worker.\n");
 		}
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		return STARPU_TEST_SKIPPED;
 	}
 
@@ -58,6 +57,7 @@ int main(int argc, char **argv)
 
 	dw_cholesky(bmat, size/nblocks, rank, nodes, &timing, &flops);
 
+	starpu_cublas_shutdown();
 	starpu_mpi_shutdown();
 
 #ifndef STARPU_SIMGRID
@@ -67,8 +67,6 @@ int main(int argc, char **argv)
 #endif
 
 	matrix_free(&bmat, rank, nodes, 1);
-	starpu_cublas_shutdown();
-	starpu_shutdown();
 
 #ifndef STARPU_SIMGRID
 	assert(correctness);

mpi/examples/matrix_decomposition/mpi_cholesky_distributed.c

@@ -46,11 +46,10 @@ int main(int argc, char **argv)
 
 	dw_cholesky(bmat, size/nblocks, rank, nodes, &timing, &flops);
 
+	starpu_cublas_shutdown();
 	starpu_mpi_shutdown();
 
 	matrix_free(&bmat, rank, nodes, 0);
-	starpu_cublas_shutdown();
-	starpu_shutdown();
 
 	if (rank == 0)
 	{

mpi/examples/matrix_mult/mm.c

@@ -304,7 +304,6 @@ int main(int argc, char *argv[])
 	{
 		FPRINTF(stderr, "We need at least 1 CPU worker.\n");
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		return STARPU_TEST_SKIPPED;
 	}
 
@@ -383,7 +382,6 @@ int main(int argc, char *argv[])
 	}
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 	return 0;
 }
 

mpi/examples/mpi_lu/plu_example.c

@@ -592,7 +592,6 @@ int main(int argc, char **argv)
 
 	starpu_cublas_shutdown();
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 #if 0
 	MPI_Finalize();

mpi/examples/mpi_lu/plu_implicit_example.c

@@ -364,7 +364,6 @@ int main(int argc, char **argv)
 
 	starpu_cublas_shutdown();
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	return 0;
 }

mpi/examples/mpi_lu/plu_outofcore_example.c

@@ -398,7 +398,6 @@ int main(int argc, char **argv)
 
 	starpu_cublas_shutdown();
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	return 0;
 }

mpi/examples/stencil/stencil5.c

@@ -111,7 +111,6 @@ int main(int argc, char **argv)
 	{
 		FPRINTF(stderr, "We need at least 1 CPU worker.\n");
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		return 77;
 	}
 
@@ -253,7 +252,6 @@ int main(int argc, char **argv)
 	}
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	if (display)
 	{

mpi/examples/stencil/stencil5_lb.c

@@ -161,14 +161,12 @@ int main(int argc, char **argv)
 	{
 		FPRINTF(stderr, "Only works with 2 nodes\n");
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		return 77;
 	}
 	if (starpu_cpu_worker_get_count() == 0)
 	{
 		FPRINTF(stderr, "We need at least 1 CPU worker.\n");
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		return 77;
 	}
 
@@ -275,7 +273,6 @@ int main(int argc, char **argv)
 	}
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	if (display)
 	{

mpi/examples/user_datatype/user_datatype.c

@@ -46,7 +46,6 @@ int main(int argc, char **argv)
 				fprintf(stderr, "We need at least 1 CPU.\n");
 		}
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		return 77;
 	}
 
@@ -105,7 +104,6 @@ int main(int argc, char **argv)
 	starpu_data_unregister(handle1);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	if (rank == 0)
 	{

mpi/tests/block_interface.c

@@ -44,7 +44,6 @@ int main(int argc, char **argv)
 			FPRINTF(stderr, "We need at least 2 processes.\n");
 
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		MPI_Finalize();
 		return STARPU_TEST_SKIPPED;
 	}
@@ -141,7 +140,6 @@ int main(int argc, char **argv)
 		free(block);
 	}
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	if (!mpi_init)
 		MPI_Finalize();

mpi/tests/block_interface_pinned.c

@@ -44,7 +44,6 @@ int main(int argc, char **argv)
 			FPRINTF(stderr, "We need at least 2 processes.\n");
 
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		if (!mpi_init)
 			MPI_Finalize();
 		return STARPU_TEST_SKIPPED;
@@ -146,7 +145,6 @@ int main(int argc, char **argv)
 	fflush(stdout);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	if (!mpi_init)
 		MPI_Finalize();

mpi/tests/broadcast.c

@@ -94,7 +94,6 @@ int main(int argc, char **argv)
 	starpu_data_unregister(handle);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 	if (!mpi_init)
 		MPI_Finalize();
 

mpi/tests/cache.c

@@ -109,7 +109,6 @@ int main(int argc, char **argv)
 
 skip:
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	return starpu_mpi_cache_is_enabled() == 0 ? STARPU_TEST_SKIPPED : 0;
 }

mpi/tests/cache_disable.c

@@ -96,7 +96,6 @@ int main(int argc, char **argv)
 
 skip:
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	return cache == 0 ? STARPU_TEST_SKIPPED : 0;
 }

mpi/tests/callback.c

@@ -113,7 +113,6 @@ int main(int argc, char **argv)
 	STARPU_ASSERT_MSG(y == expected_y, "y should be equal to %d and not %d\n", expected_y, y);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	return EXIT_SUCCESS;
 }

mpi/tests/datatypes.c

@@ -594,7 +594,6 @@ int main(int argc, char **argv)
 			FPRINTF(stderr, "We need at least 2 processes.\n");
 
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		if (!mpi_init)
 			MPI_Finalize();
 		return STARPU_TEST_SKIPPED;
@@ -609,7 +608,6 @@ int main(int argc, char **argv)
 	exchange_csr(rank, &error);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	if (!mpi_init)
 		MPI_Finalize();

mpi/tests/driver.c

@@ -41,7 +41,6 @@ int main(int argc, char **argv)
 	{
 		FPRINTF_MPI(stderr, "We need a even number of processes.\n");
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		if (!mpi_init)
 			MPI_Finalize();
 		return STARPU_TEST_SKIPPED;
@@ -124,7 +123,6 @@ int main(int argc, char **argv)
 		starpu_data_unregister(tab_handle[i]);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	if (!mpi_init)
 		MPI_Finalize();

mpi/tests/early_request.c

@@ -200,7 +200,6 @@ int main(int argc, char * argv[])
 		if (mpi_rank == 0)
 			FPRINTF(stderr, "We need at least 1 CPU worker.\n");
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		if (!mpi_init)
 			MPI_Finalize();
 		return STARPU_TEST_SKIPPED;
@@ -239,7 +238,6 @@ int main(int argc, char * argv[])
 	free(el_right);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	if (!mpi_init)
 		MPI_Finalize();

mpi/tests/gather.c

@@ -37,7 +37,6 @@ int main(int argc, char **argv)
 	{
 		FPRINTF(stderr, "We need more than 2 processes.\n");
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		if (!mpi_init)
 			MPI_Finalize();
 		return STARPU_TEST_SKIPPED;
@@ -70,7 +69,6 @@ int main(int argc, char **argv)
 	}
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 	if (!mpi_init)
 		MPI_Finalize();
 

mpi/tests/gather2.c

@@ -35,7 +35,6 @@ int main(int argc, char **argv)
 	{
 		FPRINTF(stderr, "We need more than 2 processes.\n");
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		if (!mpi_init)
 			MPI_Finalize();
 		return STARPU_TEST_SKIPPED;
@@ -92,7 +91,6 @@ int main(int argc, char **argv)
 	}
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 	if (!mpi_init)
 		MPI_Finalize();
 

mpi/tests/insert_task.c

@@ -124,7 +124,6 @@ int main(int argc, char **argv)
 		}
 	}
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 #if 0
 	for(x = 0; x < X; x++)

mpi/tests/insert_task_block.c

@@ -148,7 +148,6 @@ int main(int argc, char **argv)
 	}
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 #if 1
 	for(x = 0; x < SIZE; x++)

mpi/tests/insert_task_compute.c

@@ -204,7 +204,6 @@ nodata:
 	barrier_ret = MPI_Barrier(MPI_COMM_WORLD);
 	STARPU_ASSERT(barrier_ret == MPI_SUCCESS);
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	return ret == -ENODEV ? ret : !ok;
 }

mpi/tests/insert_task_count.c

@@ -73,7 +73,6 @@ int main(int argc, char **argv)
 				FPRINTF(stderr, "We need at least 1 CPU or CUDA worker.\n");
 		}
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		if (!mpi_init)
 			MPI_Finalize();
 		return STARPU_TEST_SKIPPED;
@@ -107,7 +106,6 @@ int main(int argc, char **argv)
 	starpu_task_wait_for_all();
 	starpu_data_unregister(token_handle);
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	FPRINTF_MPI(stderr, "Final value for token %d\n", token);
 

mpi/tests/insert_task_dyn_handles.c

@@ -76,7 +76,6 @@ int main(int argc, char **argv)
 		if (rank == 0)
 			FPRINTF(stderr, "We need at least 1 CPU worker.\n");
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		return STARPU_TEST_SKIPPED;
 	}
 
@@ -166,7 +165,6 @@ enodev:
 	}
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 	if (!mpi_init)
 		MPI_Finalize();
 	return ret;

mpi/tests/insert_task_node_choice.c

@@ -105,7 +105,6 @@ int main(int argc, char **argv)
 
 end:
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	return 0;
 }

mpi/tests/insert_task_owner.c

@@ -91,7 +91,6 @@ int main(int argc, char **argv)
 		if (rank == 0)
 			FPRINTF(stderr, "We need at least 1 CPU worker.\n");
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		return STARPU_TEST_SKIPPED;
 	}
 
@@ -181,7 +180,6 @@ int main(int argc, char **argv)
 
 end:
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	return 0;
 }

mpi/tests/insert_task_owner2.c

@@ -61,7 +61,6 @@ int main(int argc, char **argv)
 		if (rank == 0)
 			FPRINTF(stderr, "We need at least 1 CPU worker.\n");
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		return STARPU_TEST_SKIPPED;
 	}
 
@@ -132,7 +131,6 @@ int main(int argc, char **argv)
 
 	free(values);
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	return (rank == 0) ? ret : 0;
 }

mpi/tests/insert_task_owner_data.c

@@ -56,7 +56,6 @@ int main(int argc, char **argv)
 		if (rank == 0)
 			FPRINTF(stderr, "We need at least 1 CPU worker.\n");
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		return STARPU_TEST_SKIPPED;
 	}
 
@@ -112,7 +111,6 @@ int main(int argc, char **argv)
 	starpu_data_unregister(data_handles[1]);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	return ret;
 }

mpi/tests/insert_task_recv_cache.c

@@ -116,7 +116,6 @@ void test_cache(int rank, char *enabled, size_t *comm_amount)
 
 	starpu_mpi_comm_amounts_retrieve(comm_amount);
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 }
 
 int main(int argc, char **argv)

mpi/tests/insert_task_sent_cache.c

@@ -123,7 +123,6 @@ void test_cache(int rank, char *enabled, size_t *comm_amount)
 
 	starpu_mpi_comm_amounts_retrieve(comm_amount);
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 }
 
 int main(int argc, char **argv)

mpi/tests/insert_task_seq.c

@@ -116,7 +116,6 @@ void dotest(int rank, int size, char *enabled)
 	}
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 }
 
 int main(int argc, char **argv)

mpi/tests/load_balancer.c

@@ -66,7 +66,6 @@ int main(int argc, char **argv)
 	starpu_mpi_lb_shutdown();
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 	if (!mpi_init)
 		MPI_Finalize();
 

mpi/tests/matrix.c

@@ -60,7 +60,6 @@ int main(int argc, char **argv)
 		if (rank == 0)
 			FPRINTF(stderr, "We need at least 1 CPU worker.\n");
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		return STARPU_TEST_SKIPPED;
 	}
 
@@ -129,7 +128,6 @@ int main(int argc, char **argv)
 	starpu_data_unregister(data_Y);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	FPRINTF(stdout, "[%d] Y=%u\n", rank, Y);
 

mpi/tests/matrix2.c

@@ -69,7 +69,6 @@ int main(int argc, char **argv)
 				FPRINTF(stderr, "We need at least 1 CPU worker.\n");
 		}
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		if (!mpi_init)
 			MPI_Finalize();
 		return STARPU_TEST_SKIPPED;
@@ -135,7 +134,6 @@ int main(int argc, char **argv)
 	}
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	FPRINTF(stdout, "[%d] X[%d]=%u\n", rank, N-1, X[N-1]);
 

mpi/tests/mpi_detached_tag.c

@@ -50,7 +50,6 @@ int main(int argc, char **argv)
 			FPRINTF(stderr, "We need a even number of processes.\n");
 
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		if (!mpi_init)
 			MPI_Finalize();
 		return STARPU_TEST_SKIPPED;
@@ -84,7 +83,6 @@ int main(int argc, char **argv)
 	free(tab);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	if (!mpi_init)
 		MPI_Finalize();

mpi/tests/mpi_earlyrecv.c

@@ -40,7 +40,6 @@ int main(int argc, char **argv)
 	{
 		FPRINTF_MPI(stderr, "We need a even number of processes.\n");
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		if (!mpi_init)
 			MPI_Finalize();
 		return STARPU_TEST_SKIPPED;
@@ -123,7 +122,6 @@ int main(int argc, char **argv)
 		starpu_data_unregister(tab_handle[i]);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	if (!mpi_init)
 		MPI_Finalize();

mpi/tests/mpi_earlyrecv2.c

@@ -227,7 +227,6 @@ int main(int argc, char **argv)
 	{
 		FPRINTF(stderr, "We need a even number of processes.\n");
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		if (!mpi_init)
 			MPI_Finalize();
 		return STARPU_TEST_SKIPPED;
@@ -258,7 +257,6 @@ int main(int argc, char **argv)
 		global_ret = ret;
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	if (!mpi_init)
 		MPI_Finalize();

mpi/tests/mpi_earlyrecv2_sync.c

@@ -120,7 +120,6 @@ int exchange_variable(int rank)
 		starpu_data_unregister(tab_handle[i]);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	return ret;
 }
@@ -150,7 +149,6 @@ int exchange_void(int rank)
 		starpu_data_unregister(tab_handle[i]);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	return ret;
 }
@@ -199,7 +197,6 @@ int exchange_complex(int rank)
 		starpu_data_unregister(handle[i]);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	return ret;
 }

mpi/tests/mpi_irecv.c

@@ -48,7 +48,6 @@ int main(int argc, char **argv)
 			FPRINTF(stderr, "We need a even number of processes.\n");
 
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		if (!mpi_init)
 			MPI_Finalize();
 		return STARPU_TEST_SKIPPED;
@@ -81,7 +80,6 @@ int main(int argc, char **argv)
 	free(tab);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	if (!mpi_init)
 		MPI_Finalize();

mpi/tests/mpi_irecv_detached.c

@@ -65,7 +65,6 @@ int main(int argc, char **argv)
 			FPRINTF(stderr, "We need a even number of processes.\n");
 
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		if (!mpi_init)
 			MPI_Finalize();
 		return STARPU_TEST_SKIPPED;
@@ -101,7 +100,6 @@ int main(int argc, char **argv)
 	free(tab);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	if (!mpi_init)
 		MPI_Finalize();

mpi/tests/mpi_isend.c

@@ -48,7 +48,6 @@ int main(int argc, char **argv)
 			FPRINTF(stderr, "We need a even number of processes.\n");
 
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		if (!mpi_init)
 			MPI_Finalize();
 		return STARPU_TEST_SKIPPED;
@@ -82,7 +81,6 @@ int main(int argc, char **argv)
 	free(tab);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	if (!mpi_init)
 		MPI_Finalize();

mpi/tests/mpi_isend_detached.c

@@ -64,7 +64,6 @@ int main(int argc, char **argv)
 			FPRINTF(stderr, "We need a even number of processes.\n");
 
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		if (!mpi_init)
 			MPI_Finalize();
 		return STARPU_TEST_SKIPPED;
@@ -106,7 +105,6 @@ int main(int argc, char **argv)
 	free(tab);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	if (!mpi_init)
 		MPI_Finalize();

mpi/tests/mpi_reduction.c

@@ -102,7 +102,6 @@ int main(int argc, char **argv)
 		if (my_rank == 0)
 			FPRINTF(stderr, "We need at least 1 CPU worker.\n");
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		return STARPU_TEST_SKIPPED;
 	}
 
@@ -186,7 +185,6 @@ int main(int argc, char **argv)
 	free(handles);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	if (my_rank == 0)
 	{

mpi/tests/mpi_redux.c

@@ -99,7 +99,6 @@ int main(int argc, char **argv)
 	free(handles);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	if (!mpi_init)
 		MPI_Finalize();

mpi/tests/mpi_scatter_gather.c

@@ -79,7 +79,6 @@ int main(int argc, char **argv)
 		if (rank == 0)
 			FPRINTF(stderr, "We need at least 1 CPU worker.\n");
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		return STARPU_TEST_SKIPPED;
 	}
 
@@ -196,6 +195,5 @@ int main(int argc, char **argv)
 	free(data_handles);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 	return (rank == 0) ? ret : 0;
 }

mpi/tests/mpi_test.c

@@ -48,7 +48,6 @@ int main(int argc, char **argv)
 			FPRINTF(stderr, "We need a even number of processes.\n");
 
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		if (!mpi_init)
 			MPI_Finalize();
 		return STARPU_TEST_SKIPPED;
@@ -88,7 +87,6 @@ int main(int argc, char **argv)
 	free(tab);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	if (!mpi_init)
 		MPI_Finalize();

mpi/tests/multiple_send.c

@@ -39,7 +39,6 @@ int main(int argc, char **argv)
 			FPRINTF(stderr, "We need at least 2 processes.\n");
 
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		return STARPU_TEST_SKIPPED;
 	}
 
@@ -91,7 +90,6 @@ int main(int argc, char **argv)
 	starpu_data_unregister(recv_handle[1]);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	return 0;
 }

mpi/tests/pingpong.c

@@ -49,7 +49,6 @@ int main(int argc, char **argv)
 			FPRINTF(stderr, "We need a even number of processes.\n");
 
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		if (!mpi_init)
 			MPI_Finalize();
 		return STARPU_TEST_SKIPPED;
@@ -82,7 +81,6 @@ int main(int argc, char **argv)
 	free(tab);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 	if (!mpi_init)
 		MPI_Finalize();
 

mpi/tests/policy_register.c

@@ -75,7 +75,6 @@ int main(int argc, char **argv)
 			FPRINTF(stderr, "We need at least 2 processes.\n");
 
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		if (!mpi_init)
 			MPI_Finalize();
 		return STARPU_TEST_SKIPPED;
@@ -130,7 +129,6 @@ int main(int argc, char **argv)
 	starpu_data_unregister(handles[0]);
 	starpu_data_unregister(handles[1]);
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 	if (!mpi_init)
 		MPI_Finalize();
 

mpi/tests/policy_register_many.c

@@ -46,7 +46,6 @@ int main(int argc, char **argv)
 	STARPU_ASSERT(policy==_STARPU_MPI_NODE_SELECTION_MAX_POLICY-2);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	return 0;
 }

mpi/tests/policy_register_toomany.c

@@ -48,7 +48,6 @@ int main(int argc, char **argv)
 	}
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	return 0;
 }

mpi/tests/policy_selection.c

@@ -64,7 +64,6 @@ int main(int argc, char **argv)
 			FPRINTF(stderr, "We need at least 3 processes.\n");
 
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		if (!mpi_init)
 			MPI_Finalize();
 		return STARPU_TEST_SKIPPED;
@@ -173,7 +172,6 @@ int main(int argc, char **argv)
 	starpu_data_unregister(handles[2]);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 	if (!mpi_init)
 		MPI_Finalize();
 

mpi/tests/policy_selection2.c

@@ -66,7 +66,6 @@ int main(int argc, char **argv)
 				FPRINTF(stderr, "We need at least 1 CPU worker.\n");
 		}
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		if (!mpi_init)
 			MPI_Finalize();
 		return STARPU_TEST_SKIPPED;
@@ -121,7 +120,6 @@ int main(int argc, char **argv)
 	for(i=0 ; i<3 ; i++) starpu_data_unregister(handles[i]);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 	if (!mpi_init)
 		MPI_Finalize();
 

mpi/tests/policy_unregister.c

@@ -33,7 +33,6 @@ int main(int argc, char **argv)
 	starpu_mpi_node_selection_unregister_policy(STARPU_MPI_NODE_SELECTION_MOST_R_DATA);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	return 0;
 }

mpi/tests/ring.c

@@ -86,7 +86,6 @@ int main(int argc, char **argv)
 				FPRINTF(stderr, "We need at least 1 CPU or CUDA worker.\n");
 		}
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		if (!mpi_init)
 			MPI_Finalize();
 		return STARPU_TEST_SKIPPED;
@@ -133,7 +132,6 @@ int main(int argc, char **argv)
 
 	starpu_data_unregister(token_handle);
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	if (!mpi_init)
 		MPI_Finalize();

mpi/tests/ring_async.c

@@ -86,7 +86,6 @@ int main(int argc, char **argv)
 				FPRINTF(stderr, "We need at least 1 CPU or CUDA worker.\n");
 		}
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		if (!mpi_init)
 			MPI_Finalize();
 		return STARPU_TEST_SKIPPED;
@@ -138,7 +137,6 @@ int main(int argc, char **argv)
 
 	starpu_data_unregister(token_handle);
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	if (!mpi_init)
 		MPI_Finalize();

mpi/tests/ring_async_implicit.c

@@ -81,7 +81,6 @@ int main(int argc, char **argv)
 				FPRINTF(stderr, "We need at least 1 CPU or CUDA worker.\n");
 		}
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		return STARPU_TEST_SKIPPED;
 	}
 
@@ -127,7 +126,6 @@ int main(int argc, char **argv)
 
 	starpu_data_unregister(token_handle);
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 #ifndef STARPU_SIMGRID
 	if (rank == last_rank)

mpi/tests/ring_sync.c

@@ -85,7 +85,6 @@ int main(int argc, char **argv)
 				FPRINTF(stderr, "We need at least 1 CPU or CUDA worker.\n");
 		}
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		if (!mpi_init)
 			MPI_Finalize();
 		return STARPU_TEST_SKIPPED;
@@ -135,7 +134,6 @@ int main(int argc, char **argv)
 
 	starpu_data_unregister(token_handle);
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	if (!mpi_init)
 		MPI_Finalize();

mpi/tests/ring_sync_detached.c

@@ -98,7 +98,6 @@ int main(int argc, char **argv)
 				FPRINTF(stderr, "We need at least 1 CPU or CUDA worker.\n");
 		}
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		if (!mpi_init)
 			MPI_Finalize();
 		return STARPU_TEST_SKIPPED;
@@ -151,7 +150,6 @@ int main(int argc, char **argv)
 
 	starpu_data_unregister(token_handle);
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	FPRINTF_MPI(stderr, "Final value for token %d\n", token);
 	if (!mpi_init)

mpi/tests/starpu_redefine.c

@@ -39,7 +39,6 @@ int main(int argc, char **argv)
 	starpu_data_unregister(handle);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 	if (!mpi_init)
 		MPI_Finalize();
 

mpi/tests/sync.c

@@ -92,7 +92,6 @@ int main(int argc, char **argv)
 	starpu_data_unregister(data[1]);
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 	if (!mpi_init)
 		MPI_Finalize();
 	return 0;

mpi/tests/tags_checking.c

@@ -112,7 +112,6 @@ int do_test(int rank, int sdetached, int rdetached)
 		ret = (val[0] == VAL0 && val[1] == VAL1) ? 0 : 1;
 	}
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 	return ret;
 }
 

mpi/tests/temporary.c

@@ -59,7 +59,6 @@ int main(int argc, char **argv)
 			FPRINTF(stderr, "We need at least 2 processes.\n");
 
 		starpu_mpi_shutdown();
-		starpu_shutdown();
 		return STARPU_TEST_SKIPPED;
 	}
 
@@ -133,7 +132,6 @@ int main(int argc, char **argv)
 
 skip:
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	if (rank == 0)
 		STARPU_ASSERT_MSG(val0 == 24, "%d should be %d\n", val0, 16 * size);

mpi/tests/user_defined_datatype.c

@@ -174,7 +174,6 @@ int main(int argc, char **argv)
 	}
 
 	starpu_mpi_shutdown();
-	starpu_shutdown();
 
 	return (rank == 0) ? !compare : ret;
 }