Browse Source

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

Nathalie Furmento 12 years ago
parent
commit
0206908fb0

+ 2 - 3
mpi/examples/cholesky/mpi_cholesky_kernels.c

@@ -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
@@ -15,14 +15,13 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
-#include <starpu_config.h>
+#include <starpu.h>
 #include "mpi_cholesky.h"
 #include "common/blas.h"
 #ifdef STARPU_USE_CUDA
 #include <cuda.h>
 #include <cuda_runtime.h>
 #include <cublas.h>
-#include <starpu_cuda.h>
 #ifdef STARPU_HAVE_MAGMA
 #include "magma.h"
 #include "magma_lapack.h"

+ 1 - 6
mpi/examples/mpi_lu/pxlu.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
@@ -18,13 +18,8 @@
 #ifndef __PXLU_H__
 #define __PXLU_H__
 
-/* for STARPU_USE_CUDA */
-#include <starpu_config.h>
 #include <starpu.h>
-#include <starpu_cuda.h>
-
 #include <common/blas.h>
-
 #include <starpu_mpi.h>
 
 #define BLAS3_FLOP(n1,n2,n3)    \

+ 1 - 4
mpi/examples/mpi_lu/pxlu_kernels.h

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2010, 2012  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,9 +19,6 @@
 #define __PXLU_KERNELS_H__
 
 #include <starpu.h>
-#ifdef STARPU_USE_CUDA
-#include <starpu_cuda.h>
-#endif
 
 #define str(s) #s
 #define xstr(s)        str(s)

+ 5 - 1
mpi/starpu_mpi.h

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2009-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
@@ -19,6 +19,9 @@
 #define __STARPU_MPI_H__
 
 #include <starpu.h>
+
+#if defined(STARPU_USE_MPI)
+
 #include <mpi.h>
 
 #ifdef __cplusplus
@@ -63,4 +66,5 @@ int starpu_mpi_irecv_array_detached_unlock_tag(unsigned array_size, starpu_data_
 }
 #endif
 
+#endif // STARPU_USE_MPI
 #endif // __STARPU_MPI_H__

+ 0 - 1
mpi/tests/insert_task_owner2.c

@@ -15,7 +15,6 @@
  */
 
 #include <starpu_mpi.h>
-#include <starpu_mpi_datatype.h>
 #include <math.h>
 #include "helper.h"
 

+ 0 - 1
mpi/tests/insert_task_owner_data.c

@@ -15,7 +15,6 @@
  */
 
 #include <starpu_mpi.h>
-#include <starpu_mpi_datatype.h>
 #include <math.h>
 #include "helper.h"
 

+ 1 - 2
mpi/tests/ring_kernel.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>
 
 static __global__ void cuda_incrementer(unsigned *token)
 {