From f393d0160a66ffcbd8655a99c0b59a97e424d8f7 Mon Sep 17 00:00:00 2001 From: stamoor <stamoor@f3b2605a-c512-4ea7-a41b-209d697bcdaa> Date: Tue, 14 Jul 2015 21:37:10 +0000 Subject: [PATCH] Slight tweaks to Kokkos Makefiles git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13590 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- src/MAKE/OPTIONS/Makefile.kokkos_cuda | 6 ++++-- src/MAKE/OPTIONS/Makefile.kokkos_phi | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/MAKE/OPTIONS/Makefile.kokkos_cuda b/src/MAKE/OPTIONS/Makefile.kokkos_cuda index e2e911801c..b48a122fb8 100755 --- a/src/MAKE/OPTIONS/Makefile.kokkos_cuda +++ b/src/MAKE/OPTIONS/Makefile.kokkos_cuda @@ -7,7 +7,7 @@ SHELL = /bin/sh # specify flags and libraries needed for your compiler CC = nvcc -ccbin=mpicxx -CCFLAGS = -g -O3 -arch=sm_20 +CCFLAGS = -g -O3 SHFLAGS = -fPIC DEPFLAGS = -M @@ -19,7 +19,9 @@ SIZE = size ARCHIVE = ar ARFLAGS = -rc SHLIBFLAGS = -shared -KOKKOS_DEVICES = Cuda +KOKKOS_DEVICES = Cuda, OpenMP +KOKKOS_ARCH = Kepler35 +CUDA_PATH = /usr/local/cuda # --------------------------------------------------------------------- # LAMMPS-specific settings, all OPTIONAL diff --git a/src/MAKE/OPTIONS/Makefile.kokkos_phi b/src/MAKE/OPTIONS/Makefile.kokkos_phi index 62d8ce59ec..cbc2204586 100644 --- a/src/MAKE/OPTIONS/Makefile.kokkos_phi +++ b/src/MAKE/OPTIONS/Makefile.kokkos_phi @@ -20,7 +20,7 @@ ARCHIVE = ar ARFLAGS = -rc SHLIBFLAGS = -shared KOKKOS_DEVICES = OpenMP -KOKKOS_ARCGH = KNC +KOKKOS_ARCH = KNC # --------------------------------------------------------------------- # LAMMPS-specific settings, all OPTIONAL -- GitLab