Update Kokkos library in LAMMPS to v3.0

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

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
@ -42,7 +43,7 @@
*/
#include <Kokkos_Macros.hpp>
#if defined( KOKKOS_ENABLE_HPX )
#if defined(KOKKOS_ENABLE_HPX)
#include <gtest/gtest.h>
@ -61,70 +62,63 @@
#include <string>
#include <fstream>
namespace Performance {
class hpx : public ::testing::Test {
protected:
static void SetUpTestCase()
{
protected:
static void SetUpTestCase() {
std::cout << std::setprecision(5) << std::scientific;
Kokkos::initialize();
Kokkos::print_configuration( std::cout );
Kokkos::print_configuration(std::cout);
}
static void TearDownTestCase()
{
Kokkos::finalize();
}
static void TearDownTestCase() { Kokkos::finalize(); }
};
TEST_F( hpx, dynrankview_perf )
{
TEST_F(hpx, dynrankview_perf) {
std::cout << "HPX" << std::endl;
std::cout << " DynRankView vs View: Initialization Only " << std::endl;
test_dynrankview_op_perf<Kokkos::Experimental::HPX>( 8192 );
test_dynrankview_op_perf<Kokkos::Experimental::HPX>(8192);
}
TEST_F( hpx, global_2_local)
{
TEST_F(hpx, global_2_local) {
std::cout << "HPX" << std::endl;
std::cout << "size, create, generate, fill, find" << std::endl;
for (unsigned i=Performance::begin_id_size; i<=Performance::end_id_size; i *= Performance::id_step)
for (unsigned i = Performance::begin_id_size; i <= Performance::end_id_size;
i *= Performance::id_step)
test_global_to_local_ids<Kokkos::Experimental::HPX>(i);
}
TEST_F( hpx, unordered_map_performance_near)
{
TEST_F(hpx, unordered_map_performance_near) {
unsigned num_hpx = 4;
std::ostringstream base_file_name;
base_file_name << "hpx-" << num_hpx << "-near";
Perf::run_performance_tests<Kokkos::Experimental::HPX,true>(base_file_name.str());
Perf::run_performance_tests<Kokkos::Experimental::HPX, true>(
base_file_name.str());
}
TEST_F( hpx, unordered_map_performance_far)
{
TEST_F(hpx, unordered_map_performance_far) {
unsigned num_hpx = 4;
std::ostringstream base_file_name;
base_file_name << "hpx-" << num_hpx << "-far";
Perf::run_performance_tests<Kokkos::Experimental::HPX,false>(base_file_name.str());
Perf::run_performance_tests<Kokkos::Experimental::HPX, false>(
base_file_name.str());
}
TEST_F( hpx, scatter_view)
{
TEST_F(hpx, scatter_view) {
std::cout << "ScatterView data-duplicated test:\n";
Perf::test_scatter_view<Kokkos::Experimental::HPX, Kokkos::LayoutRight,
Kokkos::Experimental::ScatterDuplicated,
Kokkos::Experimental::ScatterNonAtomic>(10, 1000 * 1000);
//std::cout << "ScatterView atomics test:\n";
//Perf::test_scatter_view<Kokkos::Experimental::HPX, Kokkos::LayoutRight,
// Kokkos::Experimental::ScatterNonDuplicated,
// Kokkos::Experimental::ScatterAtomic>(10, 1000 * 1000);
Kokkos::Experimental::ScatterDuplicated,
Kokkos::Experimental::ScatterNonAtomic>(10,
1000 * 1000);
// std::cout << "ScatterView atomics test:\n";
// Perf::test_scatter_view<Kokkos::Experimental::HPX, Kokkos::LayoutRight,
// Kokkos::Experimental::ScatterNonDuplicated,
// Kokkos::Experimental::ScatterAtomic>(10, 1000 * 1000);
}
} // namespace test
} // namespace Performance
#else
void KOKKOS_CONTAINERS_PERFORMANCE_TESTS_TESTHPX_PREVENT_EMPTY_LINK_ERROR() {}
#endif