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

Update Kokkos library to r2.6.00

Browse Source
This commit is contained in:
Stan Moore
2018-03-08 10:57:08 -07:00
parent 0c4c002f34
commit 39786b1740
694 changed files with 12261 additions and 6745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/kokkos/example/fixture/BoxElemFixture.hpp
View File

@ -35,7 +35,7 @@
// 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 H. Carter Edwards (hcedwar@sandia.gov)
// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
//
// ************************************************************************
//@HEADER
@ -157,7 +157,7 @@ public:
inline bool ok() const { return m_box_part.ok(); }
KOKKOS_INLINE_FUNCTION
size_t node_count() const { return m_node_grid.dimension_0(); }
size_t node_count() const { return m_node_grid.extent(0); }
KOKKOS_INLINE_FUNCTION
size_t node_count_owned() const { return m_box_part.owns_node_count(); }
@ -166,7 +166,7 @@ public:
size_t node_count_global() const { return m_box_part.global_node_count(); }
KOKKOS_INLINE_FUNCTION
size_t elem_count() const { return m_elem_node.dimension_0(); }
size_t elem_count() const { return m_elem_node.extent(0); }
KOKKOS_INLINE_FUNCTION
size_t elem_count_global() const { return m_box_part.global_elem_count(); }
@ -280,11 +280,11 @@ public:
}
const size_t nwork =
std::max( m_recv_node.dimension_0() ,
std::max( m_send_node.dimension_0() ,
std::max( m_send_node_id.dimension_0() ,
std::max( m_node_grid.dimension_0() ,
m_elem_node.dimension_0() * m_elem_node.dimension_1() ))));
std::max( m_recv_node.extent(0) ,
std::max( m_send_node.extent(0) ,
std::max( m_send_node_id.extent(0) ,
std::max( m_node_grid.extent(0) ,
m_elem_node.extent(0) * m_elem_node.extent(1) ))));
Kokkos::parallel_for( nwork , *this );
}
@ -295,7 +295,7 @@ public:
KOKKOS_INLINE_FUNCTION
void operator()( size_t i ) const
{
if ( i < m_elem_node.dimension_0() * m_elem_node.dimension_1() ) {
if ( i < m_elem_node.extent(0) * m_elem_node.extent(1) ) {
const size_t ielem = i / ElemNode ;
const size_t inode = i % ElemNode ;
@ -315,7 +315,7 @@ public:
m_elem_node(ielem,inode) = m_box_part.local_node_id( tmp_node_grid );
}
if ( i < m_node_grid.dimension_0() ) {
if ( i < m_node_grid.extent(0) ) {
size_t tmp_node_grid[SpaceDim] ;
m_box_part.local_node_coord( i , tmp_node_grid );
m_node_grid(i,0) = tmp_node_grid[0] ;
@ -330,17 +330,17 @@ public:
m_node_coord(i,2) );
}
if ( i < m_recv_node.dimension_0() ) {
if ( i < m_recv_node.extent(0) ) {
m_recv_node(i,0) = m_box_part.recv_node_rank(i);
m_recv_node(i,1) = m_box_part.recv_node_count(i);
}
if ( i < m_send_node.dimension_0() ) {
if ( i < m_send_node.extent(0) ) {
m_send_node(i,0) = m_box_part.send_node_rank(i);
m_send_node(i,1) = m_box_part.send_node_count(i);
}
if ( i < m_send_node_id.dimension_0() ) {
if ( i < m_send_node_id.extent(0) ) {
m_send_node_id(i) = m_box_part.send_node_id(i);
}
}