Browse Source

include: fix includes

Nathalie Furmento 13 years ago
parent
commit
a20450f5cc

+ 2 - 1
include/starpu_cuda.h

@@ -18,12 +18,13 @@
 #ifndef __STARPU_CUDA_H__
 #define __STARPU_CUDA_H__
 
+#include <starpu_config.h>
+
 #if defined STARPU_USE_CUDA && !defined STARPU_DONT_INCLUDE_CUDA_HEADERS
 #include <cuda.h>
 #include <cuda_runtime.h>
 #include <cuda_runtime_api.h>
 #include <cublas.h>
-#include <starpu_config.h>
 
 #ifdef __cplusplus
 extern "C"

+ 1 - 3
include/starpu_data.h

@@ -15,12 +15,10 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
-#include <starpu.h>
-
 #ifndef __STARPU_DATA_H__
 #define __STARPU_DATA_H__
 
-#include <starpu_config.h>
+#include <starpu.h>
 
 #ifdef __cplusplus
 extern "C"

+ 1 - 3
include/starpu_data_filters.h

@@ -16,13 +16,11 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
-#include <starpu.h>
-
 #ifndef __STARPU_DATA_FILTERS_H__
 #define __STARPU_DATA_FILTERS_H__
 
+#include <starpu.h>
 #include <stdarg.h>
-#include <starpu_config.h>
 
 #ifdef __cplusplus
 extern "C"

+ 1 - 4
include/starpu_data_interfaces.h

@@ -16,13 +16,10 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
-#include <starpu.h>
-
 #ifndef __STARPU_DATA_INTERFACES_H__
 #define __STARPU_DATA_INTERFACES_H__
 
-#include <starpu_data.h>
-#include <starpu_util.h>
+#include <starpu.h>
 
 #ifdef STARPU_USE_GORDON
 /* to get the gordon_strideSize_t data structure from gordon */

+ 1 - 3
include/starpu_expert.h

@@ -14,12 +14,10 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
-#include <starpu.h>
-
 #ifndef __STARPU_EXPERT_H__
 #define __STARPU_EXPERT_H__
 
-#include <starpu_config.h>
+#include <starpu.h>
 
 #ifdef __cplusplus
 extern "C"

+ 1 - 4
include/starpu_perfmodel.h

@@ -16,14 +16,11 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
-#include <starpu.h>
-
 #ifndef __STARPU_PERFMODEL_H__
 #define __STARPU_PERFMODEL_H__
 
-#include <starpu_config.h>
+#include <starpu.h>
 #include <stdio.h>
-#include <starpu_task.h>
 
 #if ! defined(_MSC_VER)
 #  include <pthread.h>

+ 1 - 2
include/starpu_profiling.h

@@ -15,11 +15,10 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
-#include <starpu.h>
-
 #ifndef __STARPU_PROFILING_H__
 #define __STARPU_PROFILING_H__
 
+#include <starpu.h>
 #include <errno.h>
 #include <sys/time.h>
 

+ 1 - 3
include/starpu_scheduler.h

@@ -15,12 +15,10 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
-#include <starpu.h>
-
 #ifndef __STARPU_SCHEDULER_H__
 #define __STARPU_SCHEDULER_H__
 
-#include <starpu_config.h>
+#include <starpu.h>
 
 #if ! defined(_MSC_VER)
 #  include <pthread.h>

+ 2 - 5
include/starpu_task.h

@@ -16,20 +16,17 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
-#include <starpu.h>
-
 #ifndef __STARPU_TASK_H__
 #define __STARPU_TASK_H__
 
+#include <starpu.h>
+#include <starpu_data.h>
 #include <errno.h>
-#include <starpu_config.h>
 
 #if defined STARPU_USE_CUDA && !defined STARPU_DONT_INCLUDE_CUDA_HEADERS
 # include <cuda.h>
 #endif
 
-#include <starpu_data.h>
-
 #ifdef __cplusplus
 extern "C"
 {

+ 1 - 3
include/starpu_task_bundle.h

@@ -15,12 +15,10 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
-#include <starpu.h>
-
 #ifndef __STARPU_TASK_BUNDLE_H__
 #define __STARPU_TASK_BUNDLE_H__
 
-#include <starpu_config.h>
+#include <starpu.h>
 
 #if ! defined(_MSC_VER)
 #  include <pthread.h>

+ 2 - 2
include/starpu_top.h

@@ -15,10 +15,10 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
-#include <starpu.h>
-
 #ifndef __STARPU_TOP_H__
 #define __STARPU_TOP_H__
+
+#include <starpu.h>
 #include <stdlib.h>
 #include <time.h>
 

+ 1 - 1
include/starpu_util.h

@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include <starpu_config.h>
+#include <starpu.h>
 #include <starpu_perfmodel.h>
 
 #ifdef __cplusplus