From fb119579ef6f664ebf41983b56bff9a5dd0412d3 Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Tue, 14 Jul 2015 20:10:46 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13586
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 src/MAKE/Makefile.mpi                 | 2 +-
 src/MAKE/Makefile.serial              | 2 +-
 src/MAKE/OPTIONS/Makefile.kokkos_cuda | 3 +--
 src/MAKE/OPTIONS/Makefile.kokkos_omp  | 2 +-
 src/MAKE/OPTIONS/Makefile.kokkos_phi  | 4 ++--
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/MAKE/Makefile.mpi b/src/MAKE/Makefile.mpi
index 9497fc7c92..c88985f336 100755
--- a/src/MAKE/Makefile.mpi
+++ b/src/MAKE/Makefile.mpi
@@ -74,8 +74,8 @@ include	Makefile.package
 
 EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
+EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
 EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
 
 # Path to src files
diff --git a/src/MAKE/Makefile.serial b/src/MAKE/Makefile.serial
index efc5fed755..47e3472649 100755
--- a/src/MAKE/Makefile.serial
+++ b/src/MAKE/Makefile.serial
@@ -74,8 +74,8 @@ include	Makefile.package
 
 EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_CCP_DEPENDS = $(PKG_CPP_DEPENDS)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
+EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
 EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
 
 # Path to src files
diff --git a/src/MAKE/OPTIONS/Makefile.kokkos_cuda b/src/MAKE/OPTIONS/Makefile.kokkos_cuda
index 26197ac5b2..e2e911801c 100755
--- a/src/MAKE/OPTIONS/Makefile.kokkos_cuda
+++ b/src/MAKE/OPTIONS/Makefile.kokkos_cuda
@@ -19,8 +19,7 @@ SIZE =		size
 ARCHIVE =	ar
 ARFLAGS =	-rc
 SHLIBFLAGS =	-shared
-CUDA =		yes
-OMP =		yes
+KOKKOS_DEVICES = Cuda
 
 # ---------------------------------------------------------------------
 # LAMMPS-specific settings, all OPTIONAL
diff --git a/src/MAKE/OPTIONS/Makefile.kokkos_omp b/src/MAKE/OPTIONS/Makefile.kokkos_omp
index 4a5e1b7d7f..90fc7baa58 100644
--- a/src/MAKE/OPTIONS/Makefile.kokkos_omp
+++ b/src/MAKE/OPTIONS/Makefile.kokkos_omp
@@ -19,7 +19,7 @@ SIZE =		size
 ARCHIVE =	ar
 ARFLAGS =	-rc
 SHLIBFLAGS =	-shared
-OMP =		yes
+KOKKOS_DEVICES = OpenMP
 
 # ---------------------------------------------------------------------
 # LAMMPS-specific settings, all OPTIONAL
diff --git a/src/MAKE/OPTIONS/Makefile.kokkos_phi b/src/MAKE/OPTIONS/Makefile.kokkos_phi
index 452fe7d091..62d8ce59ec 100644
--- a/src/MAKE/OPTIONS/Makefile.kokkos_phi
+++ b/src/MAKE/OPTIONS/Makefile.kokkos_phi
@@ -19,8 +19,8 @@ SIZE =		size
 ARCHIVE =	ar
 ARFLAGS =	-rc
 SHLIBFLAGS =	-shared
-MIC =		yes
-OMP =		yes
+KOKKOS_DEVICES = OpenMP
+KOKKOS_ARCGH =  KNC
 
 # ---------------------------------------------------------------------
 # LAMMPS-specific settings, all OPTIONAL
-- 
GitLab