[cig-commits] [commit] devel: updates cuda file includes (bd8f2a0)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Thu Sep 25 03:49:45 PDT 2014
Repository : https://github.com/geodynamics/specfem3d
On branch : devel
Link : https://github.com/geodynamics/specfem3d/compare/69d1a6fe5d756c2d8d122dd4521d96ddd99b5671...63b33a6cfd79d58ef4ebcf2ca10eb8317b416a7d
>---------------------------------------------------------------
commit bd8f2a037dbfb35f31ea71657aac266805b818d4
Author: daniel peter <peterda at ethz.ch>
Date: Mon Sep 22 11:47:31 2014 +0200
updates cuda file includes
>---------------------------------------------------------------
bd8f2a037dbfb35f31ea71657aac266805b818d4
src/cuda/assemble_MPI_scalar_cuda.cu | 8 --------
src/cuda/assemble_MPI_vector_cuda.cu | 8 --------
src/cuda/check_fields_cuda.cu | 12 ------------
src/cuda/compute_add_sources_acoustic_cuda.cu | 11 -----------
src/cuda/compute_add_sources_viscoelastic_cuda.cu | 12 ------------
src/cuda/compute_coupling_cuda.cu | 9 ---------
src/cuda/compute_forces_acoustic_cuda.cu | 10 ++--------
src/cuda/compute_forces_viscoelastic_cuda.cu | 9 +--------
src/cuda/compute_kernels_cuda.cu | 11 -----------
src/cuda/compute_stacey_acoustic_cuda.cu | 9 ---------
src/cuda/compute_stacey_viscoelastic_cuda.cu | 9 ---------
src/cuda/initialize_cuda.cu | 13 -------------
src/cuda/mesh_constants_cuda.h | 21 ++++++++++++++++++---
src/cuda/noise_tomography_cuda.cu | 14 --------------
src/cuda/prepare_constants_cuda.h | 6 +++---
src/cuda/prepare_mesh_constants_cuda.cu | 14 ++------------
src/cuda/transfer_fields_cuda.cu | 11 -----------
src/cuda/update_displacement_cuda.cu | 10 ----------
src/cuda/write_seismograms_cuda.cu | 9 ---------
19 files changed, 26 insertions(+), 180 deletions(-)
diff --git a/src/cuda/assemble_MPI_scalar_cuda.cu b/src/cuda/assemble_MPI_scalar_cuda.cu
index 4b8b1c6..347293a 100644
--- a/src/cuda/assemble_MPI_scalar_cuda.cu
+++ b/src/cuda/assemble_MPI_scalar_cuda.cu
@@ -26,14 +26,6 @@
!=====================================================================
*/
-#include <stdio.h>
-#include <cuda.h>
-#include <cublas.h>
-
-#include <sys/time.h>
-#include <sys/resource.h>
-
-#include "config.h"
#include "mesh_constants_cuda.h"
/* ----------------------------------------------------------------------------------------------- */
diff --git a/src/cuda/assemble_MPI_vector_cuda.cu b/src/cuda/assemble_MPI_vector_cuda.cu
index 9c23556..db5d3bf 100644
--- a/src/cuda/assemble_MPI_vector_cuda.cu
+++ b/src/cuda/assemble_MPI_vector_cuda.cu
@@ -26,14 +26,6 @@
!=====================================================================
*/
-#include <stdio.h>
-#include <cuda.h>
-#include <cublas.h>
-
-#include <sys/time.h>
-#include <sys/resource.h>
-
-#include "config.h"
#include "mesh_constants_cuda.h"
/* ----------------------------------------------------------------------------------------------- */
diff --git a/src/cuda/check_fields_cuda.cu b/src/cuda/check_fields_cuda.cu
index 3d0ffe3..a9285dd 100644
--- a/src/cuda/check_fields_cuda.cu
+++ b/src/cuda/check_fields_cuda.cu
@@ -27,18 +27,6 @@
!=====================================================================
*/
-#include <stdio.h>
-#include <cuda.h>
-#include <cublas.h>
-
-#ifdef WITH_MPI
-#include <mpi.h>
-#endif
-
-#include <sys/time.h>
-#include <sys/resource.h>
-
-#include "config.h"
#include "mesh_constants_cuda.h"
/* ----------------------------------------------------------------------------------------------- */
diff --git a/src/cuda/compute_add_sources_acoustic_cuda.cu b/src/cuda/compute_add_sources_acoustic_cuda.cu
index 34596c3..740e767 100644
--- a/src/cuda/compute_add_sources_acoustic_cuda.cu
+++ b/src/cuda/compute_add_sources_acoustic_cuda.cu
@@ -27,19 +27,8 @@
!=====================================================================
*/
-#include <stdio.h>
-#include <cuda.h>
-#include <cublas.h>
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-
-#include "config.h"
#include "mesh_constants_cuda.h"
-
/* ----------------------------------------------------------------------------------------------- */
// acoustic sources
diff --git a/src/cuda/compute_add_sources_viscoelastic_cuda.cu b/src/cuda/compute_add_sources_viscoelastic_cuda.cu
index 68af9ce..0e86fe7 100644
--- a/src/cuda/compute_add_sources_viscoelastic_cuda.cu
+++ b/src/cuda/compute_add_sources_viscoelastic_cuda.cu
@@ -27,19 +27,7 @@
!=====================================================================
*/
-#include <stdio.h>
-#include <cuda.h>
-#include <cublas.h>
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-
-#include "config.h"
#include "mesh_constants_cuda.h"
-// #include "epik_user.h"
-
/* ----------------------------------------------------------------------------------------------- */
diff --git a/src/cuda/compute_coupling_cuda.cu b/src/cuda/compute_coupling_cuda.cu
index 561192d..c4fe298 100644
--- a/src/cuda/compute_coupling_cuda.cu
+++ b/src/cuda/compute_coupling_cuda.cu
@@ -27,17 +27,8 @@
!=====================================================================
*/
-#include <stdio.h>
-#include <cuda.h>
-#include <cublas.h>
-
-#include <sys/time.h>
-#include <sys/resource.h>
-
-#include "config.h"
#include "mesh_constants_cuda.h"
-
/* ----------------------------------------------------------------------------------------------- */
// ACOUSTIC - ELASTIC coupling
diff --git a/src/cuda/compute_forces_acoustic_cuda.cu b/src/cuda/compute_forces_acoustic_cuda.cu
index 33f4d7c..3626d86 100644
--- a/src/cuda/compute_forces_acoustic_cuda.cu
+++ b/src/cuda/compute_forces_acoustic_cuda.cu
@@ -27,16 +27,10 @@
!=====================================================================
*/
-#include <stdio.h>
-#include <cuda.h>
-#include <cublas.h>
-
-#include <sys/time.h>
-#include <sys/resource.h>
-
-#include "config.h"
#include "mesh_constants_cuda.h"
+/* ----------------------------------------------------------------------------------------------- */
+
#ifdef USE_TEXTURES_FIELDS
realw_texture d_potential_tex;
realw_texture d_potential_dot_dot_tex;
diff --git a/src/cuda/compute_forces_viscoelastic_cuda.cu b/src/cuda/compute_forces_viscoelastic_cuda.cu
index 053d225..87fcb29 100644
--- a/src/cuda/compute_forces_viscoelastic_cuda.cu
+++ b/src/cuda/compute_forces_viscoelastic_cuda.cu
@@ -27,16 +27,9 @@
!=====================================================================
*/
-#include <stdio.h>
-#include <cuda.h>
-#include <cublas.h>
-
-#include <sys/time.h>
-#include <sys/resource.h>
-
-#include "config.h"
#include "mesh_constants_cuda.h"
+/* ----------------------------------------------------------------------------------------------- */
#ifdef USE_TEXTURES_FIELDS
realw_texture d_displ_tex;
diff --git a/src/cuda/compute_kernels_cuda.cu b/src/cuda/compute_kernels_cuda.cu
index 3fad000..8f1c103 100644
--- a/src/cuda/compute_kernels_cuda.cu
+++ b/src/cuda/compute_kernels_cuda.cu
@@ -27,19 +27,8 @@
!=====================================================================
*/
-#include <stdio.h>
-#include <cuda.h>
-#include <cublas.h>
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-
-#include "config.h"
#include "mesh_constants_cuda.h"
-
/* ----------------------------------------------------------------------------------------------- */
// ELASTIC SIMULATIONS
diff --git a/src/cuda/compute_stacey_acoustic_cuda.cu b/src/cuda/compute_stacey_acoustic_cuda.cu
index 76f77bf..494d6da 100644
--- a/src/cuda/compute_stacey_acoustic_cuda.cu
+++ b/src/cuda/compute_stacey_acoustic_cuda.cu
@@ -27,17 +27,8 @@
!=====================================================================
*/
-#include <stdio.h>
-#include <cuda.h>
-#include <cublas.h>
-
-#include <sys/time.h>
-#include <sys/resource.h>
-
-#include "config.h"
#include "mesh_constants_cuda.h"
-
/* ----------------------------------------------------------------------------------------------- */
__global__ void compute_stacey_acoustic_kernel(realw* potential_dot_acoustic,
diff --git a/src/cuda/compute_stacey_viscoelastic_cuda.cu b/src/cuda/compute_stacey_viscoelastic_cuda.cu
index c56b0f9..ac12f1a 100644
--- a/src/cuda/compute_stacey_viscoelastic_cuda.cu
+++ b/src/cuda/compute_stacey_viscoelastic_cuda.cu
@@ -27,17 +27,8 @@
!=====================================================================
*/
-#include <stdio.h>
-#include <cuda.h>
-#include <cublas.h>
-
-#include <sys/time.h>
-#include <sys/resource.h>
-
-#include "config.h"
#include "mesh_constants_cuda.h"
-
/* ----------------------------------------------------------------------------------------------- */
__global__ void compute_stacey_elastic_kernel(realw* veloc,
diff --git a/src/cuda/initialize_cuda.cu b/src/cuda/initialize_cuda.cu
index 0eb0454..c6afe0a 100644
--- a/src/cuda/initialize_cuda.cu
+++ b/src/cuda/initialize_cuda.cu
@@ -27,21 +27,8 @@
!=====================================================================
*/
-#include <stdio.h>
-#include <cuda.h>
-#include <cublas.h>
-
-#ifdef WITH_MPI
-#include <mpi.h>
-#endif
-
-#include <sys/time.h>
-#include <sys/resource.h>
-
-#include "config.h"
#include "mesh_constants_cuda.h"
-
/* ----------------------------------------------------------------------------------------------- */
// GPU initialization
diff --git a/src/cuda/mesh_constants_cuda.h b/src/cuda/mesh_constants_cuda.h
index 691d0aa..2acfd4e 100644
--- a/src/cuda/mesh_constants_cuda.h
+++ b/src/cuda/mesh_constants_cuda.h
@@ -41,11 +41,26 @@
*/
-#ifndef GPU_MESH_
-#define GPU_MESH_
+#ifndef MESH_CONSTANTS_CUDA_H
+#define MESH_CONSTANTS_CUDA_H
-#include <sys/types.h>
+#include <stdio.h>
+#include <stdlib.h>
#include <unistd.h>
+#include <math.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+
+#include "config.h"
+
+#ifdef WITH_MPI
+#include <mpi.h>
+#endif
+
+#include <cuda.h>
+#include <cuda_runtime.h>
+
/* ----------------------------------------------------------------------------------------------- */
diff --git a/src/cuda/noise_tomography_cuda.cu b/src/cuda/noise_tomography_cuda.cu
index 542b5a7..9553ebb 100644
--- a/src/cuda/noise_tomography_cuda.cu
+++ b/src/cuda/noise_tomography_cuda.cu
@@ -27,21 +27,7 @@
!=====================================================================
*/
-#include <stdio.h>
-#include <cuda.h>
-#include <cublas.h>
-
-#ifdef WITH_MPI
-#include <mpi.h>
-#endif
-
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "config.h"
#include "mesh_constants_cuda.h"
-// #include "epik_user.h"
-
/* ----------------------------------------------------------------------------------------------- */
diff --git a/src/cuda/prepare_constants_cuda.h b/src/cuda/prepare_constants_cuda.h
index 0468491..da9bec9 100644
--- a/src/cuda/prepare_constants_cuda.h
+++ b/src/cuda/prepare_constants_cuda.h
@@ -27,8 +27,8 @@
!=====================================================================
*/
-#ifndef CUDA_HEADER_H
-#define CUDA_HEADER_H
+#ifndef PREPARE_CONSTANTS_CUDA_H
+#define PREPARE_CONSTANTS_CUDA_H
typedef float realw; // type of "working" variables
@@ -292,4 +292,4 @@ void setConst_wgll_cube(realw* array,Mesh* mp)
}
-#endif //CUDA_HEADER_H
+#endif
diff --git a/src/cuda/prepare_mesh_constants_cuda.cu b/src/cuda/prepare_mesh_constants_cuda.cu
index 9ba23a4..23e8902 100644
--- a/src/cuda/prepare_mesh_constants_cuda.cu
+++ b/src/cuda/prepare_mesh_constants_cuda.cu
@@ -27,21 +27,11 @@
!=====================================================================
*/
-#include <stdio.h>
-#include <cuda.h>
-#include <cublas.h>
-
-#ifdef WITH_MPI
-#include <mpi.h>
-#endif
-
-#include <sys/time.h>
-#include <sys/resource.h>
-
-#include "config.h"
#include "mesh_constants_cuda.h"
#include "prepare_constants_cuda.h"
+/* ----------------------------------------------------------------------------------------------- */
+
#ifdef USE_OLDER_CUDA4_GPU
#else
#ifdef USE_TEXTURES_FIELDS
diff --git a/src/cuda/transfer_fields_cuda.cu b/src/cuda/transfer_fields_cuda.cu
index 50b1c69..c811998 100644
--- a/src/cuda/transfer_fields_cuda.cu
+++ b/src/cuda/transfer_fields_cuda.cu
@@ -27,16 +27,7 @@
!=====================================================================
*/
-#include <stdio.h>
-#include <cuda.h>
-#include <cublas.h>
-
-#include <sys/time.h>
-#include <sys/resource.h>
-
-#include "config.h"
#include "mesh_constants_cuda.h"
-//#include "prepare_constants_cuda.h"
/* ----------------------------------------------------------------------------------------------- */
@@ -44,8 +35,6 @@
/* ----------------------------------------------------------------------------------------------- */
-
-
/* ----------------------------------------------------------------------------------------------- */
// for ELASTIC simulations
diff --git a/src/cuda/update_displacement_cuda.cu b/src/cuda/update_displacement_cuda.cu
index 711f333..a42e01c 100644
--- a/src/cuda/update_displacement_cuda.cu
+++ b/src/cuda/update_displacement_cuda.cu
@@ -27,18 +27,8 @@
!=====================================================================
*/
-#include <stdio.h>
-#include <cuda.h>
-//#include <cublas.h>
-
-#include "config.h"
#include "mesh_constants_cuda.h"
-
-//#define CUBLAS_ERROR(s,n) if (s != CUBLAS_STATUS_SUCCESS) { \
-//fprintf (stderr, "CUBLAS Memory Write Error @ %d\n",n); \
-//exit(EXIT_FAILURE); }
-
/* ----------------------------------------------------------------------------------------------- */
// elastic wavefield
diff --git a/src/cuda/write_seismograms_cuda.cu b/src/cuda/write_seismograms_cuda.cu
index d9b3bd5..d8e7915 100644
--- a/src/cuda/write_seismograms_cuda.cu
+++ b/src/cuda/write_seismograms_cuda.cu
@@ -27,17 +27,8 @@
!=====================================================================
*/
-#include <stdio.h>
-#include <cuda.h>
-#include <cublas.h>
-
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "config.h"
#include "mesh_constants_cuda.h"
-
/* ----------------------------------------------------------------------------------------------- */
// ELASTIC simulations
More information about the CIG-COMMITS
mailing list