Update Kokkos library in LAMMPS to v3.7.0
This commit is contained in:
@ -43,8 +43,6 @@
|
||||
*/
|
||||
|
||||
#include <TestStdAlgorithmsCommon.hpp>
|
||||
#include <std_algorithms/Kokkos_BeginEnd.hpp>
|
||||
#include <std_algorithms/Kokkos_PartitioningOperations.hpp>
|
||||
#include <utility>
|
||||
#include <algorithm>
|
||||
|
||||
@ -160,12 +158,12 @@ void verify_data(const std::string& name, ResultType my_result,
|
||||
const std::size_t my_diff_true = my_result.first - KE::begin(view_dest_true);
|
||||
const std::size_t my_diff_false =
|
||||
my_result.second - KE::begin(view_dest_false);
|
||||
EXPECT_TRUE(std_diff_true == my_diff_true);
|
||||
EXPECT_TRUE(std_diff_false == my_diff_false);
|
||||
EXPECT_EQ(std_diff_true, my_diff_true);
|
||||
EXPECT_EQ(std_diff_false, my_diff_false);
|
||||
|
||||
auto view_dest_true_h = create_host_space_copy(view_dest_true);
|
||||
for (std::size_t i = 0; i < std_diff_true; ++i) {
|
||||
EXPECT_TRUE(std_vec_true[i] == view_dest_true_h(i));
|
||||
EXPECT_EQ(std_vec_true[i], view_dest_true_h(i));
|
||||
// std::cout << "i= " << i << " "
|
||||
// << " std_true = " << std_vec_true[i] << " "
|
||||
// << " mine = " << view_dest_true_h(i) << '\n';
|
||||
@ -173,45 +171,45 @@ void verify_data(const std::string& name, ResultType my_result,
|
||||
|
||||
auto view_dest_false_h = create_host_space_copy(view_dest_false);
|
||||
for (std::size_t i = 0; i < std_diff_false; ++i) {
|
||||
EXPECT_TRUE(std_vec_false[i] == view_dest_false_h(i));
|
||||
EXPECT_EQ(std_vec_false[i], view_dest_false_h(i));
|
||||
// std::cout << "i= " << i << " "
|
||||
// << " std_false = " << std_vec_false[i] << " "
|
||||
// << " mine = " << view_dest_false_h(i) << '\n';
|
||||
}
|
||||
|
||||
if (name == "empty") {
|
||||
EXPECT_TRUE(my_diff_true == 0);
|
||||
EXPECT_TRUE(my_diff_false == 0);
|
||||
EXPECT_EQ(my_diff_true, 0u);
|
||||
EXPECT_EQ(my_diff_false, 0u);
|
||||
}
|
||||
|
||||
else if (name == "one-element-a") {
|
||||
EXPECT_TRUE(my_diff_true == 0);
|
||||
EXPECT_TRUE(my_diff_false == 1);
|
||||
EXPECT_EQ(my_diff_true, 0u);
|
||||
EXPECT_EQ(my_diff_false, 1u);
|
||||
}
|
||||
|
||||
else if (name == "one-element-b") {
|
||||
EXPECT_TRUE(my_diff_true == 1);
|
||||
EXPECT_TRUE(my_diff_false == 0);
|
||||
EXPECT_EQ(my_diff_true, 1u);
|
||||
EXPECT_EQ(my_diff_false, 0u);
|
||||
}
|
||||
|
||||
else if (name == "two-elements-a") {
|
||||
EXPECT_TRUE(my_diff_true == 1);
|
||||
EXPECT_TRUE(my_diff_false == 1);
|
||||
EXPECT_EQ(my_diff_true, 1u);
|
||||
EXPECT_EQ(my_diff_false, 1u);
|
||||
}
|
||||
|
||||
else if (name == "two-elements-b") {
|
||||
EXPECT_TRUE(my_diff_true == 1);
|
||||
EXPECT_TRUE(my_diff_false == 1);
|
||||
EXPECT_EQ(my_diff_true, 1u);
|
||||
EXPECT_EQ(my_diff_false, 1u);
|
||||
}
|
||||
|
||||
else if (name == "small-b") {
|
||||
EXPECT_TRUE(my_diff_true == 13);
|
||||
EXPECT_TRUE(my_diff_false == 0);
|
||||
EXPECT_EQ(my_diff_true, 13u);
|
||||
EXPECT_EQ(my_diff_false, 0u);
|
||||
}
|
||||
|
||||
else if (name == "small-c") {
|
||||
EXPECT_TRUE(my_diff_true == 0);
|
||||
EXPECT_TRUE(my_diff_false == 15);
|
||||
EXPECT_EQ(my_diff_true, 0u);
|
||||
EXPECT_EQ(my_diff_false, 15u);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user