Update Kokkos library in LAMMPS to v4.5.0
This commit is contained in:
@ -44,6 +44,12 @@
|
||||
Kokkos::CudaSpace>) \
|
||||
GTEST_SKIP() << "skipping since unified memory requires additional " \
|
||||
"fences";
|
||||
#elif defined(KOKKOS_IMPL_HIP_UNIFIED_MEMORY)
|
||||
#define GTEST_SKIP_IF_UNIFIED_MEMORY_SPACE \
|
||||
if constexpr (std::is_same_v<typename TEST_EXECSPACE::memory_space, \
|
||||
Kokkos::HIPSpace>) \
|
||||
GTEST_SKIP() << "skipping since unified memory requires additional " \
|
||||
"fences";
|
||||
#else
|
||||
#define GTEST_SKIP_IF_UNIFIED_MEMORY_SPACE
|
||||
#endif
|
||||
@ -51,8 +57,7 @@
|
||||
TEST(TEST_CATEGORY, resize_realloc_no_init_dualview) {
|
||||
using namespace Kokkos::Test::Tools;
|
||||
listen_tool_events(Config::DisableAll(), Config::EnableKernels());
|
||||
Kokkos::DualView<int*** * [1][2][3][4], TEST_EXECSPACE> bla("bla", 5, 6, 7,
|
||||
8);
|
||||
Kokkos::DualView<int**** [1][2][3][4], TEST_EXECSPACE> bla("bla", 5, 6, 7, 8);
|
||||
|
||||
auto success = validate_absence(
|
||||
[&]() {
|
||||
@ -82,8 +87,7 @@ TEST(TEST_CATEGORY, resize_realloc_no_alloc_dualview) {
|
||||
using namespace Kokkos::Test::Tools;
|
||||
listen_tool_events(Config::DisableAll(), Config::EnableKernels(),
|
||||
Config::EnableAllocs());
|
||||
Kokkos::DualView<int*** * [1][2][3][4], TEST_EXECSPACE> bla("bla", 8, 7, 6,
|
||||
5);
|
||||
Kokkos::DualView<int**** [1][2][3][4], TEST_EXECSPACE> bla("bla", 8, 7, 6, 5);
|
||||
|
||||
auto success = validate_absence(
|
||||
[&]() {
|
||||
@ -112,8 +116,7 @@ TEST(TEST_CATEGORY, resize_exec_space_dualview) {
|
||||
using namespace Kokkos::Test::Tools;
|
||||
listen_tool_events(Config::DisableAll(), Config::EnableFences(),
|
||||
Config::EnableKernels());
|
||||
Kokkos::DualView<int*** * [1][2][3][4], TEST_EXECSPACE> bla("bla", 8, 7, 6,
|
||||
5);
|
||||
Kokkos::DualView<int**** [1][2][3][4], TEST_EXECSPACE> bla("bla", 8, 7, 6, 5);
|
||||
|
||||
auto success = validate_absence(
|
||||
[&]() {
|
||||
@ -245,7 +248,7 @@ TEST(TEST_CATEGORY, realloc_exec_space_dynrankview) {
|
||||
|
||||
// FIXME_THREADS The Threads backend fences every parallel_for
|
||||
#ifdef KOKKOS_ENABLE_THREADS
|
||||
if (std::is_same<TEST_EXECSPACE, Kokkos::Threads>::value)
|
||||
if (std::is_same_v<TEST_EXECSPACE, Kokkos::Threads>)
|
||||
GTEST_SKIP() << "skipping since the Threads backend isn't asynchronous";
|
||||
#endif
|
||||
|
||||
@ -280,7 +283,7 @@ TEST(TEST_CATEGORY, resize_realloc_no_init_scatterview) {
|
||||
using namespace Kokkos::Test::Tools;
|
||||
listen_tool_events(Config::DisableAll(), Config::EnableKernels());
|
||||
Kokkos::Experimental::ScatterView<
|
||||
int*** * [1][2][3], typename TEST_EXECSPACE::array_layout, TEST_EXECSPACE>
|
||||
int**** [1][2][3], typename TEST_EXECSPACE::array_layout, TEST_EXECSPACE>
|
||||
bla("bla", 4, 5, 6, 7);
|
||||
|
||||
auto success = validate_absence(
|
||||
@ -312,7 +315,7 @@ TEST(TEST_CATEGORY, resize_realloc_no_alloc_scatterview) {
|
||||
listen_tool_events(Config::DisableAll(), Config::EnableKernels(),
|
||||
Config::EnableAllocs());
|
||||
Kokkos::Experimental::ScatterView<
|
||||
int*** * [1][2][3], typename TEST_EXECSPACE::array_layout, TEST_EXECSPACE>
|
||||
int**** [1][2][3], typename TEST_EXECSPACE::array_layout, TEST_EXECSPACE>
|
||||
bla("bla", 7, 6, 5, 4);
|
||||
|
||||
auto success = validate_absence(
|
||||
@ -343,7 +346,7 @@ TEST(TEST_CATEGORY, resize_exec_space_scatterview) {
|
||||
listen_tool_events(Config::DisableAll(), Config::EnableFences(),
|
||||
Config::EnableKernels());
|
||||
Kokkos::Experimental::ScatterView<
|
||||
int*** * [1][2][3], typename TEST_EXECSPACE::array_layout, TEST_EXECSPACE>
|
||||
int**** [1][2][3], typename TEST_EXECSPACE::array_layout, TEST_EXECSPACE>
|
||||
bla("bla", 7, 6, 5, 4);
|
||||
|
||||
auto success = validate_absence(
|
||||
@ -384,13 +387,12 @@ TEST(TEST_CATEGORY, realloc_exec_space_scatterview) {
|
||||
|
||||
// FIXME_THREADS The Threads backend fences every parallel_for
|
||||
#ifdef KOKKOS_ENABLE_THREADS
|
||||
if (std::is_same<typename TEST_EXECSPACE, Kokkos::Threads>::value)
|
||||
if (std::is_same_v<typename TEST_EXECSPACE, Kokkos::Threads>)
|
||||
GTEST_SKIP() << "skipping since the Threads backend isn't asynchronous";
|
||||
#endif
|
||||
#if defined(KOKKOS_ENABLE_HPX) && \
|
||||
!defined(KOKKOS_ENABLE_IMPL_HPX_ASYNC_DISPATCH)
|
||||
if (std::is_same<Kokkos::DefaultExecutionSpace,
|
||||
Kokkos::Experimental::HPX>::value)
|
||||
if (std::is_same_v<Kokkos::DefaultExecutionSpace, Kokkos::Experimental::HPX>)
|
||||
GTEST_SKIP() << "skipping since the HPX backend always fences with async "
|
||||
"dispatch disabled";
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user