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

Update Kokkos library in LAMMPS to v3.5.0

Browse Source
This commit is contained in:
Stan Gerald Moore
2021-11-04 12:45:59 -06:00
parent 515ef7bece
commit 564098e629
396 changed files with 21892 additions and 8508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/kokkos/core/unit_test/TestTeamScratch.hpp
View File

@ -54,15 +54,8 @@ TEST(TEST_CATEGORY, team_shared_request) {
}
TEST(TEST_CATEGORY, team_scratch_request) {
// FIXME_HIP the parallel_reduce in this test requires a team size larger than
// 256. Fixed in ROCm 3.9
#if defined(KOKKOS_ENABLE_HIP) && (HIP_VERSION < 309)
if (!std::is_same<TEST_EXECSPACE, Kokkos::Experimental::HIP>::value)
#endif
{
TestScratchTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
TestScratchTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
}
TestScratchTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
TestScratchTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
}
#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
@ -78,21 +71,14 @@ TEST(TEST_CATEGORY, scratch_align) { TestScratchAlignment<TEST_EXECSPACE>(); }
TEST(TEST_CATEGORY, shmem_size) { TestShmemSize<TEST_EXECSPACE>(); }
TEST(TEST_CATEGORY, multi_level_scratch) {
// FIXME_HIP the parallel_for and the parallel_reduce in this test requires a
// team size larger than 256. Fixed In ROCm 3.9
// FIXME_OPENMPTARGET This unit test needs ~350KB of scratch memory for L0 and
// L1 combined per team. Currently OpenMPTarget cannot allocate this high
// amount of scratch memory.
#if !defined(KOKKOS_ENABLE_OPENMPTARGET)
#if defined(KOKKOS_ENABLE_HIP) && (HIP_VERSION < 309)
if (!std::is_same<TEST_EXECSPACE, Kokkos::Experimental::HIP>::value)
#endif
{
TestMultiLevelScratchTeam<TEST_EXECSPACE,
Kokkos::Schedule<Kokkos::Static> >();
TestMultiLevelScratchTeam<TEST_EXECSPACE,
Kokkos::Schedule<Kokkos::Dynamic> >();
}
TestMultiLevelScratchTeam<TEST_EXECSPACE,
Kokkos::Schedule<Kokkos::Static> >();
TestMultiLevelScratchTeam<TEST_EXECSPACE,
Kokkos::Schedule<Kokkos::Dynamic> >();
#endif
}