Merge branch 'master' of git+ssh://scm.gforge.inria.fr/gitroot/starpu/starpu

Merge branch 'master' of git+ssh://scm.gforge.inria.fr/gitroot/starpu/starpu

Merge branch 'master' of git+ssh://scm.gforge.inria.fr/gitroot/starpu/starpu

Merge branch 'master' of git+ssh://scm.gforge.inria.fr/gitroot/starpu/starpu

Merge branch 'master' of git+ssh://scm.gforge.inria.fr/gitroot/starpu/starpu

include/starpu_task.h

@@ -1203,8 +1203,19 @@ struct starpu_task
 	void *sched_data;
 };
 
+/**
+   To be used in the starpu_task::type field, for normal application tasks.
+*/
 #define STARPU_TASK_TYPE_NORMAL		0
+
+/**
+   To be used in the starpu_task::type field, for StarPU-internal tasks.
+*/
 #define STARPU_TASK_TYPE_INTERNAL	(1<<0)
+
+/**
+   To be used in the starpu_task::type field, for StarPU-internal data acquisition tasks.
+*/
 #define STARPU_TASK_TYPE_DATA_ACQUIRE	(1<<1)
 
 /**

include/starpu_task_util.h

@@ -86,7 +86,19 @@ extern "C"
    execute the codelet.
 */
 #define STARPU_EXECUTE_ON_DATA	 (7<<STARPU_MODE_SHIFT)
+
+/**
+   Used when calling starpu_task_in_sert(), must be followed by an array of
+   handles and the number of elements in the array (as int). This is equivalent
+   to passing the handles as separate parameters with STARPU_R/W/RW.
+*/
 #define STARPU_DATA_ARRAY        (8<<STARPU_MODE_SHIFT)
+
+/**
+   Used when calling starpu_task_in_sert(), must be followed by an array of
+   struct starpu_data_descr and the number of elements in the array (as int).
+   This is equivalent to passing the handles with the corresponding modes.
+*/
 #define STARPU_DATA_MODE_ARRAY   (9<<STARPU_MODE_SHIFT)
 
 /**
@@ -156,6 +168,10 @@ extern "C"
 */
 #define STARPU_TAG_ONLY          (20<<STARPU_MODE_SHIFT)
 
+/**
+   Used when calling starpu_task_insert(), must be followed by an unsigned
+   stored in starpu_task::possibly_parallel.
+*/
 #define STARPU_POSSIBLY_PARALLEL    (21<<STARPU_MODE_SHIFT)
 
 /**

include/starpu_worker.h

@@ -38,6 +38,9 @@ extern "C"
    @{
 */
 
+/**
+  Memory node Type
+*/
 enum starpu_node_kind
 {
 	STARPU_UNUSED=0,

mpi/tests/sendrecv_bench.c

@@ -129,7 +129,7 @@ int main(int argc, char **argv)
 
 		starpu_mpi_barrier(MPI_COMM_WORLD);
 
-		for (int j = 0; j < iterations; j++)
+		for (uint64_t j = 0; j < iterations; j++)
 		{
 			if (rank == 0)
 			{
@@ -163,7 +163,7 @@ int main(int argc, char **argv)
 			const double d9_lat = lats[9 * (iterations - 1) / 10];
 			double avg_lat = 0.0;
 
-			for(int k = 0; k < iterations; k++)
+			for(uint64_t k = 0; k < iterations; k++)
 			{
 				avg_lat += lats[k];
 			}