Update Kokkos library in LAMMPS to v3.7.0
This commit is contained in:
@ -70,21 +70,6 @@ struct TestMDRange_ReduceArray_2D {
|
||||
const unsigned array_size)
|
||||
: input_view("input_view", N0, N1), value_count(array_size) {}
|
||||
|
||||
KOKKOS_INLINE_FUNCTION
|
||||
void init(scalar_type dst[]) const {
|
||||
for (unsigned i = 0; i < value_count; ++i) {
|
||||
dst[i] = 0.0;
|
||||
}
|
||||
}
|
||||
|
||||
KOKKOS_INLINE_FUNCTION
|
||||
void join(volatile scalar_type dst[],
|
||||
const volatile scalar_type src[]) const {
|
||||
for (unsigned i = 0; i < value_count; ++i) {
|
||||
dst[i] += src[i];
|
||||
}
|
||||
}
|
||||
|
||||
KOKKOS_INLINE_FUNCTION
|
||||
void operator()(const int i, const int j) const { input_view(i, j) = 1; }
|
||||
|
||||
@ -167,8 +152,7 @@ struct TestMDRange_ReduceArray_3D {
|
||||
}
|
||||
|
||||
KOKKOS_INLINE_FUNCTION
|
||||
void join(volatile scalar_type dst[],
|
||||
const volatile scalar_type src[]) const {
|
||||
void join(scalar_type dst[], const scalar_type src[]) const {
|
||||
for (unsigned i = 0; i < value_count; ++i) {
|
||||
dst[i] += src[i];
|
||||
}
|
||||
@ -385,7 +369,7 @@ struct TestMDRange_2D {
|
||||
parallel_reduce(
|
||||
"rank2-min-reducer", range,
|
||||
KOKKOS_LAMBDA(const int i, const int j, double &min_val) {
|
||||
min_val = Kokkos::Experimental::fmin(v_in(i, j), min_val);
|
||||
min_val = Kokkos::fmin(v_in(i, j), min_val);
|
||||
},
|
||||
reducer_scalar);
|
||||
|
||||
@ -3902,14 +3886,6 @@ struct TestMDRange_ReduceScalar {
|
||||
void operator+=(const Scalar &src) {
|
||||
for (int i = 0; i < 4; i++) v[i] += src.v[i];
|
||||
}
|
||||
KOKKOS_INLINE_FUNCTION
|
||||
void operator=(const volatile Scalar &src) volatile {
|
||||
for (int i = 0; i < 4; i++) v[i] = src.v[i];
|
||||
}
|
||||
KOKKOS_INLINE_FUNCTION
|
||||
void operator+=(const volatile Scalar &src) volatile {
|
||||
for (int i = 0; i < 4; i++) v[i] += src.v[i];
|
||||
}
|
||||
};
|
||||
|
||||
static void test_scalar_reduce(const int N0, const int N1) {
|
||||
|
||||
Reference in New Issue
Block a user