Update Kokkos library in LAMMPS to v4.1.0
This commit is contained in:
@ -21,13 +21,16 @@
|
||||
// unimplemented reduction features
|
||||
namespace {
|
||||
|
||||
// FIXME_NVHPC 23.3 errors out when using enums here
|
||||
// NVC++-F-0000-Internal compiler error. process_acc_put_dinit: unexpected
|
||||
// datatype 5339
|
||||
#ifndef KOKKOS_COMPILER_NVHPC
|
||||
enum MyErrorCode {
|
||||
no_error = 0b000,
|
||||
error_operator_plus_equal = 0b001,
|
||||
error_operator_plus_equal_volatile = 0b010,
|
||||
error_join_volatile = 0b100,
|
||||
expected_join_volatile = 0b1000
|
||||
|
||||
};
|
||||
|
||||
KOKKOS_FUNCTION constexpr MyErrorCode operator|(MyErrorCode lhs,
|
||||
@ -36,6 +39,17 @@ KOKKOS_FUNCTION constexpr MyErrorCode operator|(MyErrorCode lhs,
|
||||
static_cast<int>(rhs));
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
using MyErrorCode = unsigned;
|
||||
constexpr MyErrorCode no_error = 0b000;
|
||||
constexpr MyErrorCode error_operator_plus_equal = 0b001;
|
||||
constexpr MyErrorCode error_operator_plus_equal_volatile = 0b010;
|
||||
constexpr MyErrorCode error_join_volatile = 0b100;
|
||||
constexpr MyErrorCode expected_join_volatile = 0b1000;
|
||||
|
||||
#endif
|
||||
|
||||
static_assert((no_error | error_operator_plus_equal_volatile) ==
|
||||
error_operator_plus_equal_volatile,
|
||||
"");
|
||||
@ -130,8 +144,9 @@ void test_join_backward_compatibility() {
|
||||
}
|
||||
|
||||
TEST(TEST_CATEGORY, join_backward_compatibility) {
|
||||
#if defined(KOKKOS_ENABLE_CUDA) && \
|
||||
defined(KOKKOS_COMPILER_NVHPC) // FIXME_NVHPC
|
||||
#if defined(KOKKOS_ENABLE_CUDA) && defined(KOKKOS_COMPILER_NVHPC) && \
|
||||
KOKKOS_COMPILER_NVHPC < \
|
||||
230300 // FIXME_NVHPC test passes with workaround in 23.3
|
||||
GTEST_SKIP() << "FIXME wrong result";
|
||||
#endif
|
||||
test_join_backward_compatibility();
|
||||
|
||||
Reference in New Issue
Block a user