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

Update Kokkos library in LAMMPS to v3.0

Browse Source
This commit is contained in:
Stan Moore
2020-03-25 14:08:39 -06:00
parent 0252d8c210
commit 60864e38d1
2169 changed files with 121406 additions and 126492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

169
lib/kokkos/containers/src/impl/Kokkos_UnorderedMap_impl.hpp
View File

@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
// Kokkos v. 2.0
// Copyright (2014) Sandia Corporation
// Kokkos v. 3.0
// Copyright (2020) National Technology & Engineering
// Solutions of Sandia, LLC (NTESS).
//
// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
// 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
@ -23,10 +24,10 @@
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
// 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 SANDIA CORPORATION OR THE
// 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
@ -52,42 +53,34 @@
#include <iostream>
#include <iomanip>
namespace Kokkos { namespace Impl {
namespace Kokkos {
namespace Impl {
uint32_t find_hash_size( uint32_t size );
uint32_t find_hash_size(uint32_t size);
template <typename Map>
struct UnorderedMapRehash
{
struct UnorderedMapRehash {
typedef Map map_type;
typedef typename map_type::const_map_type const_map_type;
typedef typename map_type::execution_space execution_space;
typedef typename map_type::size_type size_type;
map_type m_dst;
map_type m_dst;
const_map_type m_src;
UnorderedMapRehash( map_type const& dst, const_map_type const& src)
: m_dst(dst), m_src(src)
{}
UnorderedMapRehash(map_type const& dst, const_map_type const& src)
: m_dst(dst), m_src(src) {}
void apply() const
{
parallel_for(m_src.capacity(), *this);
}
void apply() const { parallel_for(m_src.capacity(), *this); }
KOKKOS_INLINE_FUNCTION
void operator()(size_type i) const
{
if ( m_src.valid_at(i) )
m_dst.insert(m_src.key_at(i), m_src.value_at(i));
void operator()(size_type i) const {
if (m_src.valid_at(i)) m_dst.insert(m_src.key_at(i), m_src.value_at(i));
}
};
template <typename UMap>
struct UnorderedMapErase
{
struct UnorderedMapErase {
typedef UMap map_type;
typedef typename map_type::execution_space execution_space;
typedef typename map_type::size_type size_type;
@ -96,18 +89,12 @@ struct UnorderedMapErase
map_type m_map;
UnorderedMapErase( map_type const& map)
: m_map(map)
{}
UnorderedMapErase(map_type const& map) : m_map(map) {}
void apply() const
{
parallel_for(m_map.m_hash_lists.extent(0), *this);
}
void apply() const { parallel_for(m_map.m_hash_lists.extent(0), *this); }
KOKKOS_INLINE_FUNCTION
void operator()( size_type i ) const
{
void operator()(size_type i) const {
const size_type invalid_index = map_type::invalid_index;
size_type curr = m_map.m_hash_lists(i);
@ -115,29 +102,28 @@ struct UnorderedMapErase
// remove erased head of the linked-list
while (curr != invalid_index && !m_map.valid_at(curr)) {
next = m_map.m_next_index[curr];
next = m_map.m_next_index[curr];
m_map.m_next_index[curr] = invalid_index;
m_map.m_keys[curr] = key_type();
m_map.m_keys[curr] = key_type();
if (m_map.is_set) m_map.m_values[curr] = value_type();
curr = next;
curr = next;
m_map.m_hash_lists(i) = next;
}
// if the list is non-empty and the head is valid
if (curr != invalid_index && m_map.valid_at(curr) ) {
if (curr != invalid_index && m_map.valid_at(curr)) {
size_type prev = curr;
curr = m_map.m_next_index[prev];
curr = m_map.m_next_index[prev];
while (curr != invalid_index) {
next = m_map.m_next_index[curr];
if (m_map.valid_at(curr)) {
prev = curr;
}
else {
} else {
// remove curr from list
m_map.m_next_index[prev] = next;
m_map.m_next_index[curr] = invalid_index;
m_map.m_keys[curr] = key_type();
m_map.m_keys[curr] = key_type();
if (map_type::is_set) m_map.m_values[curr] = value_type();
}
curr = next;
@ -147,8 +133,7 @@ struct UnorderedMapErase
};
template <typename UMap>
struct UnorderedMapHistogram
{
struct UnorderedMapHistogram {
typedef UMap map_type;
typedef typename map_type::execution_space execution_space;
typedef typename map_type::size_type size_type;
@ -161,117 +146,100 @@ struct UnorderedMapHistogram
histogram_view m_distance;
histogram_view m_block_distance;
UnorderedMapHistogram( map_type const& map)
: m_map(map)
, m_length("UnorderedMap Histogram")
, m_distance("UnorderedMap Histogram")
, m_block_distance("UnorderedMap Histogram")
{}
UnorderedMapHistogram(map_type const& map)
: m_map(map),
m_length("UnorderedMap Histogram"),
m_distance("UnorderedMap Histogram"),
m_block_distance("UnorderedMap Histogram") {}
void calculate()
{
parallel_for(m_map.m_hash_lists.extent(0), *this);
}
void calculate() { parallel_for(m_map.m_hash_lists.extent(0), *this); }
void clear()
{
void clear() {
Kokkos::deep_copy(m_length, 0);
Kokkos::deep_copy(m_distance, 0);
Kokkos::deep_copy(m_block_distance, 0);
}
void print_length(std::ostream &out)
{
void print_length(std::ostream& out) {
host_histogram_view host_copy = create_mirror_view(m_length);
Kokkos::deep_copy(host_copy, m_length);
for (int i=0, size = host_copy.extent(0); i<size; ++i)
{
for (int i = 0, size = host_copy.extent(0); i < size; ++i) {
out << host_copy[i] << " , ";
}
out << "\b\b\b " << std::endl;
}
void print_distance(std::ostream &out)
{
void print_distance(std::ostream& out) {
host_histogram_view host_copy = create_mirror_view(m_distance);
Kokkos::deep_copy(host_copy, m_distance);
for (int i=0, size = host_copy.extent(0); i<size; ++i)
{
for (int i = 0, size = host_copy.extent(0); i < size; ++i) {
out << host_copy[i] << " , ";
}
out << "\b\b\b " << std::endl;
}
void print_block_distance(std::ostream &out)
{
void print_block_distance(std::ostream& out) {
host_histogram_view host_copy = create_mirror_view(m_block_distance);
Kokkos::deep_copy(host_copy, m_block_distance);
for (int i=0, size = host_copy.extent(0); i<size; ++i)
{
for (int i = 0, size = host_copy.extent(0); i < size; ++i) {
out << host_copy[i] << " , ";
}
out << "\b\b\b " << std::endl;
}
KOKKOS_INLINE_FUNCTION
void operator()( size_type i ) const
{
void operator()(size_type i) const {
const size_type invalid_index = map_type::invalid_index;
uint32_t length = 0;
uint32_t length = 0;
size_type min_index = ~0u, max_index = 0;
for (size_type curr = m_map.m_hash_lists(i); curr != invalid_index; curr = m_map.m_next_index[curr]) {
for (size_type curr = m_map.m_hash_lists(i); curr != invalid_index;
curr = m_map.m_next_index[curr]) {
++length;
min_index = (curr < min_index) ? curr : min_index;
max_index = (max_index < curr) ? curr : max_index;
}
size_type distance = (0u < length) ? max_index - min_index : 0u;
size_type blocks = (0u < length) ? max_index/32u - min_index/32u : 0u;
size_type blocks = (0u < length) ? max_index / 32u - min_index / 32u : 0u;
// normalize data
length = length < 100u ? length : 99u;
length = length < 100u ? length : 99u;
distance = distance < 100u ? distance : 99u;
blocks = blocks < 100u ? blocks : 99u;
blocks = blocks < 100u ? blocks : 99u;
if (0u < length)
{
atomic_fetch_add( &m_length(length), 1);
atomic_fetch_add( &m_distance(distance), 1);
atomic_fetch_add( &m_block_distance(blocks), 1);
if (0u < length) {
atomic_fetch_add(&m_length(length), 1);
atomic_fetch_add(&m_distance(distance), 1);
atomic_fetch_add(&m_block_distance(blocks), 1);
}
}
};
template <typename UMap>
struct UnorderedMapPrint
{
struct UnorderedMapPrint {
typedef UMap map_type;
typedef typename map_type::execution_space execution_space;
typedef typename map_type::size_type size_type;
map_type m_map;
UnorderedMapPrint( map_type const& map)
: m_map(map)
{}
UnorderedMapPrint(map_type const& map) : m_map(map) {}
void apply()
{
parallel_for(m_map.m_hash_lists.extent(0), *this);
}
void apply() { parallel_for(m_map.m_hash_lists.extent(0), *this); }
KOKKOS_INLINE_FUNCTION
void operator()( size_type i ) const
{
void operator()(size_type i) const {
const size_type invalid_index = map_type::invalid_index;
uint32_t list = m_map.m_hash_lists(i);
for (size_type curr = list, ii=0; curr != invalid_index; curr = m_map.m_next_index[curr], ++ii) {
printf("%d[%d]: %d->%d\n", list, ii, m_map.key_at(curr), m_map.value_at(curr));
for (size_type curr = list, ii = 0; curr != invalid_index;
curr = m_map.m_next_index[curr], ++ii) {
printf("%d[%d]: %d->%d\n", list, ii, m_map.key_at(curr),
m_map.value_at(curr));
}
}
};
@ -280,19 +248,20 @@ template <typename DKey, typename DValue, typename SKey, typename SValue>
struct UnorderedMapCanAssign : public false_ {};
template <typename Key, typename Value>
struct UnorderedMapCanAssign<Key,Value,Key,Value> : public true_ {};
struct UnorderedMapCanAssign<Key, Value, Key, Value> : public true_ {};
template <typename Key, typename Value>
struct UnorderedMapCanAssign<const Key,Value,Key,Value> : public true_ {};
struct UnorderedMapCanAssign<const Key, Value, Key, Value> : public true_ {};
template <typename Key, typename Value>
struct UnorderedMapCanAssign<const Key,const Value,Key,Value> : public true_ {};
struct UnorderedMapCanAssign<const Key, const Value, Key, Value>
: public true_ {};
template <typename Key, typename Value>
struct UnorderedMapCanAssign<const Key,const Value,const Key,Value> : public true_ {};
struct UnorderedMapCanAssign<const Key, const Value, const Key, Value>
: public true_ {};
} // namespace Impl
} // namespace Kokkos
}} //Kokkos::Impl
#endif // KOKKOS_UNORDERED_MAP_IMPL_HPP
#endif // KOKKOS_UNORDERED_MAP_IMPL_HPP