Updating Kokkos lib to v2.03.05
This commit is contained in:
@ -1,13 +1,13 @@
|
||||
/*
|
||||
//@HEADER
|
||||
// ************************************************************************
|
||||
//
|
||||
//
|
||||
// Kokkos v. 2.0
|
||||
// Copyright (2014) Sandia Corporation
|
||||
//
|
||||
//
|
||||
// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
|
||||
// the U.S. Government retains certain rights in this software.
|
||||
//
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without
|
||||
// modification, are permitted provided that the following conditions are
|
||||
// met:
|
||||
@ -36,7 +36,7 @@
|
||||
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
//
|
||||
// Questions? Contact H. Carter Edwards (hcedwar@sandia.gov)
|
||||
//
|
||||
//
|
||||
// ************************************************************************
|
||||
//@HEADER
|
||||
*/
|
||||
@ -44,9 +44,9 @@
|
||||
#ifndef KOKKOS_SCRATCHSPACE_HPP
|
||||
#define KOKKOS_SCRATCHSPACE_HPP
|
||||
|
||||
#include <stdio.h>
|
||||
#include <cstdio>
|
||||
#include <Kokkos_Core_fwd.hpp>
|
||||
#include <impl/Kokkos_Tags.hpp>
|
||||
#include <Kokkos_Concepts.hpp>
|
||||
|
||||
/*--------------------------------------------------------------------------*/
|
||||
|
||||
@ -57,7 +57,7 @@ namespace Kokkos {
|
||||
*/
|
||||
template< class ExecSpace >
|
||||
class ScratchMemorySpace {
|
||||
static_assert (Impl::is_execution_space<ExecSpace>::value,"Instantiating ScratchMemorySpace on non-execution-space type.");
|
||||
static_assert (is_execution_space<ExecSpace>::value,"Instantiating ScratchMemorySpace on non-execution-space type.");
|
||||
public:
|
||||
|
||||
// Alignment of memory chunks returned by 'get'
|
||||
@ -161,6 +161,3 @@ public:
|
||||
|
||||
#endif /* #ifndef KOKKOS_SCRATCHSPACE_HPP */
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
//----------------------------------------------------------------------------
|
||||
|
||||
|
||||
Reference in New Issue
Block a user