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

examples/axpy/axpy.c

@@ -27,10 +27,6 @@
 
 #ifdef STARPU_USE_CUDA
 #include <cublas.h>
-#include <starpu_cuda.h>
-#endif
-#ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
 #endif
 
 #include "axpy.h"

examples/axpy/axpy_opencl.c

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

examples/basic_examples/block.c

@@ -16,7 +16,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_opencl.h>
 #include <pthread.h>
 #include <math.h>
 

examples/basic_examples/block_cuda.cu

@@ -15,7 +15,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_cuda.h>
 
 static __global__ void cuda_block(float *block, int nx, int ny, int nz, unsigned ldy, unsigned ldz, float multiplier)
 {

examples/basic_examples/block_opencl.c

@@ -16,7 +16,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_opencl.h>
 
 #define CHECK_CL_SET_KERNEL_ARG(kernel, n, size, ptr)       \
 do						    	    \

examples/basic_examples/multiformat.c

@@ -15,9 +15,6 @@
  */
 
 #include <starpu.h>
-#ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
-#endif
 #include "multiformat_types.h"
 
 static int ncpu = 0;

examples/basic_examples/multiformat_conversion_codelets_cuda.cu

@@ -15,7 +15,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_cuda.h>
 #include "multiformat_types.h"
 
 static __global__ void cpu_to_cuda_cuda(struct point *src,

examples/basic_examples/multiformat_conversion_codelets_opencl.c

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

examples/basic_examples/multiformat_cuda.cu

@@ -15,7 +15,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_cuda.h>
 #include "multiformat_types.h"
 
 static __global__ void multiformat_cuda(struct struct_of_arrays *soa, unsigned n)

examples/basic_examples/multiformat_opencl.c

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

examples/basic_examples/variable.c

@@ -29,7 +29,6 @@ extern void cuda_codelet(void *descr[], __attribute__ ((unused)) void *_args);
 #endif
 
 #ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
 extern void opencl_codelet(void *descr[], __attribute__ ((unused)) void *_args);
 struct starpu_opencl_program opencl_program;
 #endif

examples/basic_examples/variable_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>
 
 static __global__ void cuda_variable(float * tab)
 {

examples/basic_examples/variable_kernels_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
@@ -16,7 +16,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_opencl.h>
 
 extern struct starpu_opencl_program opencl_program;
 void opencl_codelet(void *descr[], void *_args)

examples/basic_examples/vector_scal.c

@@ -25,7 +25,6 @@
 
 #include <config.h>
 #include <starpu.h>
-#include <starpu_opencl.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>

examples/basic_examples/vector_scal_c.c

@@ -26,7 +26,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_opencl.h>
 #include <stdio.h>
 
 

examples/basic_examples/vector_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  Université de Bordeaux 1
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -20,7 +20,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_cuda.h>
 
 static __global__ void vector_mult_cuda(float *val, unsigned n,
                                         float factor)

examples/basic_examples/vector_scal_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) 2010  Institut National de Recherche en Informatique et Automatique
  * Copyright (C) 2011  Université de Bordeaux 1
  *
@@ -21,7 +21,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_opencl.h>
 
 extern struct starpu_opencl_program opencl_program;
 

examples/binary/binary.c

@@ -22,7 +22,6 @@
 #define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
 
 #ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
 extern void opencl_codelet(void *descr[], __attribute__ ((unused)) void *_args);
 struct starpu_opencl_program opencl_program;
 #endif

examples/cg/cg.h

@@ -24,11 +24,8 @@
 #ifdef STARPU_USE_CUDA
 #include <cuda.h>
 #include <cublas.h>
-#include <starpu_cuda.h>
 #endif
 
-#include <starpu.h>
-
 #define DOUBLE
 
 #ifdef DOUBLE

examples/cg/cg_dot_kernel.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>
 
 #include "cg.h"
 

examples/cholesky/cholesky.h

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2009, 2010, 2011  Université de Bordeaux 1
- * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
+ * Copyright (C) 2010, 2011, 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
@@ -30,7 +30,6 @@
 
 #include <common/blas.h>
 #include <starpu.h>
-#include <starpu_bound.h>
 
 #define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
 #define NMAXBLOCKS	32

examples/cholesky/cholesky_kernels.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2009, 2010, 2011-2012  Université de Bordeaux 1
- * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
+ * Copyright (C) 2010, 2011, 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,16 +15,13 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
-#include <starpu_config.h>
+#include <starpu.h>
 #include "cholesky.h"
 #include "../common/blas.h"
-#ifdef STARPU_USE_CUDA
-#include <starpu_cuda.h>
-#ifdef STARPU_HAVE_MAGMA
+#if defined(STARPU_USE_CUDA) && defined(STARPU_HAVE_MAGMA)
 #include "magma.h"
 #include "magma_lapack.h"
 #endif
-#endif
 
 /*
  *   U22 

examples/cpp/incrementer_cpp.cpp

@@ -25,7 +25,6 @@ extern "C" void cuda_codelet(void *descr[], __attribute__ ((unused)) void *_args
 #endif
 
 #ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
 extern "C" void opencl_codelet(void *descr[], __attribute__ ((unused)) void *_args);
 struct starpu_opencl_program opencl_program;
 #endif

examples/filters/custom_mf/conversion.cu

@@ -15,7 +15,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_cuda.h>
 #include "custom_types.h"
 #include "custom_interface.h"
 

examples/filters/custom_mf/conversion_opencl.c

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

examples/filters/custom_mf/cuda.cu

@@ -15,7 +15,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_cuda.h>
 #include "custom_types.h"
 #include "custom_interface.h"
 

examples/filters/custom_mf/custom_interface.c

@@ -14,10 +14,6 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 #include <starpu.h>
-#include <starpu_hash.h>
-#ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
-#endif
 #include "custom_interface.h"
 #include "custom_types.h"
 

examples/filters/custom_mf/custom_mf_filter.c

@@ -16,9 +16,6 @@
 #include <starpu.h>
 #include "custom_interface.h"
 #include "custom_types.h"
-#ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
-#endif /* !STARPU_USE_OPENCL */
 
 #define N 12
 

examples/filters/custom_mf/custom_opencl.c

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

examples/filters/fblock.c

@@ -16,7 +16,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_opencl.h>
 
 #define NX    5
 #define NY    4

examples/filters/fblock_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
  *
  * 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 fblock_cuda(int *block, int nx, int ny, int nz, unsigned ldy, unsigned ldz, float factor)
 {

examples/filters/fblock_opencl.c

@@ -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) 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_opencl.h>
 
 #define CHECK_CL_SET_KERNEL_ARG(kernel, n, size, ptr)       \
 do                                                          \

examples/filters/shadow.c

@@ -41,7 +41,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_cuda.h>
 
 /* Shadow width */
 #define SHADOW 2

examples/filters/shadow2d.c

@@ -81,7 +81,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_cuda.h>
 
 /* Shadow width */
 #define SHADOWX 3

examples/filters/shadow3d.c

@@ -26,7 +26,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_cuda.h>
 
 /* Shadow width */
 #define SHADOWX 2

examples/gl_interop/gl_interop.c

@@ -27,9 +27,6 @@
 #include <starpu.h>
 #include <unistd.h>
 #include <GL/glut.h>
-#ifdef STARPU_USE_CUDA
-#include <starpu_cuda.h>
-#endif
 
 void dummy(void *buffers[], void *cl_arg)
 {

examples/gl_interop/gl_interop_idle.c

@@ -30,9 +30,6 @@
 #include <starpu.h>
 #include <unistd.h>
 #include <GL/glut.h>
-#ifdef STARPU_USE_CUDA
-#include <starpu_cuda.h>
-#endif
 
 void dummy(void *buffers[], void *cl_arg)
 {

examples/heat/dw_factolu.h

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2009, 2010-2012  Université de Bordeaux 1
- * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
+ * Copyright (C) 2010, 2011, 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
@@ -22,19 +22,15 @@
 #include <string.h>
 #include <math.h>
 #include <sys/time.h>
-/* for STARPU_USE_CUDA */
-#include <starpu_config.h>
+#include <starpu.h>
 #ifdef STARPU_USE_CUDA
 #include <cuda.h>
 #include <cuda_runtime.h>
 #include <cublas.h>
-#include <starpu_cuda.h>
 #endif
 
 #include "../common/blas.h"
 
-#include <starpu.h>
-
 #include "lu_kernels_model.h"
 
 #define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)

examples/heat/dw_sparse_cg.h

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
- * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
+ * Copyright (C) 2010, 2011, 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
@@ -28,7 +28,6 @@
 #include <pthread.h>
 #include <signal.h>
 
-#include <starpu_config.h>
 #include <starpu.h>
 
 #ifdef STARPU_USE_CUDA

examples/heat/heat.h

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2009, 2010, 2011-2012  Université de Bordeaux 1
- * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
+ * Copyright (C) 2010, 2011, 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
@@ -25,7 +25,6 @@
 #include <math.h>
 
 /* needed for STARPU_OPENGL_RENDER */
-#include <starpu_config.h>
 #include <starpu.h>
 
 #include <common/blas.h>

examples/incrementer/incrementer.c

@@ -27,7 +27,6 @@ extern void cuda_codelet(void *descr[], __attribute__ ((unused)) void *_args);
 #endif
 
 #ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
 extern void opencl_codelet(void *descr[], __attribute__ ((unused)) void *_args);
 struct starpu_opencl_program opencl_program;
 #endif

examples/incrementer/incrementer_kernels.cu

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2009, 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,13 +16,12 @@
  */
 
 #include <starpu.h>
-#include <starpu_cuda.h>
 
 static __global__ void cuda_incrementer(float * tab)
 {
 	tab[0] = tab[0] + 1.0f;
 	tab[2] = tab[2] + 1.0f;
-	
+
 	return;
 }
 

examples/incrementer/incrementer_kernels_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
@@ -16,7 +16,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_opencl.h>
 
 extern struct starpu_opencl_program opencl_program;
 void opencl_codelet(void *descr[], void *_args)

examples/interface/complex.c

@@ -17,9 +17,6 @@
 #include <starpu.h>
 #include "complex_interface.h"
 #include "complex_codelet.h"
-#ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
-#endif
 
 #ifdef STARPU_USE_CUDA
 extern void copy_complex_codelet_cuda(void *descr[], __attribute__ ((unused)) void *_args);

examples/interface/complex_interface.c

@@ -15,9 +15,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_cuda.h>
-#include <starpu_opencl.h>
-#include <starpu_hash.h>
 
 #include "complex_interface.h"
 

examples/interface/complex_kernels.cu

@@ -15,7 +15,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_cuda.h>
 #include "complex_interface.h"
 
 static __global__ void complex_copy_cuda(double *o_real, double *o_imaginary, double *i_real, double *i_imaginary, unsigned n)

examples/interface/complex_kernels_opencl.c

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

examples/lu/lu_example.c

@@ -21,8 +21,6 @@
 #include <time.h>
 #include <math.h>
 #include <starpu.h>
-#include <starpu_profiling.h>
-#include <starpu_bound.h>
 #include "xlu.h"
 #include "xlu_kernels.h"
 

examples/lu/xlu.h

@@ -19,12 +19,7 @@
 #define __XLU_H__
 
 #include <sys/time.h>
-
-/* for STARPU_USE_CUDA */
-#include <starpu_config.h>
 #include <starpu.h>
-#include <starpu_cuda.h>
-
 #include <common/blas.h>
 
 #define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)

examples/mandelbrot/mandelbrot.c

@@ -16,9 +16,6 @@
  */
 
 #include <starpu.h>
-#ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
-#endif
 #include <sys/time.h>
 #include <math.h>
 #include <limits.h>

examples/matvecmult/matvecmult.c

@@ -16,7 +16,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_opencl.h>
 #include <pthread.h>
 #include <math.h>
 

examples/mult/xgemm.c

@@ -28,7 +28,6 @@
 #ifdef STARPU_USE_CUDA
 #include <cuda.h>
 #include <cublas.h>
-#include <starpu_cuda.h>
 #endif
 
 static unsigned niter = 100;

examples/pi/SobolQRNG/sobol_gpu.cu

@@ -40,7 +40,6 @@
 #include "sobol.h"
 #include "sobol_gpu.h"
 #include <starpu.h>
-#include <starpu_cuda.h>
 
 #define k_2powneg32 2.3283064E-10F
 

examples/pi/pi.h

@@ -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
@@ -19,7 +19,6 @@
 #define __PI_H__
 
 #include <starpu.h>
-#include <starpu_cuda.h>
 #include <stdio.h>
 
 #define NSHOT_PER_TASK	(16*1024*1024ULL)

examples/pi/pi_kernel.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 "SobolQRNG/sobol_gpu.h"
 #include "pi.h"
-#include <starpu_cuda.h>
 
 #define MAXNBLOCKS	128
 #define MAXTHREADSPERBLOCK	256

examples/pi/pi_redux.c

@@ -17,7 +17,6 @@
 #include <starpu.h>
 #include <stdlib.h>
 #include <sys/time.h>
-#include <starpu_config.h>
 
 #define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
 #define PI	3.14159265358979323846
@@ -29,7 +28,6 @@
 #ifdef STARPU_HAVE_CURAND
 #include <cuda.h>
 #include <curand.h>
-#include <starpu_cuda.h>
 #endif
 
 #define NSHOT_PER_TASK	(1024*1024)

examples/pi/pi_redux_kernel.cu

@@ -15,7 +15,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_cuda.h>
 
 #define MAXNBLOCKS	128
 #define MAXTHREADSPERBLOCK	256

examples/profiling/profiling.c

@@ -16,7 +16,6 @@
  */
 
 #include <starpu.h>
-#include <starpu_profiling.h>
 #include <assert.h>
 #include <unistd.h>
 

examples/reductions/dot_product.c

@@ -24,11 +24,6 @@
 #ifdef STARPU_USE_CUDA
 #include <cuda.h>
 #include <cublas.h>
-#include <starpu_cuda.h>
-#endif
-
-#ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
 #endif
 
 #define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)

examples/reductions/dot_product_kernels.cu

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2011  Centre National de la Recherche Scientifique
+ * Copyright (C) 2011, 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>
 
 #define DOT_TYPE double
 

examples/spmv/spmv.h

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2009, 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
@@ -28,14 +28,6 @@
 
 #include <starpu.h>
 
-#ifdef STARPU_USE_CUDA
-#include <starpu_cuda.h>
-#endif
-
-#ifdef STARPU_USE_OPENCL
-#include <starpu_opencl.h>
-#endif
-
 #define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
 
 #ifdef STARPU_USE_CUDA

examples/spmv/spmv_cuda.cu

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2009, 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>
 
 #define MIN(a,b)	((a)<(b)?(a):(b))
 

examples/stencil/life_cuda.cu

@@ -16,7 +16,6 @@
 
 #define _externC extern "C"
 #include "stencil.h"
-#include <starpu_cuda.h>
 
 /* Heart of the stencil computation: compute a new state from an old one. */
 

examples/stencil/life_opencl.c

@@ -21,7 +21,6 @@
 #include <stencil.h>
 #include <CL/cl.h>
 #include <starpu.h>
-#include <starpu_opencl.h>
 
 #define str(x) #x
 

examples/stencil/shadow.cu

@@ -16,7 +16,6 @@
 
 #define _externC extern "C"
 #include "stencil.h"
-#include <starpu_cuda.h>
 
 /* Perform replication of data on X and Y edges, to fold the domain on 
    itself through mere replication of the source state. */

examples/stencil/shadow_opencl.c

@@ -15,7 +15,6 @@
  */
 
 #include "stencil.h"
-#include <starpu_opencl.h>
 
 /* Perform replication of data on X and Y edges, to fold the domain on 
    itself through mere replication of the source state. */

examples/stencil/stencil-kernels.c

@@ -18,11 +18,6 @@
 #include "stencil.h"
 #include <sys/time.h>
 
-#ifdef STARPU_USE_OPENCL
-#include <CL/cl.h>
-#include <starpu_opencl.h>
-#endif
-
 #ifndef timersub
 #define	timersub(x, y, res) \
 	do \

examples/stencil/stencil.h

@@ -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
@@ -21,10 +21,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <starpu.h>
-#include <starpu_top.h>
-#ifdef STARPU_USE_CUDA
-#include <starpu_cuda.h>
-#endif
 
 #ifndef __CUDACC__
 #ifdef STARPU_USE_MPI

examples/top/hello_world_top.c

@@ -30,7 +30,6 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <starpu.h>
-#include <starpu_top.h>
 #include <stdlib.h>
 #include <time.h>