git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12638 f3b2605a-c512-4ea7-a41b-209d697bcdaa

This commit is contained in:
sjplimp 2014-10-21 16:33:32 +00:00
parent f350cc4ec7
commit c90746a20c
3 changed files with 19 additions and 2 deletions

View File

@ -13,7 +13,12 @@
#ifdef MPI_GERYON #ifdef MPI_GERYON
#include "mpi.h" #include "mpi.h"
#define NVD_GERYON_EXIT MPI_Abort(MPI_COMM_WORLD,-1) #define NVD_GERYON_EXIT do { \
int is_final; \
MPI_Finalized(&is_final); \
if (!is_final) \
MPI_Abort(MPI_COMM_WORLD,-1); \
} while(0)
#else #else
#define NVD_GERYON_EXIT assert(0==1) #define NVD_GERYON_EXIT assert(0==1)
#endif #endif

View File

@ -12,7 +12,12 @@
#ifdef MPI_GERYON #ifdef MPI_GERYON
#include "mpi.h" #include "mpi.h"
#define OCL_GERYON_EXIT MPI_Abort(MPI_COMM_WORLD,-1) #define OCL_GERYON_EXIT do { \
int is_final; \
MPI_Finalized(&is_final); \
if (!is_final) \
MPI_Abort(MPI_COMM_WORLD,-1); \
} while(0)
#else #else
#define OCL_GERYON_EXIT assert(0==1) #define OCL_GERYON_EXIT assert(0==1)
#endif #endif

View File

@ -31,9 +31,16 @@ texture<int2> q_tex;
#endif #endif
#else #else
#define pos_tex x_ #define pos_tex x_
#define q_tex q_ #define q_tex q_
#pragma OPENCL EXTENSION cl_khr_global_int32_base_atomics: enable #pragma OPENCL EXTENSION cl_khr_global_int32_base_atomics: enable
#if defined(cl_amd_fp64)
#pragma OPENCL EXTENSION cl_amd_fp64 : enable
#else
#pragma OPENCL EXTENSION cl_khr_fp64 : enable
#endif
#endif #endif
// Number of threads per pencil for charge spread // Number of threads per pencil for charge spread