Update Kokkos library in LAMMPS to v4.1.0
This commit is contained in:
@ -726,9 +726,9 @@ void test_scatter_view(int64_t n) {
|
||||
}
|
||||
#endif
|
||||
// with hundreds of threads we were running out of memory.
|
||||
// limit (n) so that duplication doesn't exceed 4GB
|
||||
// limit (n) so that duplication doesn't exceed 1GB
|
||||
constexpr std::size_t maximum_allowed_total_bytes =
|
||||
4ull * 1024ull * 1024ull * 1024ull;
|
||||
1ull * 1024ull * 1024ull * 1024ull;
|
||||
std::size_t const maximum_allowed_copy_bytes =
|
||||
maximum_allowed_total_bytes /
|
||||
std::size_t(execution_space().concurrency());
|
||||
@ -770,9 +770,18 @@ TEST(TEST_CATEGORY, scatterview) {
|
||||
int big_n = 100 * 1000;
|
||||
#else
|
||||
|
||||
#ifdef KOKKOS_ENABLE_SERIAL
|
||||
#if defined(KOKKOS_ENABLE_SERIAL) || defined(KOKKOS_ENABLE_OPENMP)
|
||||
#if defined(KOKKOS_ENABLE_SERIAL)
|
||||
bool is_serial = std::is_same<TEST_EXECSPACE, Kokkos::Serial>::value;
|
||||
int big_n = is_serial ? 100 * 1000 : 10000 * 1000;
|
||||
#else
|
||||
bool is_serial = false;
|
||||
#endif
|
||||
#if defined(KOKKOS_ENABLE_OPENMP)
|
||||
bool is_openmp = std::is_same<TEST_EXECSPACE, Kokkos::OpenMP>::value;
|
||||
#else
|
||||
bool is_openmp = false;
|
||||
#endif
|
||||
int big_n = is_serial || is_openmp ? 100 * 1000 : 10000 * 1000;
|
||||
#else
|
||||
int big_n = 10000 * 1000;
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user