Commit 33af7ab2 authored by Stan Moore's avatar Stan Moore
Browse files

Remove merge line

parent 8f9b2aca
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ KOKKOS_PATH=../../lib/kokkos
CXXFLAGS=$(CCFLAGS)

#Options: OpenMP,Serial,Pthreads,Cuda
<<<<<<< HEAD
KOKKOS_DEVICES ?= "OpenMP"
#KOKKOS_DEVICES ?= "Pthreads"
#Options: KNC,SNB,HSW,Kepler,Kepler30,Kepler32,Kepler35,Kepler37,Maxwell,Maxwell50,Maxwell52,Maxwell53,Pascal61,ARMv80,ARMv81,ARMv8-ThunderX,BGQ,Power7,Power8,Power9,KNL,BDW,SKX