merge trunk

mpi/tests/ring.c

@@ -26,9 +26,6 @@
 #  define NITER	2048
 #endif
 
-int token = 42;
-starpu_data_handle_t token_handle;
-
 #ifdef STARPU_USE_CUDA
 extern void increment_cuda(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args);
 #endif
@@ -61,7 +58,7 @@ static struct starpu_codelet increment_cl =
 	.model = &dumb_model
 };
 
-void increment_token(void)
+void increment_token(starpu_data_handle_t token_handle)
 {
 	struct starpu_task *task = starpu_task_create();
 
@@ -77,6 +74,8 @@ int main(int argc, char **argv)
 {
 	int ret, rank, size;
 	int mpi_init;
+	int token = 42;
+	starpu_data_handle_t token_handle;
 
 	MPI_INIT_THREAD(&argc, &argv, MPI_THREAD_SERIALIZED, &mpi_init);
 
@@ -118,7 +117,7 @@ int main(int argc, char **argv)
 
 		if (loop == 0 && rank == 0)
 		{
-			starpu_data_acquire(token_handle, STARPU_RW);
+			starpu_data_acquire(token_handle, STARPU_W);
 			token = 0;
 			FPRINTF(stdout, "Start with token value %d\n", token);
 			starpu_data_release(token_handle);
@@ -129,7 +128,7 @@ int main(int argc, char **argv)
 			starpu_mpi_recv(token_handle, (rank+size-1)%size, tag, MPI_COMM_WORLD, &status);
 		}
 
-		increment_token();
+		increment_token(token_handle);
 
 		if (loop == last_loop && rank == last_rank)
 		{
@@ -153,6 +152,7 @@ int main(int argc, char **argv)
 #ifndef STARPU_SIMGRID
 	if (rank == last_rank)
 	{
+		FPRINTF(stderr, "[%d] token = %d == %d * %d ?\n", rank, token, nloops, size);
 		STARPU_ASSERT(token == nloops*size);
 	}
 #endif

mpi/tests/ring_async.c

@@ -26,9 +26,6 @@
 #  define NITER	2048
 #endif
 
-int token = 42;
-starpu_data_handle_t token_handle;
-
 #ifdef STARPU_USE_CUDA
 extern void increment_cuda(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args);
 #endif
@@ -61,7 +58,7 @@ static struct starpu_codelet increment_cl =
 	.model = &dumb_model
 };
 
-void increment_token(void)
+void increment_token(starpu_data_handle_t token_handle)
 {
 	struct starpu_task *task = starpu_task_create();
 
@@ -77,6 +74,8 @@ int main(int argc, char **argv)
 {
 	int ret, rank, size;
 	int mpi_init;
+	int token = 42;
+	starpu_data_handle_t token_handle;
 
 	MPI_INIT_THREAD(&argc, &argv, MPI_THREAD_SERIALIZED, &mpi_init);
 
@@ -118,7 +117,7 @@ int main(int argc, char **argv)
 
 		if (loop == 0 && rank == 0)
 		{
-			starpu_data_acquire(token_handle, STARPU_RW);
+			starpu_data_acquire(token_handle, STARPU_W);
 			token = 0;
 			FPRINTF(stdout, "Start with token value %d\n", token);
 			starpu_data_release(token_handle);
@@ -131,7 +130,7 @@ int main(int argc, char **argv)
 			starpu_mpi_wait(&req, &status);
 		}
 
-		increment_token();
+		increment_token(token_handle);
 
 		if (loop == last_loop && rank == last_rank)
 		{
@@ -158,6 +157,7 @@ int main(int argc, char **argv)
 #ifndef STARPU_SIMGRID
 	if (rank == last_rank)
 	{
+		FPRINTF(stderr, "[%d] token = %d == %d * %d ?\n", rank, token, nloops, size);
 		STARPU_ASSERT(token == nloops*size);
 	}
 #endif

mpi/tests/ring_async_implicit.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010, 2015-2016  Université de Bordeaux
+ * Copyright (C) 2010, 2015-2017  Université de Bordeaux
  * Copyright (C) 2010, 2011, 2012, 2013, 2016, 2017  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -26,9 +26,6 @@
 #  define NITER	2048
 #endif
 
-int token = 42;
-starpu_data_handle_t token_handle;
-
 #ifdef STARPU_USE_CUDA
 extern void increment_cuda(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args);
 #endif
@@ -61,7 +58,7 @@ static struct starpu_codelet increment_cl =
 	.model = &dumb_model
 };
 
-void increment_token(void)
+void increment_token(starpu_data_handle_t token_handle)
 {
 	struct starpu_task *task = starpu_task_create();
 
@@ -75,6 +72,8 @@ void increment_token(void)
 int main(int argc, char **argv)
 {
 	int ret, rank, size;
+	int token = 42;
+	starpu_data_handle_t token_handle;
 
 	ret = starpu_init(NULL);
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
@@ -111,7 +110,7 @@ int main(int argc, char **argv)
 
 		if (loop == 0 && rank == 0)
 		{
-			starpu_data_acquire(token_handle, STARPU_RW);
+			starpu_data_acquire(token_handle, STARPU_W);
 			token = 0;
 			FPRINTF(stdout, "Start with token value %d\n", token);
 			starpu_data_release(token_handle);
@@ -121,7 +120,7 @@ int main(int argc, char **argv)
 			starpu_mpi_irecv_detached(token_handle, (rank+size-1)%size, tag, MPI_COMM_WORLD, NULL, NULL);
 		}
 
-		increment_token();
+		increment_token(token_handle);
 
 		if (loop == last_loop && rank == last_rank)
 		{

mpi/tests/ring_kernel.cu

@@ -24,9 +24,9 @@ static __global__ void cuda_incrementer(int *token)
 
 extern "C" void increment_cuda(void *descr[], void *_args)
 {
-	(void) _args;
-	int *tokenptr = (int *)STARPU_VECTOR_GET_PTR(descr[0]);
-
-	cuda_incrementer<<<1,1, 0, starpu_cuda_get_local_stream()>>>(tokenptr);
-	cudaStreamSynchronize(starpu_cuda_get_local_stream());
+//	(void) _args;
+//	int *tokenptr = (int *)STARPU_VECTOR_GET_PTR(descr[0]);
+//
+//	cuda_incrementer<<<1,1, 0, starpu_cuda_get_local_stream()>>>(tokenptr);
+//	cudaStreamSynchronize(starpu_cuda_get_local_stream());
 }

mpi/tests/ring_sync.c

@@ -26,9 +26,6 @@
 #  define NITER	2048
 #endif
 
-int token = 42;
-starpu_data_handle_t token_handle;
-
 #ifdef STARPU_USE_CUDA
 extern void increment_cuda(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args);
 #endif
@@ -61,7 +58,7 @@ static struct starpu_codelet increment_cl =
 	.model = &dumb_model
 };
 
-void increment_token(void)
+void increment_token(starpu_data_handle_t token_handle)
 {
 	struct starpu_task *task = starpu_task_create();
 
@@ -77,6 +74,8 @@ int main(int argc, char **argv)
 {
 	int ret, rank, size;
 	int mpi_init;
+	int token = 42;
+	starpu_data_handle_t token_handle;
 
 	MPI_INIT_THREAD(&argc, &argv, MPI_THREAD_SERIALIZED, &mpi_init);
 
@@ -118,7 +117,7 @@ int main(int argc, char **argv)
 
 		if (loop == 0 && rank == 0)
 		{
-			starpu_data_acquire(token_handle, STARPU_RW);
+			starpu_data_acquire(token_handle, STARPU_W);
 			token = 0;
 			FPRINTF(stdout, "Start with token value %d\n", token);
 			starpu_data_release(token_handle);
@@ -129,7 +128,7 @@ int main(int argc, char **argv)
 			starpu_mpi_recv(token_handle, (rank+size-1)%size, tag, MPI_COMM_WORLD, &status);
 		}
 
-		increment_token();
+		increment_token(token_handle);
 
 		if (loop == last_loop && rank == last_rank)
 		{
@@ -156,6 +155,7 @@ int main(int argc, char **argv)
 #ifndef STARPU_SIMGRID
 	if (rank == last_rank)
 	{
+		FPRINTF(stderr, "[%d] token = %d == %d * %d ?\n", rank, token, nloops, size);
 		STARPU_ASSERT(token == nloops*size);
 	}
 #endif

mpi/tests/ring_sync_detached.c

@@ -130,7 +130,7 @@ int main(int argc, char **argv)
 
 		if (loop == 0 && rank == 0)
 		{
-			starpu_data_acquire(token_handle, STARPU_RW);
+			starpu_data_acquire(token_handle, STARPU_W);
 			token = 0;
 			FPRINTF_MPI(stderr, "Start with token value %d\n", token);
 			starpu_data_release(token_handle);
@@ -172,6 +172,7 @@ int main(int argc, char **argv)
 #ifndef STARPU_SIMGRID
 	if (rank == last_rank)
 	{
+		FPRINTF(stderr, "[%d] token = %d == %d * %d ?\n", rank, token, nloops, size);
 		STARPU_ASSERT(token == nloops*size);
 	}
 #endif