fix merge

include/starpu.h

@@ -83,6 +83,7 @@ typedef INT_PTR intptr_t;
 #include <starpu_clusters.h>
 #include <starpu_perf_monitoring.h>
 #include <starpu_perf_steering.h>
+#include <starpu_fpga.h>
 
 #ifdef __cplusplus
 extern "C"

include/starpu_config.h.in

@@ -78,6 +78,7 @@
    @ingroup API_MPI_Support
 */
 #undef STARPU_USE_MPI_MASTER_SLAVE
+#undef STARPU_USE_FPGA
 
 /**
    Defined when StarPU has been installed with OpenMP Runtime support.

include/starpu_fpga.h

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2010-2012, 2014  Université de Bordeaux
- * Copyright (C) 2010, 2011, 2012, 2013  CNRS
+ * Copyright (C) 2010, 2011, 2012, 2013, 2019  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -20,7 +20,7 @@
 
 #include <starpu_config.h>
 
-#if defined STARPU_USE_FPGA && !defined STARPU_DONT_INCLUDE_FPGA_HEADERS
+#if defined STARPU_USE_FPGA
 //#include <fpga.h>
 
 #ifdef __cplusplus
@@ -28,32 +28,49 @@ extern "C"
 {
 #endif
 
+/**
+   @defgroup API_FPGA_Extensions FPGA Extensions
+   @{
+*/
+
 //int starpu_fpga_allocate_memory(fpga_mem *addr, size_t size);
-typedef struct data_exchange_log{
+typedef struct data_exchange_log
+{
         int size;
         float time;
 } fpga_trans;
 
-typedef struct properties{
+typedef struct properties
+{
         int totalGlobalMem;
         int concurrentKernels;
         char *name;
 } fpgaDeviceProp;
 
+/**
+   get device properties
+ */
+
 int fpgaGetDeviceProperties(fpgaDeviceProp *,unsigned devid);
 
 void fpga_report_configuration(void);
 
+/**
+   set fpga device
+ */
 int fpgaSetDevice(unsigned devid);
 
-int fpgaSetDevice(unsigned devid);
+/**
+   fpga is silent
+ */
 
 int fpga_is_silent();
 
+/** @} */
+
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* STARPU_USE_FPGA && !STARPU_DONT_INCLUDE_FPGA_HEADERS */
+#endif /* STARPU_USE_FPGA */
 #endif /* __STARPU_FPGA_H__ */
-