Commit 236ebf7f authored by Steve Plimpton's avatar Steve Plimpton
Browse files

Kokkos lib update

parent 0252347d

lib/kokkos/CMakeLists.txt

+51 −3
Original line number Diff line number Diff line 


IF(COMMAND TRIBITS_PACKAGE_DECL)

  SET(KOKKOS_HAS_TRILINOS ON CACHE BOOL "")

ELSE()

  SET(KOKKOS_HAS_TRILINOS OFF CACHE BOOL "")

ENDIF()



IF(NOT KOKKOS_HAS_TRILINOS)

  CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11 FATAL_ERROR)

  INCLUDE(cmake/tribits.cmake)

ENDIF()



#

# A) Forward delcare the package so that certain options are also defined for

# subpackages
@@ -12,7 +23,22 @@ TRIBITS_PACKAGE_DECL(Kokkos) # ENABLE_SHADOWING_WARNINGS) 
# subpackages as well.

#



TRIBITS_ADD_DEBUG_OPTION()





# mfh 01 Aug 2016: See Issue #61:

#

# https://github.com/kokkos/kokkos/issues/61

#

# Don't use TRIBITS_ADD_DEBUG_OPTION() here, because that defines

# HAVE_KOKKOS_DEBUG.  We define KOKKOS_HAVE_DEBUG here instead,

# for compatibility with Kokkos' Makefile build system.



TRIBITS_ADD_OPTION_AND_DEFINE(

  ${PACKAGE_NAME}_ENABLE_DEBUG

  ${PACKAGE_NAME_UC}_HAVE_DEBUG

  "Enable run-time debug checks.  These checks may be expensive, so they are disabled by default in a release build."

  ${${PROJECT_NAME}_ENABLE_DEBUG}

)



TRIBITS_ADD_OPTION_AND_DEFINE(

  Kokkos_ENABLE_SIERRA_BUILD
@@ -82,11 +108,33 @@ TRIBITS_ADD_OPTION_AND_DEFINE( 
  "${TPL_ENABLE_MPI}"

  )



# Set default value of Kokkos_ENABLE_Debug_Bounds_Check option

#

# CMake is case sensitive.  The Kokkos_ENABLE_Debug_Bounds_Check

# option (defined below) is annoyingly not all caps, but we need to

# keep it that way for backwards compatibility.  If users forget and

# try using an all-caps variable, then make it count by using the

# all-caps version as the default value of the original, not-all-caps

# option.  Otherwise, the default value of this option comes from

# Kokkos_ENABLE_DEBUG (see Issue #367).



ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_DEBUG)

IF(DEFINED Kokkos_ENABLE_DEBUG_BOUNDS_CHECK)

  IF(Kokkos_ENABLE_DEBUG_BOUNDS_CHECK)

    SET(Kokkos_ENABLE_Debug_Bounds_Check_DEFAULT ON)

  ELSE()

    SET(Kokkos_ENABLE_Debug_Bounds_Check_DEFAULT "${${PACKAGE_NAME}_ENABLE_DEBUG}")

  ENDIF()

ELSE()

  SET(Kokkos_ENABLE_Debug_Bounds_Check_DEFAULT "${${PACKAGE_NAME}_ENABLE_DEBUG}")

ENDIF()

ASSERT_DEFINED(Kokkos_ENABLE_Debug_Bounds_Check_DEFAULT)



TRIBITS_ADD_OPTION_AND_DEFINE(

  Kokkos_ENABLE_Debug_Bounds_Check

  KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK

  "Enable bounds checking support in Kokkos."

  OFF

  "Enable Kokkos::View run-time bounds checking."

  "${Kokkos_ENABLE_Debug_Bounds_Check_DEFAULT}"

  )



