Merge branch 'master' into fpga

include/starpu.h

@@ -205,6 +205,7 @@ struct starpu_conf
 	   (default = 0)
 	*/
 	unsigned use_explicit_workers_bindid;
+
 	/**
 	   If the starpu_conf::use_explicit_workers_bindid flag is
 	   set, this array indicates where to bind the different
@@ -226,6 +227,7 @@ struct starpu_conf
 	   (default = 0)
 	*/
 	unsigned use_explicit_workers_cuda_gpuid;
+
 	/**
 	   If the starpu_conf::use_explicit_workers_cuda_gpuid flag is
 	   set, this array contains the logical identifiers of the
@@ -247,6 +249,7 @@ struct starpu_conf
 	unsigned workers_fpga_fpgaid[STARPU_NMAXWORKERS];
 
 	unsigned use_explicit_workers_opencl_gpuid;
+
 	/**
 	   If the starpu_conf::use_explicit_workers_opencl_gpuid flag
 	   is set, this array contains the logical identifiers of the
@@ -264,6 +267,7 @@ struct starpu_conf
 	   (default = 0)
 	*/
 	unsigned use_explicit_workers_mic_deviceid;
+
 	/**
 	   If the flag starpu_conf::use_explicit_workers_mic_deviceid
 	   is set, the array contains the logical identifiers of the
@@ -280,6 +284,7 @@ struct starpu_conf
 	   (default = 0)
 	*/
 	unsigned use_explicit_workers_mpi_ms_deviceid;
+
 	/**
 	   If the flag
 	   starpu_conf::use_explicit_workers_mpi_ms_deviceid is set,
@@ -296,6 +301,7 @@ struct starpu_conf
 	   (default = 0)
 	*/
 	int bus_calibrate;
+
 	/**
 	   If this flag is set, StarPU will calibrate the performance
 	   models when executing tasks. If this value is equal to -1,
@@ -346,6 +352,7 @@ struct starpu_conf
 	   (default = 0)
 	*/
 	int disable_asynchronous_copy;
+
 	/**
 	   This flag should be set to 1 to disable asynchronous copies
 	   between CPUs and CUDA accelerators.
@@ -360,6 +367,7 @@ struct starpu_conf
 
         int disable_asynchronous_fpga_copy;
 	int disable_asynchronous_cuda_copy;
+
 	/**
 	   This flag should be set to 1 to disable asynchronous copies
 	   between CPUs and OpenCL accelerators.
@@ -376,6 +384,7 @@ struct starpu_conf
 	   (default = 0)
 	*/
 	int disable_asynchronous_opencl_copy;
+
 	/**
 	   This flag should be set to 1 to disable asynchronous copies
 	   between CPUs and MIC accelerators.
@@ -388,6 +397,7 @@ struct starpu_conf
 	   (default = 0).
 	*/
 	int disable_asynchronous_mic_copy;
+
 	/**
 	   This flag should be set to 1 to disable asynchronous copies
 	   between CPUs and MPI Master Slave devices.
@@ -410,6 +420,7 @@ struct starpu_conf
 	   (default = <c>NULL</c>)
 	*/
 	unsigned *cuda_opengl_interoperability;
+
 	/**
 	   Size of the array starpu_conf::cuda_opengl_interoperability
 	*/
@@ -421,6 +432,7 @@ struct starpu_conf
 	   (default = <c>NULL</c>)
 	*/
 	struct starpu_driver *not_launched_drivers;
+
 	/**
 	   The number of StarPU drivers that should not be launched by
 	   StarPU, i.e number of elements of the array
@@ -437,7 +449,9 @@ struct starpu_conf
 	   would disturb the trace).
 	*/
 	uint64_t trace_buffer_size;
+
 	int global_sched_ctx_min_priority;
+
 	int global_sched_ctx_max_priority;
 
 #ifdef STARPU_WORKER_CALLBACKS