jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1811 from brycelelbach/bug/missing_execution_space_qualifiers 

Fix mismatches in CUDA execution space qualifiers between declarations and definitions.
This commit is contained in:
Axel Kohlmeyer 2020-01-22 17:10:11 -05:00 committed by GitHub
parent 9d06430894 5488efbc03
commit 949d7608ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/KOKKOS/README
View File

@ -14,8 +14,9 @@ manual for information on building LAMMPS with external libraries.
The settings in the Makefile.lammps file in that directory must be
correct for LAMMPS to build correctly with this package installed.
This package was developed primaritly by Christian Trott (Sandia) with
This package was developed primarily by Christian Trott (Sandia) with
contributions of various styles by others, including Sikandar Mashayak
(UIUC). The underlying Kokkos library was written primarily by Carter
Edwards, Christian Trott, and Dan Sunderland (all Sandia).
(UIUC). It is now maintained by Stan Moore (Sandia). The underlying
Kokkos library was written primarily by Carter Edwards,
Christian Trott, and Dan Sunderland (all Sandia).

1
src/KOKKOS/fix_enforce2d_kokkos.cpp
View File

@ -136,6 +136,7 @@ void FixEnforce2DKokkos<DeviceType>::post_force(int vflag)
template <class DeviceType>
template <int omega_flag, int angmom_flag, int torque_flag>
KOKKOS_INLINE_FUNCTION
void FixEnforce2DKokkos<DeviceType>::post_force_item( int i ) const
{
if (mask[i] & groupbit){

2
src/KOKKOS/fix_neigh_history_kokkos.cpp
View File

@ -105,12 +105,14 @@ void FixNeighHistoryKokkos<DeviceType>::pre_exchange()
/* ---------------------------------------------------------------------- */
template <class DeviceType>
KOKKOS_INLINE_FUNCTION
void FixNeighHistoryKokkos<DeviceType>::zero_partner_count_item(const int &i) const
{
d_npartner[i] = 0;
}
template <class DeviceType>
KOKKOS_INLINE_FUNCTION
void FixNeighHistoryKokkos<DeviceType>::pre_exchange_item(const int &ii) const
{
const int i = d_ilist[ii];

3
src/KOKKOS/npair_kokkos.cpp
View File

@ -354,6 +354,7 @@ int NeighborKokkosExecute<DeviceType>::exclusion(const int &i,const int &j,
/* ---------------------------------------------------------------------- */
template<class DeviceType> template<int HalfNeigh,int Newton,int Tri>
KOKKOS_FUNCTION
void NeighborKokkosExecute<DeviceType>::
build_Item(const int &i) const
{
@ -704,6 +705,7 @@ void NeighborKokkosExecute<DeviceType>::build_ItemCuda(typename Kokkos::TeamPoli
/* ---------------------------------------------------------------------- */
template<class DeviceType> template<int HalfNeigh>
KOKKOS_FUNCTION
void NeighborKokkosExecute<DeviceType>::
build_Item_Ghost(const int &i) const
{
@ -826,6 +828,7 @@ void NeighborKokkosExecute<DeviceType>::
/* ---------------------------------------------------------------------- */
template<class DeviceType> template<int HalfNeigh,int Newton,int Tri>
KOKKOS_FUNCTION
void NeighborKokkosExecute<DeviceType>::
build_ItemSize(const int &i) const
{