TRIBITS_ADD_OPTION_AND_DEFINE(

lib/kokkos/Makefile.kokkos

+16 −7
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ CXXFLAGS=$(CCFLAGS) 
#Options: OpenMP,Serial,Pthreads,Cuda

KOKKOS_DEVICES ?= "OpenMP"

#KOKKOS_DEVICES ?= "Pthreads"

#Options: KNC,SNB,HSW,Kepler,Kepler30,Kepler32,Kepler35,Kepler37,Maxwell,Maxwell50,Maxwell52,Maxwell53,ARMv8,BGQ,Power7,Power8,KNL

#Options: KNC,SNB,HSW,Kepler,Kepler30,Kepler32,Kepler35,Kepler37,Maxwell,Maxwell50,Maxwell52,Maxwell53,Pascal61,ARMv8,BGQ,Power7,Power8,KNL,BDW

KOKKOS_ARCH ?= ""

#Options: yes,no

KOKKOS_DEBUG ?= "no"
@@ -97,6 +97,7 @@ KOKKOS_INTERNAL_USE_CUDA := $(strip $(shell echo $(KOKKOS_DEVICES) | grep Cuda | 
KOKKOS_INTERNAL_USE_ARCH_KNC := $(strip $(shell echo $(KOKKOS_ARCH) | grep KNC | wc -l))

KOKKOS_INTERNAL_USE_ARCH_SNB := $(strip $(shell echo $(KOKKOS_ARCH) | grep SNB | wc -l))

KOKKOS_INTERNAL_USE_ARCH_HSW := $(strip $(shell echo $(KOKKOS_ARCH) | grep HSW | wc -l))

KOKKOS_INTERNAL_USE_ARCH_BDW := $(strip $(shell echo $(KOKKOS_ARCH) | grep BDW | wc -l))

KOKKOS_INTERNAL_USE_ARCH_KNL := $(strip $(shell echo $(KOKKOS_ARCH) | grep KNL | wc -l))



#NVIDIA based
@@ -108,10 +109,12 @@ KOKKOS_INTERNAL_USE_ARCH_KEPLER37 := $(strip $(shell echo $(KOKKOS_ARCH) | grep 
KOKKOS_INTERNAL_USE_ARCH_MAXWELL50 := $(strip $(shell echo $(KOKKOS_ARCH) | grep Maxwell50 | wc -l))

KOKKOS_INTERNAL_USE_ARCH_MAXWELL52 := $(strip $(shell echo $(KOKKOS_ARCH) | grep Maxwell52 | wc -l))

KOKKOS_INTERNAL_USE_ARCH_MAXWELL53 := $(strip $(shell echo $(KOKKOS_ARCH) | grep Maxwell53 | wc -l))

KOKKOS_INTERNAL_USE_ARCH_PASCAL61 := $(strip $(shell echo $(KOKKOS_ARCH) | grep Pascal61 | wc -l))

KOKKOS_INTERNAL_USE_ARCH_NVIDIA := $(strip $(shell echo $(KOKKOS_INTERNAL_USE_ARCH_KEPLER30)  \

                                                      + $(KOKKOS_INTERNAL_USE_ARCH_KEPLER32)  \

                                                      + $(KOKKOS_INTERNAL_USE_ARCH_KEPLER35)  \

                                                      + $(KOKKOS_INTERNAL_USE_ARCH_KEPLER37)  \

                                                      + $(KOKKOS_INTERNAL_USE_ARCH_PASCAL61)  \

                                                      + $(KOKKOS_INTERNAL_USE_ARCH_MAXWELL50) \

                                                      + $(KOKKOS_INTERNAL_USE_ARCH_MAXWELL52) \

                                                      + $(KOKKOS_INTERNAL_USE_ARCH_MAXWELL53) | bc))
@@ -123,6 +126,7 @@ KOKKOS_INTERNAL_USE_ARCH_NVIDIA := $(strip $(shell echo $(KOKKOS_INTERNAL_USE_AR 
                                                      + $(KOKKOS_INTERNAL_USE_ARCH_KEPLER32)  \

                                                      + $(KOKKOS_INTERNAL_USE_ARCH_KEPLER35)  \

                                                      + $(KOKKOS_INTERNAL_USE_ARCH_KEPLER37)  \

                                                      + $(KOKKOS_INTERNAL_USE_ARCH_PASCAL61)  \

                                                      + $(KOKKOS_INTERNAL_USE_ARCH_MAXWELL50) \

                                                      + $(KOKKOS_INTERNAL_USE_ARCH_MAXWELL52) \

                                                      + $(KOKKOS_INTERNAL_USE_ARCH_MAXWELL53) | bc))
@@ -142,11 +146,11 @@ KOKKOS_INTERNAL_USE_ARCH_AMDAVX := $(strip $(shell echo $(KOKKOS_ARCH) | grep AM 


#Any AVX?

KOKKOS_INTERNAL_USE_ARCH_AVX       := $(strip $(shell echo $(KOKKOS_INTERNAL_USE_ARCH_SNB)+$(KOKKOS_INTERNAL_USE_ARCH_AMDAVX) | bc ))

KOKKOS_INTERNAL_USE_ARCH_AVX2      := $(strip $(shell echo $(KOKKOS_INTERNAL_USE_ARCH_HSW) | bc ))

KOKKOS_INTERNAL_USE_ARCH_AVX2      := $(strip $(shell echo $(KOKKOS_INTERNAL_USE_ARCH_HSW)+$(KOKKOS_INTERNAL_USE_ARCH_BDW) | bc ))

KOKKOS_INTERNAL_USE_ARCH_AVX512MIC := $(strip $(shell echo $(KOKKOS_INTERNAL_USE_ARCH_KNL) | bc ))



# Decide what ISA level we are able to support

KOKKOS_INTERNAL_USE_ISA_X86_64     := $(strip $(shell echo $(KOKKOS_INTERNAL_USE_ARCH_SNB)+$(KOKKOS_INTERNAL_USE_ARCH_HSW)+$(KOKKOS_INTERNAL_USE_ARCH_KNL) | bc ))

KOKKOS_INTERNAL_USE_ISA_X86_64     := $(strip $(shell echo $(KOKKOS_INTERNAL_USE_ARCH_SNB)+$(KOKKOS_INTERNAL_USE_ARCH_HSW)+$(KOKKOS_INTERNAL_USE_ARCH_BDW)+$(KOKKOS_INTERNAL_USE_ARCH_KNL) | bc ))

KOKKOS_INTERNAL_USE_ISA_KNC        := $(strip $(shell echo $(KOKKOS_INTERNAL_USE_ARCH_KNC) | bc ))

KOKKOS_INTERNAL_USE_ISA_POWERPCLE  := $(strip $(shell echo $(KOKKOS_INTERNAL_USE_ARCH_POWER8) | bc ))
@@ -304,8 +308,8 @@ endif 


ifeq ($(KOKKOS_INTERNAL_USE_ARCH_POWER8), 1)

    tmp := $(shell echo "\#define KOKKOS_ARCH_POWER8 1" >> KokkosCore_config.tmp )

	KOKKOS_CXXFLAGS += -mcpu=power8

	KOKKOS_LDFLAGS  += -mcpu=power8

	KOKKOS_CXXFLAGS += -mcpu=power8 -mtune=power8

	KOKKOS_LDFLAGS  += -mcpu=power8 -mtune=power8

endif



ifeq ($(KOKKOS_INTERNAL_USE_ARCH_AVX2), 1)
@@ -321,8 +325,8 @@ ifeq ($(KOKKOS_INTERNAL_USE_ARCH_AVX2), 1) 


			else

				# Assume that this is a really a GNU compiler

				KOKKOS_CXXFLAGS += -march=core-avx2

				KOKKOS_LDFLAGS  += -march=core-avx2

				KOKKOS_CXXFLAGS += -march=core-avx2 -mtune=core-avx2

				KOKKOS_LDFLAGS  += -march=core-avx2 -mtune=core-avx2

			endif

		endif

	endif
@@ -390,6 +394,11 @@ ifeq ($(KOKKOS_INTERNAL_USE_ARCH_MAXWELL53), 1) 
    tmp := $(shell echo "\#define KOKKOS_ARCH_MAXWELL53 1" >> KokkosCore_config.tmp )

	KOKKOS_CXXFLAGS += -arch=sm_53

endif

ifeq ($(KOKKOS_INTERNAL_USE_ARCH_PASCAL61), 1)

    tmp := $(shell echo "\#define KOKKOS_ARCH_PASCAL 1" >> KokkosCore_config.tmp )

    tmp := $(shell echo "\#define KOKKOS_ARCH_PASCAL61 1" >> KokkosCore_config.tmp )

        KOKKOS_CXXFLAGS += -arch=sm_61

endif

endif

 

KOKKOS_INTERNAL_LS_CONFIG := $(shell ls KokkosCore_config.h)

lib/kokkos/Makefile.targets

+8 −6
Original line number Diff line number Diff line 
Kokkos_UnorderedMap_impl.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/containers/src/impl/Kokkos_UnorderedMap_impl.cpp

	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/containers/src/impl/Kokkos_UnorderedMap_impl.cpp

Kokkos_AllocationTracker.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_AllocationTracker.cpp

	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_AllocationTracker.cpp

Kokkos_BasicAllocators.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_BasicAllocators.cpp

	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_BasicAllocators.cpp

Kokkos_Core.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_Core.cpp

	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_Core.cpp

Kokkos_CPUDiscovery.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_CPUDiscovery.cpp
@@ -20,6 +16,10 @@ Kokkos_Serial.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_Seria 
	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_Serial.cpp

Kokkos_Serial_TaskPolicy.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_Serial_TaskPolicy.cpp

	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_Serial_TaskPolicy.cpp

Kokkos_TaskQueue.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_TaskQueue.cpp

	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_TaskQueue.cpp

Kokkos_Serial_Task.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_Serial_Task.cpp

	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_Serial_Task.cpp

Kokkos_Shape.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_Shape.cpp

	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_Shape.cpp

Kokkos_spinwait.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_spinwait.cpp
@@ -32,12 +32,12 @@ Kokkos_MemoryPool.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_M 
	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_MemoryPool.cpp



ifeq ($(KOKKOS_INTERNAL_USE_CUDA), 1)

Kokkos_Cuda_BasicAllocators.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/Cuda/Kokkos_Cuda_BasicAllocators.cpp

	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/Cuda/Kokkos_Cuda_BasicAllocators.cpp

Kokkos_Cuda_Impl.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/Cuda/Kokkos_Cuda_Impl.cpp

	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/Cuda/Kokkos_Cuda_Impl.cpp

Kokkos_CudaSpace.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/Cuda/Kokkos_CudaSpace.cpp

	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/Cuda/Kokkos_CudaSpace.cpp

Kokkos_Cuda_Task.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/Cuda/Kokkos_Cuda_Task.cpp

	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/Cuda/Kokkos_Cuda_Task.cpp

Kokkos_Cuda_TaskPolicy.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/Cuda/Kokkos_Cuda_TaskPolicy.cpp

	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/Cuda/Kokkos_Cuda_TaskPolicy.cpp

endif
@@ -61,6 +61,8 @@ endif 
ifeq ($(KOKKOS_INTERNAL_USE_OPENMP), 1)

Kokkos_OpenMPexec.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/OpenMP/Kokkos_OpenMPexec.cpp

	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/OpenMP/Kokkos_OpenMPexec.cpp

Kokkos_OpenMP_Task.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/OpenMP/Kokkos_OpenMP_Task.cpp

	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/OpenMP/Kokkos_OpenMP_Task.cpp

endif



Kokkos_HBWSpace.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_HBWSpace.cpp

lib/kokkos/README

+24 −7
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ hcedwar(at)sandia.gov and crtrott(at)sandia.gov 
====Requirements============================================================

============================================================================



Primary tested compilers are:

Primary tested compilers on X86 are:

  GCC 4.7.2

  GCC 4.8.4

  GCC 4.9.2
@@ -48,26 +48,43 @@ Primary tested compilers are: 
  Clang 3.5.2

  Clang 3.6.1



Primary tested compilers on Power 8 are:

  IBM XL 13.1.3 (OpenMP,Serial)

  GCC 4.9.2 (OpenMP,Serial)

  GCC 5.3.0 (OpenMP,Serial)



Secondary tested compilers are:

  CUDA 6.5 (with gcc 4.7.2)

  CUDA 7.0 (with gcc 4.7.2)

  CUDA 7.5 (with gcc 4.8.4)



Other compilers working:

  X86:

   Intel 17.0.042 (the FENL example causes internal compiler error)

   PGI 15.4

  IBM XL 13.1.2

   Cygwin 2.1.0 64bit with gcc 4.9.3

  KNL:

   Intel 16.2.181 (the FENL example causes internal compiler error)

   Intel 17.0.042 (the FENL example causes internal compiler error)



Known non-working combinations:

  Power8:

   GCC 6.1.0

   Pthreads backend





Primary tested compiler are passing in release mode

with warnings as errors. We are using the following set

of flags:

with warnings as errors. They also are tested with a comprehensive set of 

backend combinations (i.e. OpenMP, Pthreads, Serial, OpenMP+Serial, ...).

We are using the following set of flags:

GCC:   -Wall -Wshadow -pedantic -Werror -Wsign-compare -Wtype-limits

       -Wignored-qualifiers -Wempty-body -Wclobbered -Wuninitialized

Intel: -Wall -Wshadow -pedantic -Werror -Wsign-compare -Wtype-limits -Wuninitialized

Clang: -Wall -Wshadow -pedantic -Werror -Wsign-compare -Wtype-limits -Wuninitialized



Secondary compilers are passing without -Werror.

Other compilers are tested occasionally.

Other compilers are tested occasionally, in particular when pushing from develop to 

master branch, without -Werror and only for a select set of backends.



============================================================================

====Getting started=========================================================

lib/kokkos/algorithms/src/Kokkos_Random.hpp

+178 −171

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE