Update Kokkos library in LAMMPS to v4.4.1

This commit is contained in:
Stan Moore
2024-09-13 12:14:49 -06:00
parent 3079d51eaf
commit 487f7ade68
23 changed files with 470 additions and 80 deletions

View File

@ -20,7 +20,7 @@
namespace {
// User-defined type with a View data member
// User-defined types with a View data member
template <class V>
class S {
V v_;
@ -28,48 +28,102 @@ class S {
public:
template <class... Extents>
S(std::string label, Extents... extents) : v_(std::move(label), extents...) {}
S() = default;
KOKKOS_DEFAULTED_FUNCTION S() = default;
};
template <class V>
void test_view_of_views() {
class N { // not default constructible
V v_;
public:
template <class... Extents>
N(std::string label, Extents... extents) : v_(std::move(label), extents...) {}
};
template <class V>
class H { // constructible and destructible only from on the host side
V v_;
public:
template <class... Extents>
H(std::string label, Extents... extents) : v_(std::move(label), extents...) {}
H() {}
~H() {}
};
template <class V>
void test_view_of_views_default() {
// assigning a default-constructed view to destruct the inner objects
using VoV = Kokkos::View<V**, Kokkos::HostSpace>;
{ // assigning a default-constructed view to destruct the inner objects
VoV vov("vov", 2, 3);
V a("a");
V b("b");
vov(0, 0) = a;
vov(1, 0) = a;
vov(0, 1) = b;
VoV vov("vov", 2, 3);
V a("a");
V b("b");
vov(0, 0) = a;
vov(1, 0) = a;
vov(0, 1) = b;
#ifndef KOKKOS_ENABLE_IMPL_VIEW_OF_VIEWS_DESTRUCTOR_PRECONDITION_VIOLATION_WORKAROUND
vov(0, 0) = V();
vov(1, 0) = V();
vov(0, 1) = V();
vov(0, 0) = V();
vov(1, 0) = V();
vov(0, 1) = V();
#endif
}
{ // using placement new to construct the inner objects and explicitly
// calling the destructor
VoV vov(Kokkos::view_alloc("vov", Kokkos::WithoutInitializing), 2, 3);
V a("a");
V b("b");
new (&vov(0, 0)) V(a);
new (&vov(1, 0)) V(a);
new (&vov(0, 1)) V(b);
#ifndef KOKKOS_ENABLE_IMPL_VIEW_OF_VIEWS_DESTRUCTOR_PRECONDITION_VIOLATION_WORKAROUND
vov(0, 0).~V();
vov(1, 0).~V();
vov(0, 1).~V();
#else
// leaks memory
#endif
}
}
TEST(TEST_CATEGORY, view_of_views) {
test_view_of_views<Kokkos::View<int, TEST_EXECSPACE>>();
test_view_of_views<Kokkos::View<int[4], TEST_EXECSPACE>>();
template <class V>
void test_view_of_views_without_initializing() {
// using placement new to construct the inner objects and explicitly
// calling the destructor
using VoV = Kokkos::View<V**, Kokkos::HostSpace>;
VoV vov(Kokkos::view_alloc("vov", Kokkos::WithoutInitializing), 2, 3);
V a("a");
V b("b");
new (&vov(0, 0)) V(a);
new (&vov(1, 0)) V(a);
new (&vov(0, 1)) V(b);
#ifndef KOKKOS_ENABLE_IMPL_VIEW_OF_VIEWS_DESTRUCTOR_PRECONDITION_VIOLATION_WORKAROUND
vov(0, 0).~V();
vov(1, 0).~V();
vov(0, 1).~V();
#else
// leaks memory
#endif
}
template <class V>
void test_view_of_views_sequential_host_init() {
// inner views value-initialized sequentially on the host, and also
// sequentially destructed on the host, without the need to cleanup
using VoV = Kokkos::View<V**, Kokkos::HostSpace>;
VoV vov(Kokkos::view_alloc("vov", Kokkos::SequentialHostInit), 2, 3);
V a("a");
V b("b");
vov(0, 0) = a;
vov(1, 0) = a;
vov(0, 1) = b;
}
TEST(TEST_CATEGORY, view_of_views_default) {
test_view_of_views_default<Kokkos::View<int, TEST_EXECSPACE>>();
test_view_of_views_default<Kokkos::View<int[4], TEST_EXECSPACE>>();
// User-defined type with View data member
test_view_of_views<S<Kokkos::View<float, TEST_EXECSPACE>>>();
test_view_of_views_default<S<Kokkos::View<float, TEST_EXECSPACE>>>();
}
TEST(TEST_CATEGORY, view_of_views_without_initializing) {
test_view_of_views_without_initializing<Kokkos::View<int, TEST_EXECSPACE>>();
test_view_of_views_without_initializing<
S<Kokkos::View<float, TEST_EXECSPACE>>>();
test_view_of_views_without_initializing<
N<Kokkos::View<double, TEST_EXECSPACE>>>();
test_view_of_views_without_initializing<
H<Kokkos::View<int, TEST_EXECSPACE>>>();
}
TEST(TEST_CATEGORY, test_view_of_views_sequential_host_init) {
test_view_of_views_sequential_host_init<Kokkos::View<int, TEST_EXECSPACE>>();
test_view_of_views_sequential_host_init<
S<Kokkos::View<float, TEST_EXECSPACE>>>();
test_view_of_views_sequential_host_init<
H<Kokkos::View<int, TEST_EXECSPACE>>>();
}
} // namespace