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
|
||||
*/
|
||||
|
||||
#include <Kokkos_Core.hpp>
|
||||
#include <Kokkos_DynamicView.hpp>
|
||||
@ -49,8 +21,7 @@
|
||||
|
||||
template <typename TestView, typename MemorySpace>
|
||||
void check_memory_space(TestView, MemorySpace) {
|
||||
static_assert(
|
||||
std::is_same<typename TestView::memory_space, MemorySpace>::value, "");
|
||||
static_assert(std::is_same_v<typename TestView::memory_space, MemorySpace>);
|
||||
}
|
||||
|
||||
template <class View>
|
||||
@ -69,70 +40,58 @@ void test_create_mirror_properties(const View& view) {
|
||||
// clang-format off
|
||||
|
||||
// create_mirror
|
||||
#ifndef KOKKOS_ENABLE_CXX14
|
||||
// FIXME DynamicView: HostMirror is the same type
|
||||
if constexpr (!is_dynamic_view<View>::value) {
|
||||
check_memory_space(create_mirror(WithoutInitializing, view), host_mirror_test_space(view));
|
||||
check_memory_space(create_mirror( view), host_mirror_test_space(view));
|
||||
}
|
||||
#endif
|
||||
check_memory_space(create_mirror(WithoutInitializing, DefaultExecutionSpace{}, view), DeviceMemorySpace{});
|
||||
check_memory_space(create_mirror( DefaultExecutionSpace{}, view), DeviceMemorySpace{});
|
||||
|
||||
// create_mirror_view
|
||||
#ifndef KOKKOS_ENABLE_CXX14
|
||||
// FIXME DynamicView: HostMirror is the same type
|
||||
if constexpr (!is_dynamic_view<View>::value) {
|
||||
check_memory_space(create_mirror_view(WithoutInitializing, view), host_mirror_test_space(view));
|
||||
check_memory_space(create_mirror_view( view), host_mirror_test_space(view));
|
||||
}
|
||||
#endif
|
||||
check_memory_space(create_mirror_view(WithoutInitializing, DefaultExecutionSpace{}, view), DeviceMemorySpace{});
|
||||
check_memory_space(create_mirror_view( DefaultExecutionSpace{}, view), DeviceMemorySpace{});
|
||||
|
||||
// create_mirror view_alloc
|
||||
#ifndef KOKKOS_ENABLE_CXX14
|
||||
// FIXME DynamicView: HostMirror is the same type
|
||||
if constexpr (!is_dynamic_view<View>::value) {
|
||||
check_memory_space(create_mirror(view_alloc(WithoutInitializing), view), host_mirror_test_space(view));
|
||||
check_memory_space(create_mirror(view_alloc(), view), host_mirror_test_space(view));
|
||||
}
|
||||
#endif
|
||||
check_memory_space(create_mirror(view_alloc(WithoutInitializing, DeviceMemorySpace{}), view), DeviceMemorySpace{});
|
||||
check_memory_space(create_mirror(view_alloc( DeviceMemorySpace{}), view), DeviceMemorySpace{});
|
||||
|
||||
// create_mirror_view view_alloc
|
||||
#ifndef KOKKOS_ENABLE_CXX14
|
||||
// FIXME DynamicView: HostMirror is the same type
|
||||
if constexpr (!is_dynamic_view<View>::value) {
|
||||
check_memory_space(create_mirror_view(view_alloc(WithoutInitializing), view), host_mirror_test_space(view));
|
||||
check_memory_space(create_mirror_view(view_alloc(), view), host_mirror_test_space(view));
|
||||
}
|
||||
#endif
|
||||
check_memory_space(create_mirror_view(view_alloc(WithoutInitializing, DeviceMemorySpace{}), view), DeviceMemorySpace{});
|
||||
check_memory_space(create_mirror_view(view_alloc( DeviceMemorySpace{}), view), DeviceMemorySpace{});
|
||||
|
||||
// create_mirror view_alloc + execution space
|
||||
#ifndef KOKKOS_ENABLE_CXX14
|
||||
// FIXME DynamicView: HostMirror is the same type
|
||||
if constexpr (!is_dynamic_view<View>::value) {
|
||||
check_memory_space(create_mirror(view_alloc(DefaultExecutionSpace{}, WithoutInitializing), view), host_mirror_test_space(view));
|
||||
check_memory_space(create_mirror(view_alloc(DefaultHostExecutionSpace{}), view), host_mirror_test_space(view));
|
||||
check_memory_space(create_mirror(view_alloc(DefaultHostExecutionSpace{}, WithoutInitializing), view), host_mirror_test_space(view));
|
||||
check_memory_space(create_mirror(view_alloc(DefaultHostExecutionSpace{}), view), host_mirror_test_space(view));
|
||||
}
|
||||
#endif
|
||||
check_memory_space(create_mirror(view_alloc(DefaultExecutionSpace{}, WithoutInitializing, DeviceMemorySpace{}), view), DeviceMemorySpace{});
|
||||
check_memory_space(create_mirror(view_alloc(DefaultExecutionSpace{}, DeviceMemorySpace{}), view), DeviceMemorySpace{});
|
||||
check_memory_space(create_mirror(view_alloc(DefaultExecutionSpace{}, WithoutInitializing, DeviceMemorySpace{}), view), DeviceMemorySpace{});
|
||||
check_memory_space(create_mirror(view_alloc(DefaultExecutionSpace{}, DeviceMemorySpace{}), view), DeviceMemorySpace{});
|
||||
|
||||
// create_mirror_view view_alloc + execution space
|
||||
#ifndef KOKKOS_ENABLE_CXX14
|
||||
// FIXME DynamicView: HostMirror is the same type
|
||||
if constexpr (!is_dynamic_view<View>::value) {
|
||||
check_memory_space(create_mirror_view(view_alloc(DefaultExecutionSpace{}, WithoutInitializing), view), host_mirror_test_space(view));
|
||||
check_memory_space(create_mirror_view(view_alloc(DefaultHostExecutionSpace{}), view), host_mirror_test_space(view));
|
||||
check_memory_space(create_mirror_view(view_alloc(DefaultHostExecutionSpace{}, WithoutInitializing), view), host_mirror_test_space(view));
|
||||
check_memory_space(create_mirror_view(view_alloc(DefaultHostExecutionSpace{}), view), host_mirror_test_space(view));
|
||||
}
|
||||
#endif
|
||||
check_memory_space(create_mirror_view(view_alloc(DefaultExecutionSpace{}, WithoutInitializing, DeviceMemorySpace{}), view), DeviceMemorySpace{});
|
||||
check_memory_space(create_mirror_view(view_alloc(DefaultExecutionSpace{}, DeviceMemorySpace{}), view), DeviceMemorySpace{});
|
||||
check_memory_space(create_mirror_view(view_alloc(DefaultExecutionSpace{}, WithoutInitializing, DeviceMemorySpace{}), view), DeviceMemorySpace{});
|
||||
check_memory_space(create_mirror_view(view_alloc(DefaultExecutionSpace{}, DeviceMemorySpace{}), view), DeviceMemorySpace{});
|
||||
|
||||
// create_mirror_view_and_copy
|
||||
check_memory_space(create_mirror_view_and_copy(HostSpace{}, view), HostSpace{});
|
||||
|
||||
Reference in New Issue
Block a user