Update Kokkos library in LAMMPS to v3.3.0
This commit is contained in:
@ -43,7 +43,6 @@
|
||||
*/
|
||||
|
||||
#include <Kokkos_Macros.hpp>
|
||||
#if defined(KOKKOS_ENABLE_THREADS)
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
@ -65,34 +64,13 @@
|
||||
|
||||
namespace Performance {
|
||||
|
||||
class threads : public ::testing::Test {
|
||||
protected:
|
||||
static void SetUpTestCase() {
|
||||
std::cout << std::setprecision(5) << std::scientific;
|
||||
|
||||
unsigned num_threads = 4;
|
||||
|
||||
if (Kokkos::hwloc::available()) {
|
||||
num_threads = Kokkos::hwloc::get_available_numa_count() *
|
||||
Kokkos::hwloc::get_available_cores_per_numa() *
|
||||
Kokkos::hwloc::get_available_threads_per_core();
|
||||
}
|
||||
|
||||
std::cout << "Threads: " << num_threads << std::endl;
|
||||
|
||||
Kokkos::initialize(Kokkos::InitArguments(num_threads));
|
||||
}
|
||||
|
||||
static void TearDownTestCase() { Kokkos::finalize(); }
|
||||
};
|
||||
|
||||
TEST_F(threads, dynrankview_perf) {
|
||||
TEST(threads, dynrankview_perf) {
|
||||
std::cout << "Threads" << std::endl;
|
||||
std::cout << " DynRankView vs View: Initialization Only " << std::endl;
|
||||
test_dynrankview_op_perf<Kokkos::Threads>(8192);
|
||||
}
|
||||
|
||||
TEST_F(threads, global_2_local) {
|
||||
TEST(threads, global_2_local) {
|
||||
std::cout << "Threads" << std::endl;
|
||||
std::cout << "size, create, generate, fill, find" << std::endl;
|
||||
for (unsigned i = Performance::begin_id_size; i <= Performance::end_id_size;
|
||||
@ -100,7 +78,7 @@ TEST_F(threads, global_2_local) {
|
||||
test_global_to_local_ids<Kokkos::Threads>(i);
|
||||
}
|
||||
|
||||
TEST_F(threads, unordered_map_performance_near) {
|
||||
TEST(threads, unordered_map_performance_near) {
|
||||
unsigned num_threads = 4;
|
||||
if (Kokkos::hwloc::available()) {
|
||||
num_threads = Kokkos::hwloc::get_available_numa_count() *
|
||||
@ -112,7 +90,7 @@ TEST_F(threads, unordered_map_performance_near) {
|
||||
Perf::run_performance_tests<Kokkos::Threads, true>(base_file_name.str());
|
||||
}
|
||||
|
||||
TEST_F(threads, unordered_map_performance_far) {
|
||||
TEST(threads, unordered_map_performance_far) {
|
||||
unsigned num_threads = 4;
|
||||
if (Kokkos::hwloc::available()) {
|
||||
num_threads = Kokkos::hwloc::get_available_numa_count() *
|
||||
@ -125,8 +103,3 @@ TEST_F(threads, unordered_map_performance_far) {
|
||||
}
|
||||
|
||||
} // namespace Performance
|
||||
|
||||
#else
|
||||
void KOKKOS_CONTAINERS_PERFORMANCE_TESTS_TESTTHREADS_PREVENT_EMPTY_LINK_ERROR() {
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user