minor fixes

include/starpu.h

@@ -171,11 +171,17 @@ struct starpu_conf
 	   STARPU_NOPENCL.
 	   (default = -1)
 	*/
-
-        int nfpga;
 	int nopencl;
 
 	/**
+	   Number of FPGA devices that StarPU can use. This can also
+	   be specified with the environment variable \ref
+	   STARPU_NFPGA.
+	   (default = -1)
+	*/
+	int nfpga;
+
+	/**
 	   Number of MIC devices that StarPU can use. This can also be
 	   specified with the environment variable \ref STARPU_NMIC.
 	   (default = -1)

include/starpu_data_interfaces.h

@@ -177,7 +177,6 @@ struct starpu_data_copy_methods
 	   \p src_node MIC node to the \p dst_interface interface on the \p
 	   dst_node CPU node. Return 0 on success.
 	*/
-
 	int (*mic_to_ram)(void *src_interface, unsigned srd_node, void *dst_interface, unsigned dst_node);
 
 	int (*fpga_to_ram)(void *src_interface, unsigned srd_node, void *dst_interface, unsigned dst_node);
@@ -324,12 +323,11 @@ struct starpu_data_copy_methods
 	   some transfers are still ongoing and should be awaited for by the
 	   core.
 	*/
+	int (*mic_to_ram_async)(void *src_interface, unsigned srd_node, void *dst_interface, unsigned dst_node);
 
 	int (*ram_to_fpga_async)(void *src_interface, unsigned src_node, void *dst_interface, unsigned dst_node);
 	int (*fpga_to_ram_async)(void *src_interface, unsigned srd_node, void *dst_interface, unsigned dst_node);
 
-	int (*mic_to_ram_async)(void *src_interface, unsigned srd_node, void *dst_interface, unsigned dst_node);
-
 	/**
 	   Define how to copy data from the \p src_interface interface on the
 	   \p src_node node to the \p dst_interface interface on the \p

include/starpu_driver.h

@@ -53,9 +53,7 @@ struct starpu_driver
 	{
 		unsigned cpu_id;
 		unsigned cuda_id;
-#if defined(STARPU_USE_FPGA)
 		unsigned fpga_id;
-#endif
 #if defined(STARPU_USE_OPENCL) && !defined(__CUDACC__)
 		cl_device_id opencl_id;
 #else

include/starpu_task.h

@@ -391,7 +391,7 @@ struct starpu_codelet
 	*/
 	starpu_cuda_func_t cuda_funcs[STARPU_MAXIMPLEMENTATIONS];
 
-          /**
+	/**
            Optional array of function pointers to the FPGA
            implementations of the codelet. The functions prototype
            must be:

src/datawizard/coherency.c

@@ -37,8 +37,6 @@
 static int link_supports_direct_transfers(starpu_data_handle_t handle, unsigned src_node, unsigned dst_node, unsigned *handling_node);
 int _starpu_select_src_node(starpu_data_handle_t handle, unsigned destination)
 {
-        //fpga_msg("The new troublesome point is here");
-
         int src_node = -1;
 	unsigned i;
 

src/datawizard/copy_driver.c

@@ -451,7 +451,6 @@ int starpu_interface_copy4d(uintptr_t src, size_t src_offset, unsigned src_node,
 
 void _starpu_driver_wait_request_completion(struct _starpu_async_channel *async_channel)
 {
-
 #ifdef STARPU_SIMGRID
 	_starpu_simgrid_wait_transfer_event(&async_channel->event);
 #else /* !SIMGRID */

src/datawizard/malloc.c

@@ -932,8 +932,8 @@ starpu_free_on_node_flags(unsigned dst_node, uintptr_t addr, size_t size, int fl
 	{
 		/* This chunk is now empty, but avoid chunk free/alloc
 		 * ping-pong by keeping some of these.  */
-		if (nfreechunks[dst_node] >= CHUNKS_NFREE && 
-                     starpu_node_get_kind(dst_node) != STARPU_FPGA_RAM)  
+		if (nfreechunks[dst_node] >= CHUNKS_NFREE &&
+                     starpu_node_get_kind(dst_node) != STARPU_FPGA_RAM)
 		{
 			/* We already have free chunks, release this one */
 			_starpu_free_on_node_flags(dst_node, chunk->base, CHUNK_SIZE, flags);