Add Cray, PGI, Armclang support for Kokkos/OpenMP
Fixed GCC's missing openmp flag in Kokkos
This commit is contained in:
parent
1ffd069e80
commit
1fcd062d6c
13
Kokkos.make
13
Kokkos.make
@ -36,15 +36,18 @@ ifndef COMPILER
|
|||||||
define compiler_help
|
define compiler_help
|
||||||
Set COMPILER to change flags (defaulting to GNU).
|
Set COMPILER to change flags (defaulting to GNU).
|
||||||
Available compilers are:
|
Available compilers are:
|
||||||
GNU INTEL
|
GNU INTEL CRAY PGI ARMCLANG
|
||||||
|
|
||||||
endef
|
endef
|
||||||
$(info $(compiler_help))
|
$(info $(compiler_help))
|
||||||
COMPILER=GNU
|
COMPILER=GNU
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
COMPILER_ARMCLANG = armclang++
|
||||||
COMPILER_GNU = g++
|
COMPILER_GNU = g++
|
||||||
COMPILER_INTEL = icpc -qopt-streaming-stores=always
|
COMPILER_INTEL = icpc -qopt-streaming-stores=always
|
||||||
|
COMPILER_CRAY = CC
|
||||||
|
COMPILER_PGI = pgc++
|
||||||
CXX = $(COMPILER_$(COMPILER))
|
CXX = $(COMPILER_$(COMPILER))
|
||||||
|
|
||||||
ifndef TARGET
|
ifndef TARGET
|
||||||
@ -67,6 +70,14 @@ CXXFLAGS = -O3
|
|||||||
LINKFLAGS = # empty for now
|
LINKFLAGS = # empty for now
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
ifeq ($(COMPILER), GNU)
|
||||||
|
ifeq ($(DEVICE), OpenMP)
|
||||||
|
CXXFLAGS += -fopenmp
|
||||||
|
LINKFLAGS += -fopenmp
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
include $(KOKKOS_PATH)/Makefile.kokkos
|
include $(KOKKOS_PATH)/Makefile.kokkos
|
||||||
|
|
||||||
kokkos-stream: $(OBJ) $(KOKKOS_LINK_DEPENDS)
|
kokkos-stream: $(OBJ) $(KOKKOS_LINK_DEPENDS)
|
||||||
|
|||||||
@ -3,7 +3,7 @@ ifndef COMPILER
|
|||||||
define compiler_help
|
define compiler_help
|
||||||
Set COMPILER to change flags (defaulting to GNU).
|
Set COMPILER to change flags (defaulting to GNU).
|
||||||
Available compilers are:
|
Available compilers are:
|
||||||
CLANG CRAY GNU INTEL XL PGI NEC
|
CLANG CRAY GNU INTEL XL PGI NEC ARMCLANG
|
||||||
|
|
||||||
endef
|
endef
|
||||||
$(info $(compiler_help))
|
$(info $(compiler_help))
|
||||||
@ -21,6 +21,7 @@ $(info $(target_help))
|
|||||||
TARGET=CPU
|
TARGET=CPU
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
COMPILER_ARMCLANG = armclang++
|
||||||
COMPILER_GNU = g++
|
COMPILER_GNU = g++
|
||||||
COMPILER_INTEL = icpc
|
COMPILER_INTEL = icpc
|
||||||
COMPILER_CRAY = CC
|
COMPILER_CRAY = CC
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user