Commit b90c372a authored by Bryce Adelstein Lelbach aka wash's avatar Bryce Adelstein Lelbach aka wash
Browse files

Fix mismatches in CUDA execution space qualifiers between declarations and 

definitions.

Add missing `KOKKOS_INLINE_FUNCTION` to the definition of:
- `FixEnforce2DKokkos::post_force_item`
- `FixNeighHistoryKokkos::zero_partner_count_item`
- `FixNeighHistoryKokkos::pre_exchange_item`

Add missing `KOKKOS_FUNCTION` to the definition of:
- `NeighborKokkosExecute::build_Item`
- `NeighborKokkosExecute::build_Item_Ghost`
- `NeighborKokkosExecute::build_ItemSize`
parent 6c3161cb

src/KOKKOS/fix_enforce2d_kokkos.cpp

+1 −0
Original line number Diff line number Diff line
@@ -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){

src/KOKKOS/fix_neigh_history_kokkos.cpp

+2 −0
Original line number Diff line number Diff line
@@ -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];

src/KOKKOS/npair_kokkos.cpp

+3 −0
Original line number Diff line number Diff line
@@ -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

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE