Update Kokkos library in LAMMPS to v4.0
This commit is contained in:
@ -1,46 +1,18 @@
|
||||
/*
|
||||
//@HEADER
|
||||
// ************************************************************************
|
||||
//
|
||||
// Kokkos v. 3.0
|
||||
// Copyright (2020) National Technology & Engineering
|
||||
// Kokkos v. 4.0
|
||||
// Copyright (2022) National Technology & Engineering
|
||||
// Solutions of Sandia, LLC (NTESS).
|
||||
//
|
||||
// Under the terms of Contract DE-NA0003525 with NTESS,
|
||||
// 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:
|
||||
// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions.
|
||||
// See https://kokkos.org/LICENSE for license information.
|
||||
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
||||
//
|
||||
// 1. Redistributions of source code must retain the above copyright
|
||||
// notice, this list of conditions and the following disclaimer.
|
||||
//
|
||||
// 2. Redistributions in binary form must reproduce the above copyright
|
||||
// notice, this list of conditions and the following disclaimer in the
|
||||
// documentation and/or other materials provided with the distribution.
|
||||
//
|
||||
// 3. Neither the name of the Corporation nor the names of the
|
||||
// contributors may be used to endorse or promote products derived from
|
||||
// this software without specific prior written permission.
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY NTESS "AS IS" AND ANY
|
||||
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
|
||||
// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||
// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
||||
// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||
// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
||||
// 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 Christian R. Trott (crtrott@sandia.gov)
|
||||
//
|
||||
// ************************************************************************
|
||||
//@HEADER
|
||||
*/
|
||||
|
||||
#ifndef KOKKOS_GRAPH_HPP
|
||||
#define KOKKOS_GRAPH_HPP
|
||||
@ -58,8 +30,6 @@
|
||||
// GraphAccess needs to be defined, not just declared
|
||||
#include <impl/Kokkos_GraphImpl.hpp>
|
||||
|
||||
#include <impl/Kokkos_Utilities.hpp> // fold emulation
|
||||
|
||||
#include <functional>
|
||||
#include <memory>
|
||||
|
||||
@ -70,7 +40,7 @@ namespace Experimental {
|
||||
// <editor-fold desc="Graph"> {{{1
|
||||
|
||||
template <class ExecutionSpace>
|
||||
struct KOKKOS_ATTRIBUTE_NODISCARD Graph {
|
||||
struct [[nodiscard]] Graph {
|
||||
public:
|
||||
//----------------------------------------------------------------------------
|
||||
// <editor-fold desc="public member types"> {{{2
|
||||
@ -145,8 +115,7 @@ auto when_all(PredecessorRefs&&... arg_pred_refs) {
|
||||
.lock();
|
||||
auto node_ptr_impl = graph_ptr_impl->create_aggregate_ptr(arg_pred_refs...);
|
||||
graph_ptr_impl->add_node(node_ptr_impl);
|
||||
KOKKOS_IMPL_FOLD_COMMA_OPERATOR(
|
||||
graph_ptr_impl->add_predecessor(node_ptr_impl, arg_pred_refs) /* ... */);
|
||||
(graph_ptr_impl->add_predecessor(node_ptr_impl, arg_pred_refs), ...);
|
||||
return Kokkos::Impl::GraphAccess::make_graph_node_ref(
|
||||
std::move(graph_ptr_impl), std::move(node_ptr_impl));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user