Attempt to fix compilation issue with kokkos_omp. (13efc1b7) · Commits · 郑智淋 / lammps

src/KOKKOS/fix_neigh_history_kokkos.cpp

+0 −14

Original line number	Diff line number	Diff line
		@@ -181,20 +181,6 @@ void FixNeighHistoryKokkos<DeviceType>::post_neighbor()
		Kokkos::parallel_for(inum,f);

		copymode = 0;

		#ifdef LMP_KOKKOS_DEBUG
		typename ArrayTypes<LMPHostType>::t_neighbors_2d h_neighbors("neighbor_history:h_neighbor",k_list->d_neighbors.extent(0), k_list->d_neighbors.extent(1));
		deep_copy(h_neighbors, d_neighbors);

		typename ArrayTypes<LMPHostType>::t_int_1d h_numneigh("neighbor_history:h_numneigh",k_list->d_numneigh.extent(0));
		deep_copy(h_numneigh, d_numneigh);

		typename ArrayTypes<LMPHostType>::t_int_2d h_firstflag("neighbor_history:h_firstflag",maxatom,k_list->maxneighs);
		deep_copy(h_firstflag, d_firstflag);

		typename ArrayTypes<LMPHostType>::t_float_2d h_firstvalue("neighbor_history:h_firstvalue",maxatom,k_list->maxneighs*dnum);
		deep_copy(h_firstvalue, d_firstvalue);
		#endif
		}

		/* ---------------------------------------------------------------------- */

+2 −2

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@ class FixNeighHistoryKokkos : public FixNeighHistory {

		private:
		typename ArrayTypes<DeviceType>::tdual_int_1d k_npartner;
		typename ArrayTypes<DeviceType>::tdual_int_2d k_partner;
		typename ArrayTypes<DeviceType>::tdual_tagint_2d k_partner;
		typename ArrayTypes<DeviceType>::tdual_float_2d k_valuepartner;

		// for neighbor list lookup
		@@ -64,7 +64,7 @@ class FixNeighHistoryKokkos : public FixNeighHistory {

		typename ArrayTypes<DeviceType>::t_tagint_1d tag;
		typename ArrayTypes<DeviceType>::t_int_1d d_npartner;
		typename ArrayTypes<DeviceType>::t_int_2d d_partner;
		typename ArrayTypes<DeviceType>::t_tagint_2d d_partner;
		typename ArrayTypes<DeviceType>::t_float_2d d_valuepartner;

		typename ArrayTypes<DeviceType>::t_int_scalar d_resize;