From 86e3740fb337bafb1a8c5ea77909361ef2da2235 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Thu, 1 Aug 2019 07:03:51 -0400 Subject: [PATCH] use more common syntax for CPP's "defined" keyword --- src/KOKKOS/kokkos.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/KOKKOS/kokkos.cpp b/src/KOKKOS/kokkos.cpp index dd0aca2a9f..6fd8f46e43 100644 --- a/src/KOKKOS/kokkos.cpp +++ b/src/KOKKOS/kokkos.cpp @@ -236,7 +236,7 @@ KokkosLMP::KokkosLMP(LAMMPS *lmp, int narg, char **arg) : Pointers(lmp) cuda_aware_flag = 0; } else if (have_cuda_aware == -1) { // maybe we are dealing with MPICH, MVAPICH2 or some derivative? // MVAPICH2 -#if (defined MPICH) && (defined MVAPICH2_VERSION) +#if defined(MPICH) && defined(MVAPICH2_VERSION) char* str; cuda_aware_flag = 0; if (str = getenv("MV2_ENABLE_CUDA") @@ -247,7 +247,7 @@ KokkosLMP::KokkosLMP(LAMMPS *lmp, int narg, char **arg) : Pointers(lmp) if (me == 0) error->warning(FLERR,"MVAPICH2 'MV2_ENABLE_CUDA' environment variable is not set. Disabling CUDA-aware MPI"); // pure MPICH or some unsupported MPICH derivative -#elif (defined MPICH) && !(defined MVAPICH2_VERSION) +#elif defined(MPICH) && !defined(MVAPICH2_VERSION) if (me == 0) error->warning(FLERR,"Detected MPICH. Disabling CUDA-aware MPI"); cuda_aware_flag = 0;