Clean the headers in src/datawizard a little.

src/Makefile.am

@@ -56,7 +56,6 @@ noinst_HEADERS = 						\
 	datawizard/datawizard.h					\
 	datawizard/data_request.h				\
 	datawizard/filters.h					\
-	datawizard/progress.h					\
 	datawizard/write_back.h					\
 	datawizard/datastats.h					\
 	datawizard/memalloc.h					\

src/datawizard/coherency.h

@@ -17,26 +17,17 @@
 #ifndef __COHERENCY__H__
 #define __COHERENCY__H__
 
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <assert.h>
-#include <errno.h>
-
 #include <starpu.h>
+#include <common/config.h>
 
-#include <pthread.h>
 #include <common/starpu_spinlock.h>
 #include <common/rwlock.h>
 #include <common/timing.h>
 #include <common/fxt.h>
 #include <common/list.h>
-#include <common/config.h>
 
 #include <datawizard/data_request.h>
 #include <datawizard/interfaces/data_interface.h>
-#include <datawizard/progress.h>
 #include <datawizard/datastats.h>
 
 typedef enum {

src/datawizard/data_request.c

@@ -14,10 +14,9 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
+#include <starpu.h>
 #include <common/config.h>
-#include <datawizard/data_request.h>
-#include <pthread.h>
-#include <common/utils.h>
+#include <datawizard/datawizard.h>
 
 /* requests that have not been treated at all */
 static starpu_data_request_list_t data_requests[STARPU_MAXNODES];

src/datawizard/datawizard.h

@@ -17,14 +17,19 @@
 #ifndef __DATAWIZARD_H__
 #define __DATAWIZARD_H__
 
+#include <starpu.h>
+#include <common/config.h>
+
+#include <common/utils.h>
+
 #include <datawizard/coherency.h>
 #include <datawizard/filters.h>
 #include <datawizard/copy_driver.h>
 #include <datawizard/footprint.h>
 
-#include <datawizard/progress.h>
 #include <datawizard/data_request.h>
-
 #include <datawizard/interfaces/data_interface.h>
 
+void _starpu_datawizard_progress(uint32_t memory_node, unsigned may_alloc);
+
 #endif // __DATAWIZARD_H__

src/datawizard/footprint.h

@@ -17,10 +17,10 @@
 #ifndef __FOOTPRINT_H__
 #define __FOOTPRINT_H__
 
+#include <starpu.h>
+#include <common/config.h>
 #include <core/jobs.h>
 
-struct starpu_job_s;
-
 void _starpu_compute_buffers_footprint(struct starpu_job_s *j);
 inline uint32_t _starpu_compute_data_footprint(starpu_data_handle handle);
 

src/datawizard/memalloc.h

@@ -24,7 +24,6 @@
 #include <datawizard/interfaces/data_interface.h>
 #include <datawizard/coherency.h>
 #include <datawizard/copy_driver.h>
-#include <datawizard/progress.h>
 
 LIST_TYPE(starpu_mem_chunk,
 	starpu_data_handle data;

src/datawizard/memory_nodes.h

@@ -17,12 +17,10 @@
 #ifndef __MEMORY_NODES_H__
 #define __MEMORY_NODES_H__
 
-#include "coherency.h"
-#include "memalloc.h"
-
-#ifdef STARPU_USE_CUDA
-#include <cublas.h>
-#endif
+#include <starpu.h>
+#include <common/config.h>
+#include <datawizard/coherency.h>
+#include <datawizard/memalloc.h>
 
 typedef enum {
 	STARPU_UNUSED,

src/datawizard/progress.c

@@ -1,6 +1,6 @@
 /*
  * StarPU
- * Copyright (C) INRIA 2008-2009 (see AUTHORS file)
+ * Copyright (C) INRIA 2008-2010 (see AUTHORS file)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -14,10 +14,10 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
-#include <pthread.h>
+#include <starpu.h>
+#include <common/config.h>
+#include <datawizard/datawizard.h>
 #include <core/workers.h>
-#include <datawizard/progress.h>
-#include <datawizard/data_request.h>
 
 void _starpu_datawizard_progress(uint32_t memory_node, unsigned may_alloc)
 {

src/datawizard/progress.h

@@ -1,24 +0,0 @@
-/*
- * StarPU
- * Copyright (C) INRIA 2008-2009 (see AUTHORS file)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * See the GNU Lesser General Public License in COPYING.LGPL for more details.
- */
-
-#ifndef __DW_PROGRESS_H__
-#define __DW_PROGRESS_H__
-
-#include <stdint.h>
-
-void _starpu_datawizard_progress(uint32_t memory_node, unsigned may_alloc);
-
-#endif

src/datawizard/write_back.c

@@ -14,8 +14,7 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
-#include <datawizard/write_back.h>
-#include <datawizard/coherency.h>
+#include <datawizard/datawizard.h>
 
 void _starpu_write_through_data(starpu_data_handle handle, uint32_t requesting_node, 
 					   uint32_t write_through_mask)