Merge pull request #833 from stanmoore1/kk_update_2.6

# Change Log

## [2.6.00](https://github.com/kokkos/kokkos/tree/2.6.00) (2018-03-07)

[Full Changelog](https://github.com/kokkos/kokkos/compare/2.5.00...2.6.00)

**Part of the Kokkos C++ Performance Portability Programming EcoSystem 2.6**      

**Implemented enhancements:**

- Support NVIDIA Volta microarchitecture [\#1466](https://github.com/kokkos/kokkos/issues/1466)

- Kokkos - Define empty functions when profiling disabled [\#1424](https://github.com/kokkos/kokkos/issues/1424)

- Don't use \_\_constant\_\_ cache for lock arrays, enable once per run update instead of once per call [\#1385](https://github.com/kokkos/kokkos/issues/1385)

- task dag enhancement. [\#1354](https://github.com/kokkos/kokkos/issues/1354)

- Cuda task team collectives and stack size [\#1353](https://github.com/kokkos/kokkos/issues/1353)

- Replace View operator acceptance of more than rank integers with 'access' function [\#1333](https://github.com/kokkos/kokkos/issues/1333)

- Interoperability: Do not shut down backend execution space runtimes upon calling finalize. [\#1305](https://github.com/kokkos/kokkos/issues/1305)

- shmem\_size for LayoutStride [\#1291](https://github.com/kokkos/kokkos/issues/1291)

- Kokkos::resize performs poorly on 1D Views [\#1270](https://github.com/kokkos/kokkos/issues/1270)

- stride\(\) is inconsistent with dimension\(\), extent\(\), etc. [\#1214](https://github.com/kokkos/kokkos/issues/1214)

- Kokkos::sort defaults to std::sort on host [\#1208](https://github.com/kokkos/kokkos/issues/1208)

- DynamicView with host size grow [\#1206](https://github.com/kokkos/kokkos/issues/1206)

- Unmanaged View with Anonymous Memory Space [\#1175](https://github.com/kokkos/kokkos/issues/1175)

- Sort subset of Kokkos::DynamicView [\#1160](https://github.com/kokkos/kokkos/issues/1160)

- MDRange policy doesn't support lambda reductions [\#1054](https://github.com/kokkos/kokkos/issues/1054)

- Add ability to set hook on Kokkos::finalize [\#714](https://github.com/kokkos/kokkos/issues/714)

- Atomics with Serial Backend - Default should be Disable? [\#549](https://github.com/kokkos/kokkos/issues/549)

- KOKKOS\_ENABLE\_DEPRECATED\_CODE [\#1359](https://github.com/kokkos/kokkos/issues/1359)

**Fixed bugs:**

- cuda\_internal\_maximum\_warp\_count returns 8, but I believe it should return 16 for P100  [\#1269](https://github.com/kokkos/kokkos/issues/1269)

- Cuda: level 1 scratch memory bug \(reported by Stan Moore\) [\#1434](https://github.com/kokkos/kokkos/issues/1434)

- MDRangePolicy Reduction requires value\_type typedef in Functor [\#1379](https://github.com/kokkos/kokkos/issues/1379)

- Kokkos DeepCopy between empty views fails [\#1369](https://github.com/kokkos/kokkos/issues/1369)

- Several issues with new CMake build infrastructure \(reported by Eric Phipps\) [\#1365](https://github.com/kokkos/kokkos/issues/1365)

- deep\_copy between rank-1 host/device views of differing layouts without UVM no longer works \(reported by Eric Phipps\) [\#1363](https://github.com/kokkos/kokkos/issues/1363)

- Profiling can't be disabled in CMake, and a parallel\_for is missing for tasks \(reported by Kyungjoo Kim\) [\#1349](https://github.com/kokkos/kokkos/issues/1349)

- get\_work\_partition int overflow \(reported by berryj5\) [\#1327](https://github.com/kokkos/kokkos/issues/1327)

- Kokkos::deep\_copy must fence even if the two views are the same [\#1303](https://github.com/kokkos/kokkos/issues/1303)

- CudaUVMSpace::allocate/deallocate must fence [\#1302](https://github.com/kokkos/kokkos/issues/1302)

- ViewResize on CUDA fails in Debug because of too many resources requested [\#1299](https://github.com/kokkos/kokkos/issues/1299)

- Cuda 9 and intrepid2 calls from Panzer. [\#1183](https://github.com/kokkos/kokkos/issues/1183)

- Slowdown due to tracking\_enabled\(\) in 2.04.00 \(found by Albany app\) [\#1016](https://github.com/kokkos/kokkos/issues/1016)

- Bounds checking fails with zero-span Views \(reported by Stan Moore\) [\#1411](https://github.com/kokkos/kokkos/issues/1411)

## [2.5.00](https://github.com/kokkos/kokkos/tree/2.5.00) (2017-12-15)

[Full Changelog](https://github.com/kokkos/kokkos/compare/2.04.11...2.5.00)

ENDIF()

IF(NOT KOKKOS_HAS_TRILINOS)

  cmake_minimum_required(VERSION 3.1 FATAL_ERROR)

  cmake_minimum_required(VERSION 3.3 FATAL_ERROR)

  # Define Project Name if this is a standalone build

  IF(NOT DEFINED ${PROJECT_NAME})

    COMMAND ${KOKKOS_SETTINGS} make -f ${KOKKOS_SRC_PATH}/cmake/Makefile.generate_cmake_settings CXX=${CMAKE_CXX_COMPILER} generate_build_settings

    WORKING_DIRECTORY "${Kokkos_BINARY_DIR}"

    OUTPUT_FILE ${Kokkos_BINARY_DIR}/core_src_make.out

    RESULT_VARIABLE res

    RESULT_VARIABLE GEN_SETTINGS_RESULT

  )

  if (GEN_SETTINGS_RESULT)

    message(FATAL_ERROR "Kokkos settings generation failed:\n"

        "${KOKKOS_SETTINGS} make -f ${KOKKOS_SRC_PATH}/cmake/Makefile.generate_cmake_settings CXX=${CMAKE_CXX_COMPILER} generate_build_settings")

  endif()

  include(${Kokkos_BINARY_DIR}/kokkos_generated_settings.cmake)

  string(REPLACE " " ";" KOKKOS_TPL_INCLUDE_DIRS "${KOKKOS_GMAKE_TPL_INCLUDE_DIRS}")

  string(REPLACE " " ";" KOKKOS_TPL_LIBRARY_DIRS "${KOKKOS_GMAKE_TPL_LIBRARY_DIRS}")

  string(REPLACE " " ";" KOKKOS_TPL_LIBRARY_NAMES "${KOKKOS_GMAKE_TPL_LIBRARY_NAMES}")

  list(REMOVE_ITEM KOKKOS_TPL_INCLUDE_DIRS "")

  list(REMOVE_ITEM KOKKOS_TPL_LIBRARY_DIRS "")

  list(REMOVE_ITEM KOKKOS_TPL_LIBRARY_NAMES "")

  set_kokkos_srcs(KOKKOS_SRC ${KOKKOS_SRC})

  #------------ NOW BUILD ------------------------------------------------------

// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

//

// Questions? Contact  H. Carter Edwards (hcedwar@sandia.gov)

// Questions? Contact Christian R. Trott (crtrott@sandia.gov)

// 

// ************************************************************************

//@HEADER

3) Snapshot the current commit in the Kokkos clone into the Trilinos clone.

   This overwrites ${TRILINOS}/packages/kokkos with the content of ${KOKKOS}:

	${KOKKOS}/config/snapshot.py --verbose ${KOKKOS} ${TRILINOS}/packages

	${KOKKOS}/scripts/snapshot.py --verbose ${KOKKOS} ${TRILINOS}/packages

4) Verify the snapshot commit happened as expected

	cd ${TRILINOS}/packages/kokkos

// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

//

// Questions? Contact  H. Carter Edwards (hcedwar@sandia.gov)

// Questions? Contact Christian R. Trott (crtrott@sandia.gov)

// 

// ************************************************************************

//@HEADER