Update Kokkos library in LAMMPS to v3.2
This commit is contained in:
@ -58,7 +58,7 @@ namespace Performance {
|
||||
// View functor
|
||||
template <typename DeviceType>
|
||||
struct InitViewFunctor {
|
||||
typedef Kokkos::View<double ***, DeviceType> inviewtype;
|
||||
using inviewtype = Kokkos::View<double ***, DeviceType>;
|
||||
inviewtype _inview;
|
||||
|
||||
InitViewFunctor(inviewtype &inview_) : _inview(inview_) {}
|
||||
@ -73,10 +73,10 @@ struct InitViewFunctor {
|
||||
}
|
||||
|
||||
struct SumComputationTest {
|
||||
typedef Kokkos::View<double ***, DeviceType> inviewtype;
|
||||
using inviewtype = Kokkos::View<double ***, DeviceType>;
|
||||
inviewtype _inview;
|
||||
|
||||
typedef Kokkos::View<double *, DeviceType> outviewtype;
|
||||
using outviewtype = Kokkos::View<double *, DeviceType>;
|
||||
outviewtype _outview;
|
||||
|
||||
KOKKOS_INLINE_FUNCTION
|
||||
@ -96,7 +96,7 @@ struct InitViewFunctor {
|
||||
|
||||
template <typename DeviceType>
|
||||
struct InitStrideViewFunctor {
|
||||
typedef Kokkos::View<double ***, Kokkos::LayoutStride, DeviceType> inviewtype;
|
||||
using inviewtype = Kokkos::View<double ***, Kokkos::LayoutStride, DeviceType>;
|
||||
inviewtype _inview;
|
||||
|
||||
InitStrideViewFunctor(inviewtype &inview_) : _inview(inview_) {}
|
||||
@ -113,7 +113,7 @@ struct InitStrideViewFunctor {
|
||||
|
||||
template <typename DeviceType>
|
||||
struct InitViewRank7Functor {
|
||||
typedef Kokkos::View<double *******, DeviceType> inviewtype;
|
||||
using inviewtype = Kokkos::View<double *******, DeviceType>;
|
||||
inviewtype _inview;
|
||||
|
||||
InitViewRank7Functor(inviewtype &inview_) : _inview(inview_) {}
|
||||
@ -131,7 +131,7 @@ struct InitViewRank7Functor {
|
||||
// DynRankView functor
|
||||
template <typename DeviceType>
|
||||
struct InitDynRankViewFunctor {
|
||||
typedef Kokkos::DynRankView<double, DeviceType> inviewtype;
|
||||
using inviewtype = Kokkos::DynRankView<double, DeviceType>;
|
||||
inviewtype _inview;
|
||||
|
||||
InitDynRankViewFunctor(inviewtype &inview_) : _inview(inview_) {}
|
||||
@ -146,10 +146,10 @@ struct InitDynRankViewFunctor {
|
||||
}
|
||||
|
||||
struct SumComputationTest {
|
||||
typedef Kokkos::DynRankView<double, DeviceType> inviewtype;
|
||||
using inviewtype = Kokkos::DynRankView<double, DeviceType>;
|
||||
inviewtype _inview;
|
||||
|
||||
typedef Kokkos::DynRankView<double, DeviceType> outviewtype;
|
||||
using outviewtype = Kokkos::DynRankView<double, DeviceType>;
|
||||
outviewtype _outview;
|
||||
|
||||
KOKKOS_INLINE_FUNCTION
|
||||
@ -169,8 +169,8 @@ struct InitDynRankViewFunctor {
|
||||
|
||||
template <typename DeviceType>
|
||||
void test_dynrankview_op_perf(const int par_size) {
|
||||
typedef DeviceType execution_space;
|
||||
typedef typename execution_space::size_type size_type;
|
||||
using execution_space = DeviceType;
|
||||
using size_type = typename execution_space::size_type;
|
||||
const size_type dim_2 = 90;
|
||||
const size_type dim_3 = 30;
|
||||
|
||||
@ -184,7 +184,7 @@ void test_dynrankview_op_perf(const int par_size) {
|
||||
{
|
||||
Kokkos::View<double ***, DeviceType> testview("testview", par_size, dim_2,
|
||||
dim_3);
|
||||
typedef InitViewFunctor<DeviceType> FunctorType;
|
||||
using FunctorType = InitViewFunctor<DeviceType>;
|
||||
|
||||
timer.reset();
|
||||
Kokkos::RangePolicy<DeviceType> policy(0, par_size);
|
||||
@ -204,7 +204,7 @@ void test_dynrankview_op_perf(const int par_size) {
|
||||
|
||||
Kokkos::View<double ***, Kokkos::LayoutStride, DeviceType> teststrideview =
|
||||
Kokkos::subview(testview, Kokkos::ALL, Kokkos::ALL, Kokkos::ALL);
|
||||
typedef InitStrideViewFunctor<DeviceType> FunctorStrideType;
|
||||
using FunctorStrideType = InitStrideViewFunctor<DeviceType>;
|
||||
|
||||
timer.reset();
|
||||
Kokkos::parallel_for(policy, FunctorStrideType(teststrideview));
|
||||
@ -216,7 +216,7 @@ void test_dynrankview_op_perf(const int par_size) {
|
||||
{
|
||||
Kokkos::View<double *******, DeviceType> testview("testview", par_size,
|
||||
dim_2, dim_3, 1, 1, 1, 1);
|
||||
typedef InitViewRank7Functor<DeviceType> FunctorType;
|
||||
using FunctorType = InitViewRank7Functor<DeviceType>;
|
||||
|
||||
timer.reset();
|
||||
Kokkos::RangePolicy<DeviceType> policy(0, par_size);
|
||||
@ -229,7 +229,7 @@ void test_dynrankview_op_perf(const int par_size) {
|
||||
{
|
||||
Kokkos::DynRankView<double, DeviceType> testdrview("testdrview", par_size,
|
||||
dim_2, dim_3);
|
||||
typedef InitDynRankViewFunctor<DeviceType> FunctorType;
|
||||
using FunctorType = InitDynRankViewFunctor<DeviceType>;
|
||||
|
||||
timer.reset();
|
||||
Kokkos::RangePolicy<DeviceType> policy(0, par_size);
|
||||
|
||||
Reference in New Issue
Block a user