tests: only include starpu.h as it includes all the other starpu_ .h files

tests/datawizard/acquire_release.c

@@ -17,9 +17,6 @@
 
 #include <config.h>
 #include <starpu.h>
-#ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
-#endif
 #include "../helper.h"
 
 #ifdef STARPU_SLOW_MACHINE

tests/datawizard/acquire_release2.c

@@ -16,9 +16,6 @@
 
 #include <config.h>
 #include <starpu.h>
-#ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
-#endif
 
 #include "../helper.h"
 

tests/datawizard/acquire_release_cuda.cu

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010  Centre National de la Recherche Scientifique
+ * Copyright (C) 2010, 2012  Centre National de la Recherche Scientifique
  *
  * 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
@@ -15,7 +15,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_cuda.h>
 
 static __global__ void _increment_cuda_codelet(unsigned *val)
 {

tests/datawizard/acquire_release_opencl.c

@@ -15,7 +15,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_opencl.h>
 
 extern struct starpu_opencl_program opencl_program;
 void increment_opencl(void *buffers[], void *args)

tests/datawizard/cuda_codelet_unsigned_inc.cu

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2010  Université de Bordeaux 1
- * Copyright (C) 2010  Centre National de la Recherche Scientifique
+ * Copyright (C) 2010, 2012  Centre National de la Recherche Scientifique
  *
  * 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
@@ -16,7 +16,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_cuda.h>
 
 static __global__ void _cuda_unsigned_inc(unsigned *val)
 {

tests/datawizard/data_invalidation.c

@@ -20,10 +20,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <starpu.h>
-#include <starpu_cuda.h>
-#ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
-#endif
 #include <stdlib.h>
 #include "../helper.h"
 

tests/datawizard/gpu_register.c

@@ -16,8 +16,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_opencl.h>
-#include <starpu_cuda.h>
 #include "../helper.h"
 #include "scal.h"
 

tests/datawizard/handle_to_pointer.c

@@ -18,12 +18,6 @@
 #include <assert.h>
 
 #include <starpu.h>
-#ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
-#endif
-#ifdef STARPU_USE_CUDA
-#include <starpu_cuda.h>
-#endif
 #include <stdlib.h>
 #include "../helper.h"
 

tests/datawizard/in_place_partition.c

@@ -15,7 +15,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_opencl.h>
 #include "../helper.h"
 #include "scal.h"
 

tests/datawizard/increment_redux.c

@@ -19,13 +19,6 @@
 #include <starpu.h>
 #include "../helper.h"
 
-#ifdef STARPU_USE_CUDA
-#include <starpu_cuda.h>
-#endif
-#ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
-#endif
-
 static unsigned var = 0;
 static starpu_data_handle_t handle;
 

tests/datawizard/increment_redux_lazy.c

@@ -18,13 +18,6 @@
 #include <starpu.h>
 #include "../helper.h"
 
-#ifdef STARPU_USE_CUDA
-#include <starpu_cuda.h>
-#endif
-#ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
-#endif
-
 static starpu_data_handle_t handle;
 
 /*

tests/datawizard/increment_redux_v2.c

@@ -18,13 +18,6 @@
 #include <starpu.h>
 #include "../helper.h"
 
-#ifdef STARPU_USE_CUDA
-#include <starpu_cuda.h>
-#endif
-#ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
-#endif
-
 static unsigned var = 0;
 static starpu_data_handle_t handle;
 

tests/datawizard/interfaces/bcsr/bcsr_cuda.cu

@@ -14,7 +14,6 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 #include <starpu.h>
-#include <starpu_cuda.h>
 #include "../test_interfaces.h"
 
 extern struct test_config bcsr_config;

tests/datawizard/interfaces/bcsr/bcsr_opencl.c

@@ -15,7 +15,6 @@
  */
 #include <config.h>
 #include <starpu.h>
-#include <starpu_opencl.h>
 #include "../test_interfaces.h"
 
 #define KERNEL_LOCATION "tests/datawizard/interfaces/bcsr/bcsr_opencl_kernel.cl"

tests/datawizard/interfaces/block/block_cuda.cu

@@ -14,7 +14,6 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 #include <starpu.h>
-#include <starpu_cuda.h>
 #include "../test_interfaces.h"
 
 extern struct test_config block_config;

tests/datawizard/interfaces/block/block_opencl.c

@@ -15,7 +15,6 @@
  */
 #include <config.h>
 #include <starpu.h>
-#include <starpu_opencl.h>
 #include "../test_interfaces.h"
 
 #define KERNEL_LOCATION "tests/datawizard/interfaces/block/block_opencl_kernel.cl"

tests/datawizard/interfaces/csr/csr_cuda.cu

@@ -14,7 +14,6 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 #include <starpu.h>
-#include <starpu_cuda.h>
 #include "../test_interfaces.h"
 
 extern struct test_config csr_config;

tests/datawizard/interfaces/csr/csr_opencl.c

@@ -15,7 +15,6 @@
  */
 #include <config.h>
 #include <starpu.h>
-#include <starpu_opencl.h>
 #include "../test_interfaces.h"
 
 #define KERNEL_LOCATION "tests/datawizard/interfaces/csr/csr_opencl_kernel.cl"

tests/datawizard/interfaces/matrix/matrix_cuda.cu

@@ -14,7 +14,6 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 #include <starpu.h>
-#include <starpu_cuda.h>
 #include "../test_interfaces.h"
 
 extern struct test_config matrix_config;

tests/datawizard/interfaces/matrix/matrix_opencl.c

@@ -14,7 +14,6 @@
  */
 #include <config.h>
 #include <starpu.h>
-#include <starpu_opencl.h>
 #include "../test_interfaces.h"
 
 #define KERNEL_LOCATION "tests/datawizard/interfaces/matrix/matrix_opencl_kernel.cl"

tests/datawizard/interfaces/multiformat/advanced/generic.c

@@ -13,8 +13,9 @@
  *
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
+
 #include <config.h>
-#include <starpu_data_interfaces.h>
+#include <starpu.h>
 #include "generic.h"
 #include "../../../../helper.h"
 

tests/datawizard/interfaces/multiformat/multiformat_conversion_codelets_cuda.cu

@@ -14,7 +14,6 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 #include <starpu.h>
-#include <starpu_cuda.h>
 #include "multiformat_types.h"
 #include "../../../helper.h"
 

tests/datawizard/interfaces/multiformat/multiformat_conversion_codelets_opencl.c

@@ -17,7 +17,6 @@
 
 #include <config.h>
 #include <starpu.h>
-#include <starpu_opencl.h>
 #include "../../../helper.h"
 
 #define KERNEL_LOCATION "tests/datawizard/interfaces/multiformat/multiformat_conversion_codelets_kernel.cl"

tests/datawizard/interfaces/multiformat/multiformat_cuda.cu

@@ -14,7 +14,6 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 #include <starpu.h>
-#include <starpu_cuda.h>
 #include "multiformat_types.h"
 #include "../test_interfaces.h"
 #include "../../../helper.h"

tests/datawizard/interfaces/multiformat/multiformat_opencl.c

@@ -12,9 +12,9 @@
  *
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
+
 #include <config.h>
 #include <starpu.h>
-#include <starpu_opencl.h>
 #include "../test_interfaces.h"
 
 #define KERNEL_LOCATION "tests/datawizard/interfaces/multiformat/multiformat_opencl_kernel.cl"

tests/datawizard/interfaces/test_interfaces.c

@@ -13,10 +13,8 @@
  *
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
+
 #include <starpu.h>
-#ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
-#endif
 
 /* XXX Why cant we dereference a handle without this one ? */
 #include <core/sched_policy.h>

tests/datawizard/interfaces/variable/variable_cuda.cu

@@ -13,8 +13,8 @@
  *
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
+
 #include <starpu.h>
-#include <starpu_cuda.h>
 #include "../test_interfaces.h"
 
 extern struct test_config variable_config;

tests/datawizard/interfaces/variable/variable_opencl.c

@@ -13,9 +13,9 @@
  *
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
+
 #include <config.h>
 #include <starpu.h>
-#include <starpu_opencl.h>
 #include "../test_interfaces.h"
 
 #define KERNEL_LOCATION "tests/datawizard/interfaces/variable/variable_opencl_kernel.cl"

tests/datawizard/interfaces/vector/test_vector_cuda.cu

@@ -14,7 +14,6 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 #include <starpu.h>
-#include <starpu_cuda.h>
 #include "../test_interfaces.h"
 
 extern struct test_config vector_config;

tests/datawizard/interfaces/vector/test_vector_opencl.c

@@ -15,7 +15,6 @@
  */
 #include <config.h>
 #include <starpu.h>
-#include <starpu_opencl.h>
 #include "../test_interfaces.h"
 
 #define KERNEL_LOCATION "tests/datawizard/interfaces/vector/test_vector_opencl_kernel.cl"

tests/datawizard/lazy_allocation.c

@@ -20,10 +20,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <starpu.h>
-#ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
-#endif
-#include <starpu_cuda.h>
 #include <stdlib.h>
 #include "../helper.h"
 

tests/datawizard/manual_reduction.c

@@ -19,14 +19,6 @@
 #include <starpu.h>
 #include "../helper.h"
 
-#ifdef STARPU_USE_CUDA
-#include <cuda.h>
-#include <starpu_cuda.h>
-#endif
-#ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
-#endif
-
 #define INIT_VALUE	42
 #define NTASKS		10000
 

tests/datawizard/mpi_like.c

@@ -17,9 +17,6 @@
 
 #include <config.h>
 #include <starpu.h>
-#ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
-#endif
 #include <errno.h>
 #include <pthread.h>
 #include "../helper.h"

tests/datawizard/mpi_like_async.c

@@ -17,9 +17,6 @@
 
 #include <config.h>
 #include <starpu.h>
-#ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
-#endif
 #include <pthread.h>
 #include "../helper.h"
 

tests/datawizard/opencl_codelet_unsigned_inc.c

@@ -15,7 +15,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_opencl.h>
 
 extern struct starpu_opencl_program opencl_program;
 

tests/datawizard/partition_lazy.c

@@ -15,7 +15,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_opencl.h>
 #include "../helper.h"
 #include "scal.h"
 

tests/datawizard/readonly.c

@@ -16,9 +16,6 @@
  */
 
 #include <starpu.h>
-#ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
-#endif
 #include "../helper.h"
 
 #ifdef STARPU_USE_OPENCL

tests/datawizard/scal.c

@@ -16,7 +16,6 @@
 
 #include <config.h>
 #include <starpu.h>
-#include <starpu_opencl.h>
 #include "scal.h"
 #include "helper.h"
 

tests/datawizard/scal_cuda.cu

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
+ * Copyright (C) 2010, 2011, 2012  Centre National de la Recherche Scientifique
  * Copyright (C) 2010-2011  Université de Bordeaux 1
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -16,7 +16,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_cuda.h>
 
 static __global__ void vector_mult_cuda(unsigned *val, unsigned n)
 {

tests/datawizard/scratch.c

@@ -20,9 +20,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <starpu.h>
-#ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
-#endif
 #include <stdlib.h>
 #include "../helper.h"
 

tests/datawizard/scratch_cuda.cu

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2010  Université de Bordeaux 1
- * Copyright (C) 2010  Centre National de la Recherche Scientifique
+ * Copyright (C) 2010, 2012  Centre National de la Recherche Scientifique
  *
  * 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
@@ -17,7 +17,6 @@
 
 #include <stdio.h>
 #include <starpu.h>
-#include <starpu_cuda.h>
 
 #define MAXNBLOCKS		32
 #define MAXTHREADSPERBLOCK	128

tests/datawizard/scratch_opencl.c

@@ -15,7 +15,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_opencl.h>
 
 extern struct starpu_opencl_program opencl_program;
 

tests/datawizard/sync_and_notify_data.c

@@ -55,7 +55,6 @@ void cuda_codelet_incC(void *descr[], __attribute__ ((unused)) void *_args);
 #endif
 
 #ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
 void opencl_codelet_incA(void *descr[], __attribute__ ((unused)) void *_args);
 void opencl_codelet_incC(void *descr[], __attribute__ ((unused)) void *_args);
 struct starpu_opencl_program opencl_code;

tests/datawizard/sync_and_notify_data_implicit.c

@@ -54,7 +54,6 @@ void cuda_codelet_incC(void *descr[], __attribute__ ((unused)) void *_args);
 #endif
 
 #ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
 void opencl_codelet_incA(void *descr[], __attribute__ ((unused)) void *_args);
 void opencl_codelet_incC(void *descr[], __attribute__ ((unused)) void *_args);
 struct starpu_opencl_program opencl_code;

tests/datawizard/sync_and_notify_data_kernels.cu

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2010  Université de Bordeaux 1
- * Copyright (C) 2010  Centre National de la Recherche Scientifique
+ * Copyright (C) 2010, 2012  Centre National de la Recherche Scientifique
  *
  * 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
@@ -16,7 +16,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_cuda.h>
 
 /*
  *	increment a (val[0])

tests/datawizard/sync_and_notify_data_opencl.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010  Centre National de la Recherche Scientifique
+ * Copyright (C) 2010, 2012  Centre National de la Recherche Scientifique
  * Copyright (C) 2011  Université de Bordeaux 1
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -17,7 +17,6 @@
 
 #include <config.h>
 #include <starpu.h>
-#include <starpu_opencl.h>
 #include "../helper.h"
 
 extern struct starpu_opencl_program opencl_code;

tests/datawizard/write_only_tmp_buffer.c

@@ -23,17 +23,11 @@
 #include <stdlib.h>
 #include "../helper.h"
 
-#ifdef STARPU_USE_CUDA
-#include <starpu_cuda.h>
-#endif
-
 #define VECTORSIZE	1024
 
 starpu_data_handle_t v_handle;
 
 #ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
-
 static void opencl_codelet_null(void *descr[], __attribute__ ((unused)) void *_args)
 {
 	STARPU_SKIP_IF_VALGRIND;

tests/datawizard/wt_broadcast.c

@@ -18,13 +18,6 @@
 #include <starpu.h>
 #include "../helper.h"
 
-#ifdef STARPU_USE_CUDA
-#include <starpu_cuda.h>
-#endif
-#ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
-#endif
-
 static unsigned var = 0;
 static starpu_data_handle_t handle;
 /*

tests/datawizard/wt_host.c

@@ -18,13 +18,6 @@
 #include <starpu.h>
 #include "../helper.h"
 
-#ifdef STARPU_USE_CUDA
-#include <starpu_cuda.h>
-#endif
-#ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
-#endif
-
 static unsigned var = 0;
 static starpu_data_handle_t handle;
 /*

tests/main/driver_api/init_run_deinit.c

@@ -15,7 +15,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_opencl.h>
 
 #include "../../helper.h"
 

tests/main/driver_api/run_driver.c

@@ -16,9 +16,6 @@
 
 #include <starpu.h>
 #include <pthread.h>
-#ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
-#endif
 
 #include "../../helper.h"
 

tests/microbenchs/async_tasks_overhead.c

@@ -19,9 +19,7 @@
 #include <pthread.h>
 #include <stdio.h>
 #include <unistd.h>
-
 #include <starpu.h>
-#include <starpu_profiling.h>
 #include "../helper.h"
 
 static unsigned ntasks = 65536;

tests/microbenchs/matrix_as_vector.c

@@ -20,7 +20,6 @@
 
 #ifdef STARPU_USE_CUDA
 #  include <cublas.h>
-#  include <starpu_cuda.h>
 #endif
 
 #define LOOPS 100

tests/perfmodels/feed.c

@@ -20,9 +20,6 @@
 
 #include <config.h>
 #include <starpu.h>
-#ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
-#endif
 #include "../helper.h"
 
 static struct starpu_perfmodel model =

tests/perfmodels/non_linear_regression_based.c

@@ -18,12 +18,6 @@
 
 #include <config.h>
 #include <starpu.h>
-#ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
-#endif
-#ifdef STARPU_USE_CUDA
-#include <starpu_cuda.h>
-#endif
 #include "../helper.h"
 
 #ifdef STARPU_USE_CUDA

tests/perfmodels/opencl_memset.c

@@ -15,7 +15,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_opencl.h>
 
 extern struct starpu_opencl_program opencl_program;
 

tests/perfmodels/regression_based.c

@@ -18,12 +18,6 @@
 
 #include <config.h>
 #include <starpu.h>
-#ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
-#endif
-#ifdef STARPU_USE_CUDA
-#include <starpu_cuda.h>
-#endif
 #include "../helper.h"
 
 #ifdef STARPU_USE_CUDA

tests/sched_policies/data_locality.c

@@ -1,5 +1,4 @@
 #include <starpu.h>
-#include <starpu_profiling.h>
 
 #include "../helper.h"
 

tests/sched_policies/execute_all_tasks.c

@@ -16,10 +16,7 @@
 
 #include <math.h>
 #include <unistd.h>
-
 #include <starpu.h>
-#include <starpu_profiling.h>
-
 #include "../helper.h"
 
 /*

tests/sched_policies/simple_cpu_gpu_sched.c

@@ -15,8 +15,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_profiling.h>
-
 #include "../helper.h"
 
 /*

tests/sched_policies/simple_deps.c

@@ -15,11 +15,7 @@
  */
 
 #include <unistd.h>
-
 #include <starpu.h>
-#include <starpu_profiling.h>
-
-
 #include "../helper.h"
 
 /*