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

Fix execution space in manybody potentials

Browse Source
This commit is contained in:
Stan Moore
2017-07-21 14:28:13 -06:00
parent 1b34bec81a
commit 8ed881947f
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/KOKKOS/pair_sw_kokkos.cpp
View File

@ -572,7 +572,7 @@ void PairSWKokkos<DeviceType>::coeff(int narg, char **arg)
k_map.template modify<LMPHostType>();
k_map.template sync<DeviceType>();
d_map = k_map.d_view;
d_map = k_map.template view<DeviceType>();
}
/* ----------------------------------------------------------------------
@ -637,8 +637,8 @@ void PairSWKokkos<DeviceType>::setup_params()
k_params.template modify<LMPHostType>();
k_params.template sync<DeviceType>();
d_elem2param = k_elem2param.d_view;
d_params = k_params.d_view;
d_elem2param = k_elem2param.template view<DeviceType>();
d_params = k_params.template view<DeviceType>();
}
/* ---------------------------------------------------------------------- */

12
src/KOKKOS/pair_sw_kokkos.h
View File

@ -103,7 +103,7 @@ class PairSWKokkos : public PairSW {
typedef typename tdual_int_3d::t_host t_host_int_3d;
t_int_3d_randomread d_elem2param;
DAT::t_int_1d_randomread d_map;
typename AT::t_int_1d_randomread d_map;
typedef Kokkos::DualView<Param*,DeviceType> tdual_param_1d;
typedef typename tdual_param_1d::t_dev t_param_1d;
@ -125,12 +125,12 @@ class PairSWKokkos : public PairSW {
DAT::tdual_efloat_1d k_eatom;
DAT::tdual_virial_array k_vatom;
typename ArrayTypes<DeviceType>::t_efloat_1d d_eatom;
typename ArrayTypes<DeviceType>::t_virial_array d_vatom;
typename AT::t_efloat_1d d_eatom;
typename AT::t_virial_array d_vatom;
DAT::t_int_1d_randomread d_type2frho;
DAT::t_int_2d_randomread d_type2rhor;
DAT::t_int_2d_randomread d_type2z2r;
typename AT::t_int_1d_randomread d_type2frho;
typename AT::t_int_2d_randomread d_type2rhor;
typename AT::t_int_2d_randomread d_type2z2r;
typename AT::t_neighbors_2d d_neighbors;
typename AT::t_int_1d_randomread d_ilist;

2
src/KOKKOS/pair_tersoff_kokkos.cpp
View File

@ -76,7 +76,7 @@ void PairTersoffKokkos<DeviceType>::allocate()
k_params = Kokkos::DualView<params_ters***,Kokkos::LayoutRight,DeviceType>
("PairTersoff::paramskk",n+1,n+1,n+1);
paramskk = k_params.d_view;
paramskk = k_params.template view<DeviceType>();
}
/* ----------------------------------------------------------------------

6
src/KOKKOS/pair_vashishta_kokkos.cpp
View File

@ -573,7 +573,7 @@ void PairVashishtaKokkos<DeviceType>::coeff(int narg, char **arg)
k_map.template modify<LMPHostType>();
k_map.template sync<DeviceType>();
d_map = k_map.d_view;
d_map = k_map.template view<DeviceType>();
}
/* ----------------------------------------------------------------------
@ -638,8 +638,8 @@ void PairVashishtaKokkos<DeviceType>::setup_params()
k_params.template modify<LMPHostType>();
k_params.template sync<DeviceType>();
d_elem2param = k_elem2param.d_view;
d_params = k_params.d_view;
d_elem2param = k_elem2param.template view<DeviceType>();
d_params = k_params.template view<DeviceType>();
}
/* ---------------------------------------------------------------------- */

8
src/KOKKOS/pair_vashishta_kokkos.h
View File

@ -103,7 +103,7 @@ class PairVashishtaKokkos : public PairVashishta {
typedef typename tdual_int_3d::t_host t_host_int_3d;
t_int_3d_randomread d_elem2param;
DAT::t_int_1d_randomread d_map;
typename AT::t_int_1d_randomread d_map;
typedef Kokkos::DualView<Param*,DeviceType> tdual_param_1d;
typedef typename tdual_param_1d::t_dev t_param_1d;
@ -128,9 +128,9 @@ class PairVashishtaKokkos : public PairVashishta {
typename ArrayTypes<DeviceType>::t_efloat_1d d_eatom;
typename ArrayTypes<DeviceType>::t_virial_array d_vatom;
DAT::t_int_1d_randomread d_type2frho;
DAT::t_int_2d_randomread d_type2rhor;
DAT::t_int_2d_randomread d_type2z2r;
typename AT::t_int_1d_randomread d_type2frho;
typename AT::t_int_2d_randomread d_type2rhor;
typename AT::t_int_2d_randomread d_type2z2r;
typename AT::t_neighbors_2d d_neighbors;
typename AT::t_int_1d_randomread d_ilist;