Merge branch 'develop' tag 2.02.15

CHANGELOG.md

@@ -1,5 +1,27 @@
 # Change Log
 
+## [2.02.15](https://github.com/kokkos/kokkos/tree/2.02.15) (2017-02-10)
+[Full Changelog](https://github.com/kokkos/kokkos/compare/2.02.07...2.02.15)
+
+**Implemented enhancements:**
+
+- Containers: Adding block partitioning to StaticCrsGraph [\#625](https://github.com/kokkos/kokkos/issues/625)
+- Kokkos Make System can induce Errors on Cray Volta System [\#610](https://github.com/kokkos/kokkos/issues/610)
+- OpenMP: error out if KOKKOS\_HAVE\_OPENMP is defined but not \_OPENMP [\#605](https://github.com/kokkos/kokkos/issues/605)
+- CMake: fix standalone build with tests [\#604](https://github.com/kokkos/kokkos/issues/604)
+- Change README \(that GitHub shows when opening Kokkos project page\) to tell users how to submit PRs [\#597](https://github.com/kokkos/kokkos/issues/597)
+- Add correctness testing for all operators of Atomic View [\#420](https://github.com/kokkos/kokkos/issues/420)
+- Allow assignment of Views with compatible memory spaces [\#290](https://github.com/kokkos/kokkos/issues/290)
+- Build only one version of Kokkos library for tests [\#213](https://github.com/kokkos/kokkos/issues/213)
+- Clean out old KOKKOS\_HAVE\_CXX11 macros clauses [\#156](https://github.com/kokkos/kokkos/issues/156)
+- Harmonize Macro names [\#150](https://github.com/kokkos/kokkos/issues/150)
+
+**Fixed bugs:**
+
+- Cray and PGI: Kokkos\_Parallel\_Reduce [\#634](https://github.com/kokkos/kokkos/issues/634)
+- Kokkos Make System can induce Errors on Cray Volta System [\#610](https://github.com/kokkos/kokkos/issues/610)
+- Normal\(\) function random number generator doesn't give the expected distribution [\#592](https://github.com/kokkos/kokkos/issues/592)
+
 ## [2.02.07](https://github.com/kokkos/kokkos/tree/2.02.07) (2016-12-16)
 [Full Changelog](https://github.com/kokkos/kokkos/compare/2.02.01...2.02.07)
 

CMakeLists.txt

@@ -1,4 +1,3 @@
-
 IF(COMMAND TRIBITS_PACKAGE_DECL)
   SET(KOKKOS_HAS_TRILINOS ON CACHE BOOL "")
 ELSE()
@@ -8,6 +7,7 @@ ENDIF()
 IF(NOT KOKKOS_HAS_TRILINOS)
   CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11 FATAL_ERROR)
   INCLUDE(cmake/tribits.cmake)
+  SET(CMAKE_CXX_STANDARD 11)
 ENDIF()
 
 #

LICENSE

@@ -6,6 +6,8 @@
 // 
 // Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
 // the U.S. Government retains certain rights in this software.
+//
+// Kokkos is licensed under 3-clause BSD terms of use:
 // 
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

Makefile.kokkos

@@ -3,7 +3,7 @@
 #Options: OpenMP,Serial,Pthreads,Cuda
 #KOKKOS_DEVICES ?= "OpenMP"
 KOKKOS_DEVICES ?= "Pthreads"
-#Options: KNC,SNB,HSW,Kepler,Kepler30,Kepler32,Kepler35,Kepler37,Maxwell,Maxwell50,Maxwell52,Maxwell53,ARMv80,ARMv81,ARMv8-ThunderX,BGQ,Power7,Power8,KNL,BDW,SKX
+#Options: KNC,SNB,HSW,Kepler,Kepler30,Kepler32,Kepler35,Kepler37,Maxwell,Maxwell50,Maxwell52,Maxwell53,ARMv80,ARMv81,ARMv8-ThunderX,BGQ,Power7,Power8,Power9,KNL,BDW,SKX
 KOKKOS_ARCH ?= ""
 #Options: yes,no
 KOKKOS_DEBUG ?= "no"
@@ -182,7 +182,8 @@ KOKKOS_INTERNAL_USE_ARCH_ARMV8_THUNDERX := $(strip $(shell echo $(KOKKOS_ARCH) |
 KOKKOS_INTERNAL_USE_ARCH_BGQ := $(strip $(shell echo $(KOKKOS_ARCH) | grep BGQ | wc -l))
 KOKKOS_INTERNAL_USE_ARCH_POWER7 := $(strip $(shell echo $(KOKKOS_ARCH) | grep Power7 | wc -l))
 KOKKOS_INTERNAL_USE_ARCH_POWER8 := $(strip $(shell echo $(KOKKOS_ARCH) | grep Power8 | wc -l))
-KOKKOS_INTERNAL_USE_ARCH_IBM := $(strip $(shell echo $(KOKKOS_INTERNAL_USE_ARCH_BGQ)+$(KOKKOS_INTERNAL_USE_ARCH_POWER7)+$(KOKKOS_INTERNAL_USE_ARCH_POWER8) | bc))
+KOKKOS_INTERNAL_USE_ARCH_POWER9 := $(strip $(shell echo $(KOKKOS_ARCH) | grep Power9 | wc -l))
+KOKKOS_INTERNAL_USE_ARCH_IBM := $(strip $(shell echo $(KOKKOS_INTERNAL_USE_ARCH_BGQ)+$(KOKKOS_INTERNAL_USE_ARCH_POWER7)+$(KOKKOS_INTERNAL_USE_ARCH_POWER8)+$(KOKKOS_INTERNAL_USE_ARCH_POWER9) | bc))
 
 #AMD based
 KOKKOS_INTERNAL_USE_ARCH_AMDAVX := $(strip $(shell echo $(KOKKOS_ARCH) | grep AMDAVX | wc -l))
@@ -196,7 +197,7 @@ KOKKOS_INTERNAL_USE_ARCH_AVX512XEON := $(strip $(shell echo $(KOKKOS_INTERNAL_US
 # 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_BDW)+$(KOKKOS_INTERNAL_USE_ARCH_KNL)+$(KOKKOS_INTERNAL_USE_ARCH_SKX) | 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 ))
+KOKKOS_INTERNAL_USE_ISA_POWERPCLE  := $(strip $(shell echo $(KOKKOS_INTERNAL_USE_ARCH_POWER8)+$(KOKKOS_INTERNAL_USE_ARCH_POWER9) | bc ))
 
 #Incompatible flags?
 KOKKOS_INTERNAL_USE_ARCH_MULTIHOST := $(strip $(shell echo "$(KOKKOS_INTERNAL_USE_ARCH_AVX)+$(KOKKOS_INTERNAL_USE_ARCH_AVX2)+$(KOKKOS_INTERNAL_USE_ARCH_KNC)+$(KOKKOS_INTERNAL_USE_ARCH_IBM)+$(KOKKOS_INTERNAL_USE_ARCH_AMDAVX)+$(KOKKOS_INTERNAL_USE_ARCH_ARMV80)+$(KOKKOS_INTERNAL_USE_ARCH_ARMV81)+$(KOKKOS_INTERNAL_USE_ARCH_ARMV8_THUNDERX)>1" | bc ))
@@ -443,6 +444,17 @@ ifeq ($(KOKKOS_INTERNAL_USE_ARCH_POWER8), 1)
 	endif
 endif
 
+ifeq ($(KOKKOS_INTERNAL_USE_ARCH_POWER9), 1)
+    tmp := $(shell echo "\#define KOKKOS_ARCH_POWER9 1" >> KokkosCore_config.tmp )
+	ifeq ($(KOKKOS_INTERNAL_COMPILER_PGI), 1) 
+
+	else
+		# Assume that this is a really a GNU compiler or it could be XL on P9
+		KOKKOS_CXXFLAGS += -mcpu=power9 -mtune=power9
+		KOKKOS_LDFLAGS  += -mcpu=power9 -mtune=power9
+	endif
+endif
+
 ifeq ($(KOKKOS_INTERNAL_USE_ARCH_AVX2), 1)
     tmp := $(shell echo "\#define KOKKOS_ARCH_AVX2 1" >> KokkosCore_config.tmp )
 	ifeq ($(KOKKOS_INTERNAL_COMPILER_INTEL), 1)

README

@@ -5,6 +5,9 @@ Kokkos is designed to target complex node architectures with N-level memory
 hierarchies and multiple types of execution resources. It currently can use
 OpenMP, Pthreads and CUDA as backend programming models.
 
+Kokkos is licensed under standard 3-clause BSD terms of use. For specifics
+see the LICENSE file contained in the repository or distribution.
+
 The core developers of Kokkos are Carter Edwards and Christian Trott
 at the Computer Science Research Institute of the Sandia National
 Laboratories.
@@ -151,4 +154,12 @@ MPI rank of an application uses a single GPU [can be the same GPU for
 multiple MPI ranks]) you can set CUDA_MANAGED_FORCE_DEVICE_ALLOC=1.
 This will enforce proper UVM allocations, but can lead to errors if 
 more than a single GPU is used by a single process.
-
+
+===========================================================================
+====Contributing===========================================================
+===========================================================================
+
+Contributions to Kokkos are welcome. In order to do so, please open an issue
+where a feature request or bug can be discussed. Then issue a pull request
+with your contribution. Pull requests must be issued against the develop branch. 
+

algorithms/src/Kokkos_Random.hpp

@@ -670,8 +670,8 @@ namespace Kokkos {
       double S = 2.0;
       double U;
       while(S>=1.0) {
-        U = drand();
-        const double V = drand();
+        U = 2.0*drand() - 1.0;
+        const double V = 2.0*drand() - 1.0;
         S = U*U+V*V;
       }
       return U*sqrt(-2.0*log(S)/S);
@@ -910,8 +910,8 @@ namespace Kokkos {
       double S = 2.0;
       double U;
       while(S>=1.0) {
-        U = drand();
-        const double V = drand();
+        U = 2.0*drand() - 1.0;
+        const double V = 2.0*drand() - 1.0;
         S = U*U+V*V;
       }
       return U*sqrt(-2.0*log(S)/S);
@@ -1014,7 +1014,7 @@ namespace Kokkos {
     }
   };
 
-#if defined(KOKKOS_HAVE_CUDA) && defined(__CUDACC__)
+#if defined(KOKKOS_ENABLE_CUDA) && defined(__CUDACC__)
 
   template<>
   class Random_XorShift1024<Kokkos::Cuda> {
@@ -1163,8 +1163,8 @@ namespace Kokkos {
       double S = 2.0;
       double U;
       while(S>=1.0) {
-        U = drand();
-        const double V = drand();
+        U = 2.0*drand() - 1.0;
+        const double V = 2.0*drand() - 1.0;
         S = U*U+V*V;
       }
       return U*sqrt(-2.0*log(S)/S);

algorithms/unit_tests/TestCuda.cpp

@@ -49,7 +49,7 @@
 
 #include <Kokkos_Core.hpp>
 
-#ifdef KOKKOS_HAVE_CUDA
+#ifdef KOKKOS_ENABLE_CUDA
 
 #include <TestRandom.hpp>
 #include <TestSort.hpp>
@@ -106,5 +106,5 @@ CUDA_SORT_UNSIGNED(171)
 #undef CUDA_SORT_UNSIGNED
 }
 
-#endif  /* #ifdef KOKKOS_HAVE_CUDA */
+#endif  /* #ifdef KOKKOS_ENABLE_CUDA */
 

algorithms/unit_tests/TestOpenMP.cpp

@@ -52,7 +52,7 @@
 
 namespace Test {
 
-#ifdef KOKKOS_HAVE_OPENMP
+#ifdef KOKKOS_ENABLE_OPENMP
 class openmp : public ::testing::Test {
 protected:
   static void SetUpTestCase()

algorithms/unit_tests/TestSerial.cpp

@@ -55,7 +55,7 @@
 
 namespace Test {
 
-#ifdef KOKKOS_HAVE_SERIAL
+#ifdef KOKKOS_ENABLE_SERIAL
 class serial : public ::testing::Test {
 protected:
   static void SetUpTestCase()
@@ -93,7 +93,7 @@ SERIAL_SORT_UNSIGNED(171)
 #undef SERIAL_RANDOM_XORSHIFT1024
 #undef SERIAL_SORT_UNSIGNED
 
-#endif // KOKKOS_HAVE_SERIAL
+#endif // KOKKOS_ENABLE_SERIAL
 } // namespace Test
 
 

algorithms/unit_tests/TestThreads.cpp

@@ -55,7 +55,7 @@
 
 namespace Test {
 
-#ifdef KOKKOS_HAVE_PTHREAD
+#ifdef KOKKOS_ENABLE_PTHREAD
 class threads : public ::testing::Test {
 protected:
   static void SetUpTestCase()

cmake/tribits.cmake

@@ -4,13 +4,31 @@ INCLUDE(CTest)
 cmake_policy(SET CMP0054 NEW)
 
 IF(NOT DEFINED ${PROJECT_NAME})
-  project(Kokkos) 
+  project(KokkosCMake) 
 ENDIF()
 
-IF(NOT DEFINED ${${PROJECT_NAME}_ENABLE_DEBUG}})
+MESSAGE(WARNING "The project name is: ${PROJECT_NAME}")
+
+IF(NOT DEFINED ${PROJECT_NAME}_ENABLE_OpenMP)
+  SET(${PROJECT_NAME}_ENABLE_OpenMP OFF)
+ENDIF()
+
+IF(NOT DEFINED ${PROJECT_NAME}_ENABLE_DEBUG)
   SET(${PROJECT_NAME}_ENABLE_DEBUG OFF)
 ENDIF()
 
+IF(NOT DEFINED ${PROJECT_NAME}_ENABLE_CXX11)
+  SET(${PROJECT_NAME}_ENABLE_CXX11 ON)
+ENDIF()
+
+IF(NOT DEFINED ${PROJECT_NAME}_ENABLE_TESTS)
+  SET(${PROJECT_NAME}_ENABLE_TESTS OFF)
+ENDIF()
+
+IF(NOT DEFINED TPL_ENABLE_Pthread)
+  SET(TPL_ENABLE_Pthread OFF)
+ENDIF()
+
 FUNCTION(ASSERT_DEFINED VARS)
   FOREACH(VAR ${VARS})
     IF(NOT DEFINED ${VAR})
@@ -70,9 +88,11 @@ ENDMACRO()
 
 
 MACRO(TRIBITS_ADD_TEST_DIRECTORIES)
-  FOREACH(TEST_DIR ${ARGN})
-    ADD_SUBDIRECTORY(${TEST_DIR})
-  ENDFOREACH()
+  IF(${${PROJECT_NAME}_ENABLE_TESTS})
+    FOREACH(TEST_DIR ${ARGN})
+      ADD_SUBDIRECTORY(${TEST_DIR})
+    ENDFOREACH()
+  ENDIF()
 ENDMACRO()
 
 MACRO(TRIBITS_ADD_EXAMPLE_DIRECTORIES)
@@ -264,11 +284,11 @@ FUNCTION(TRIBITS_ADD_EXECUTABLE EXE_NAME)
     SET(EXE_BINARY_NAME ${PACKAGE_NAME}_${EXE_BINARY_NAME})
   ENDIF()
 
-  IF (PARSE_TESTONLY)
-    SET(EXCLUDE_FROM_ALL_KEYWORD "EXCLUDE_FROM_ALL")
-  ELSE()
-    SET(EXCLUDE_FROM_ALL_KEYWORD)
-  ENDIF()
+  # IF (PARSE_TESTONLY)
+  #   SET(EXCLUDE_FROM_ALL_KEYWORD "EXCLUDE_FROM_ALL")
+  # ELSE()
+  #   SET(EXCLUDE_FROM_ALL_KEYWORD)
+  # ENDIF()
   ADD_EXECUTABLE(${EXE_BINARY_NAME} ${EXCLUDE_FROM_ALL_KEYWORD} ${EXE_SOURCES})
 
   TARGET_LINK_AND_INCLUDE_LIBRARIES(${EXE_BINARY_NAME} ${LINK_LIBS})
@@ -470,9 +490,8 @@ ENDMACRO(TRIBITS_SUBPACKAGE_POSTPROCESS)
 
 MACRO(TRIBITS_PACKAGE_DECL NAME)
 
-  PROJECT(${NAME})
-  STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
-  SET(PACKAGE_NAME ${PROJECT_NAME})
+  SET(PACKAGE_NAME ${NAME})
+  SET(${PACKAGE_NAME}_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
   STRING(TOUPPER ${PACKAGE_NAME} PACKAGE_NAME_UC)
 
   SET(TRIBITS_DEPS_DIR "${CMAKE_SOURCE_DIR}/cmake/deps")
@@ -489,7 +508,7 @@ MACRO(TRIBITS_PROCESS_SUBPACKAGES)
   FOREACH(SUBPACKAGE ${SUBPACKAGES})
     GET_FILENAME_COMPONENT(SUBPACKAGE_CMAKE ${SUBPACKAGE} DIRECTORY)
     GET_FILENAME_COMPONENT(SUBPACKAGE_DIR ${SUBPACKAGE_CMAKE} DIRECTORY)
-    ADD_SUBDIRECTORY(${SUBPACKAGE_DIR})
+    ADD_SUBDIRECTORY(${CMAKE_BINARY_DIR}/../${SUBPACKAGE_DIR})
   ENDFOREACH()
 ENDMACRO(TRIBITS_PROCESS_SUBPACKAGES)
 

config/master_history.txt

@@ -4,3 +4,4 @@ tag:  2.01.10    date: 09:27:2016    master: e4119325    develop: e6cda11e
 tag:  2.02.00    date: 10:30:2016    master: 6c90a581    develop: ca3dd56e
 tag:  2.02.01    date: 11:01:2016    master: 9c698c86    develop: b0072304
 tag:  2.02.07    date: 12:16:2016    master: 4b4cc4ba    develop: 382c0966
+tag:  2.02.15    date: 02:10:2017    master: 8c64cd93    develop: 28dea8b6 

config/test_all_sandia

@@ -10,12 +10,18 @@ set -o pipefail
 
 MACHINE=""
 HOSTNAME=$(hostname)
+PROCESSOR=`uname -p`
+
 if [[ "$HOSTNAME" =~ (white|ride).* ]]; then
     MACHINE=white
 elif [[ "$HOSTNAME" =~ .*bowman.* ]]; then
     MACHINE=bowman
 elif [[ "$HOSTNAME" =~ node.* ]]; then # Warning: very generic name
-    MACHINE=shepard
+    if [[ "$PROCESSOR" = "aarch64" ]]; then
+        MACHINE=sullivan
+    else
+        MACHINE=shepard
+    fi
 elif [[ "$HOSTNAME" =~ apollo ]]; then
     MACHINE=apollo
 elif [ ! -z "$SEMS_MODULEFILES_ROOT" ]; then
@@ -27,6 +33,7 @@ fi
 
 GCC_BUILD_LIST="OpenMP,Pthread,Serial,OpenMP_Serial,Pthread_Serial"
 IBM_BUILD_LIST="OpenMP,Serial,OpenMP_Serial"
+ARM_GCC_BUILD_LIST="OpenMP,Serial,OpenMP_Serial"
 INTEL_BUILD_LIST="OpenMP,Pthread,Serial,OpenMP_Serial,Pthread_Serial"
 CLANG_BUILD_LIST="Pthread,Serial,Pthread_Serial"
 CUDA_BUILD_LIST="Cuda_OpenMP,Cuda_Pthread,Cuda_Serial"
@@ -200,6 +207,23 @@ elif [ "$MACHINE" = "bowman" ]; then
     if [ -z "$ARCH_FLAG" ]; then
       ARCH_FLAG="--arch=KNL"
     fi
+
+    NUM_JOBS_TO_RUN_IN_PARALLEL=2
+
+elif [ "$MACHINE" = "sullivan" ]; then
+    source /etc/profile.d/modules.sh
+    SKIP_HWLOC=True
+    export SLURM_TASKS_PER_NODE=96
+
+    BASE_MODULE_LIST="<COMPILER_NAME>/<COMPILER_VERSION>"
+
+    # Format: (compiler module-list build-list exe-name warning-flag)
+    COMPILERS=("gcc/5.3.0 $BASE_MODULE_LIST $ARM_GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS")
+
+    if [ -z "$ARCH_FLAG" ]; then
+      ARCH_FLAG="--arch=ARMv8-ThunderX"
+    fi
+
     NUM_JOBS_TO_RUN_IN_PARALLEL=2
 
 elif [ "$MACHINE" = "shepard" ]; then
@@ -297,7 +321,8 @@ echo "    Defaults to root repo containing this script"
 echo "--debug: Run tests in debug. Defaults to False"
 echo "--test-script: Test this script, not Kokkos"
 echo "--skip-hwloc: Do not do hwloc tests"
-echo "--num=N: Number of jobs to run in parallel "
+echo "--num=N: Number of jobs to run in parallel"
+echo "--spot-check: Minimal test set to issue pull request"
 echo "--dry-run: Just print what would be executed"
 echo "--build-only: Just do builds, don't run anything"
 echo "--opt-flag=FLAG: Optimization flag (default: -O3)"