ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Kokkos library in LAMMPS to v3.2

Browse Source
This commit is contained in:
Stan Moore
2020-08-25 20:21:48 -06:00
parent 450fd12d31
commit 4d90c2b74b
1410 changed files with 19364 additions and 71953 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lib/kokkos/containers/unit_tests/TestUnorderedMap.hpp
View File

@ -53,9 +53,9 @@ namespace Impl {
template <typename MapType, bool Near = false>
struct TestInsert {
typedef MapType map_type;
typedef typename map_type::execution_space execution_space;
typedef uint32_t value_type;
using map_type = MapType;
using execution_space = typename map_type::execution_space;
using value_type = uint32_t;
map_type map;
uint32_t inserts;
@ -101,10 +101,10 @@ struct TestInsert {
template <typename MapType, bool Near>
struct TestErase {
typedef TestErase<MapType, Near> self_type;
using self_type = TestErase<MapType, Near>;
typedef MapType map_type;
typedef typename MapType::execution_space execution_space;
using map_type = MapType;
using execution_space = typename MapType::execution_space;
map_type m_map;
uint32_t m_num_erase;
@ -131,9 +131,9 @@ struct TestErase {
template <typename MapType>
struct TestFind {
typedef MapType map_type;
typedef typename MapType::execution_space::execution_space execution_space;
typedef uint32_t value_type;
using map_type = MapType;
using execution_space = typename MapType::execution_space::execution_space;
using value_type = uint32_t;
map_type m_map;
uint32_t m_num_insert;
@ -180,9 +180,9 @@ struct TestFind {
template <typename Device>
void test_insert(uint32_t num_nodes, uint32_t num_inserts,
uint32_t num_duplicates, bool near) {
typedef Kokkos::UnorderedMap<uint32_t, uint32_t, Device> map_type;
typedef Kokkos::UnorderedMap<const uint32_t, const uint32_t, Device>
const_map_type;
using map_type = Kokkos::UnorderedMap<uint32_t, uint32_t, Device>;
using const_map_type =
Kokkos::UnorderedMap<const uint32_t, const uint32_t, Device>;
const uint32_t expected_inserts =
(num_inserts + num_duplicates - 1u) / num_duplicates;
@ -232,7 +232,7 @@ void test_insert(uint32_t num_nodes, uint32_t num_inserts,
template <typename Device>
void test_failed_insert(uint32_t num_nodes) {
typedef Kokkos::UnorderedMap<uint32_t, uint32_t, Device> map_type;
using map_type = Kokkos::UnorderedMap<uint32_t, uint32_t, Device>;
map_type map(num_nodes);
Impl::TestInsert<map_type> test_insert(map, 2u * num_nodes, 1u);
@ -244,13 +244,11 @@ void test_failed_insert(uint32_t num_nodes) {
template <typename Device>
void test_deep_copy(uint32_t num_nodes) {
typedef Kokkos::UnorderedMap<uint32_t, uint32_t, Device> map_type;
typedef Kokkos::UnorderedMap<const uint32_t, const uint32_t, Device>
const_map_type;
using map_type = Kokkos::UnorderedMap<uint32_t, uint32_t, Device>;
using const_map_type =
Kokkos::UnorderedMap<const uint32_t, const uint32_t, Device>;
typedef typename map_type::HostMirror host_map_type;
// typedef Kokkos::UnorderedMap<uint32_t, uint32_t, typename
// Device::host_mirror_execution_space > host_map_type;
using host_map_type = typename map_type::HostMirror;
map_type map;
map.rehash(num_nodes, false);
@ -295,7 +293,7 @@ void test_deep_copy(uint32_t num_nodes) {
}
}
// FIXME_HIP deadlock
// FIXME_HIP wrong result in CI but works locally
#ifndef KOKKOS_ENABLE_HIP
// WORKAROUND MSVC
#ifndef _WIN32
@ -306,6 +304,7 @@ TEST(TEST_CATEGORY, UnorderedMap_insert) {
}
}
#endif
#endif
TEST(TEST_CATEGORY, UnorderedMap_failed_insert) {
for (int i = 0; i < 1000; ++i) test_failed_insert<TEST_EXECSPACE>(10000);
@ -314,7 +313,6 @@ TEST(TEST_CATEGORY, UnorderedMap_failed_insert) {
TEST(TEST_CATEGORY, UnorderedMap_deep_copy) {
for (int i = 0; i < 2; ++i) test_deep_copy<TEST_EXECSPACE>(10000);
}
#endif
TEST(TEST_CATEGORY, UnorderedMap_valid_empty) {
using Key = int;
@ -326,6 +324,8 @@ TEST(TEST_CATEGORY, UnorderedMap_valid_empty) {
n = Map{m.capacity()};
n.rehash(m.capacity());
Kokkos::deep_copy(n, m);
ASSERT_TRUE(m.is_allocated());
ASSERT_TRUE(n.is_allocated());
}
} // namespace Test