Merge branch 'reduce-kokkos-compiler-warnings' of github.com:akohlmey/lammps... (c513b60f) · Commits · 郑智淋 / lammps

src/KOKKOS/atom_kokkos.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ class AtomKokkos : public Atom {
		};

		template<class ViewType, class IndexView>
		class SortFunctor {
		struct SortFunctor {
		typedef typename ViewType::device_type device_type;
		ViewType source;
		Kokkos::View<typename ViewType::non_const_data_type,typename ViewType::array_type,device_type> dest;

src/KOKKOS/fix_dpd_energy_kokkos.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ FixStyle(dpd/energy/kk/host,FixDPDenergyKokkos<LMPHostType>)

		namespace LAMMPS_NS {

		template <typename DeviceType>
		template <class DeviceType>
		class FixDPDenergyKokkos : public FixDPDenergy {
		public:
		FixDPDenergyKokkos(class LAMMPS , int, char *);

src/KOKKOS/fix_enforce2d_kokkos.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -56,8 +56,7 @@ class FixEnforce2DKokkos : public FixEnforce2D {


		template <class DeviceType, int omega_flag, int angmom_flag, int torque_flag>
		class FixEnforce2DKokkosPostForceFunctor {
		public:
		struct FixEnforce2DKokkosPostForceFunctor {
		typedef DeviceType device_type;
		FixEnforce2DKokkos<DeviceType> c;

src/KOKKOS/fix_langevin_kokkos.h

+12 −17

Original line number	Diff line number	Diff line
		@@ -57,15 +57,15 @@ namespace LAMMPS_NS {
		class FixLangevinKokkos;

		template <class DeviceType>
		class FixLangevinKokkosInitialIntegrateFunctor;
		struct FixLangevinKokkosInitialIntegrateFunctor;

		template<class DeviceType,int Tp_TSTYLEATOM, int Tp_GJF, int Tp_TALLY,
		int Tp_BIAS, int Tp_RMASS, int Tp_ZERO>
		class FixLangevinKokkosPostForceFunctor;
		struct FixLangevinKokkosPostForceFunctor;

		template<class DeviceType> class FixLangevinKokkosZeroForceFunctor;
		template<class DeviceType> struct FixLangevinKokkosZeroForceFunctor;

		template<class DeviceType> class FixLangevinKokkosTallyEnergyFunctor;
		template<class DeviceType> struct FixLangevinKokkosTallyEnergyFunctor;

		template<class DeviceType>
		class FixLangevinKokkos : public FixLangevin {
		@@ -152,8 +152,7 @@ namespace LAMMPS_NS {
		};

		template <class DeviceType>
		class FixLangevinKokkosInitialIntegrateFunctor {
		public:
		struct FixLangevinKokkosInitialIntegrateFunctor {
		typedef DeviceType device_type ;
		FixLangevinKokkos<DeviceType> c;

		@@ -169,8 +168,7 @@ namespace LAMMPS_NS {

		template <class DeviceType,int Tp_TSTYLEATOM, int Tp_GJF, int Tp_TALLY,
		int Tp_BIAS, int Tp_RMASS, int Tp_ZERO>
		class FixLangevinKokkosPostForceFunctor {
		public:
		struct FixLangevinKokkosPostForceFunctor {
		typedef DeviceType device_type;
		typedef FSUM value_type;
		FixLangevinKokkos<DeviceType> c;
		@@ -209,8 +207,7 @@ namespace LAMMPS_NS {
		};

		template <class DeviceType>
		class FixLangevinKokkosZeroForceFunctor {
		public:
		struct FixLangevinKokkosZeroForceFunctor {
		typedef DeviceType device_type ;
		FixLangevinKokkos<DeviceType> c;

		@@ -224,8 +221,7 @@ namespace LAMMPS_NS {
		};

		template<class DeviceType>
		class FixLangevinKokkosTallyEnergyFunctor {
		public:
		struct FixLangevinKokkosTallyEnergyFunctor {
		typedef DeviceType device_type ;
		FixLangevinKokkos<DeviceType> c;
		typedef double value_type;
		@@ -248,8 +244,7 @@ namespace LAMMPS_NS {
		};

		template <class DeviceType, int RMass>
		class FixLangevinKokkosEndOfStepFunctor {
		public:
		struct FixLangevinKokkosEndOfStepFunctor {
		typedef DeviceType device_type ;
		FixLangevinKokkos<DeviceType> c;

src/KOKKOS/fix_nve_kokkos.h

+5 −6

Original line number	Diff line number	Diff line
		@@ -31,9 +31,10 @@ template<class DeviceType>
		class FixNVEKokkos;

		template <class DeviceType, int RMass>
		class FixNVEKokkosInitialIntegrateFunctor;
		struct FixNVEKokkosInitialIntegrateFunctor;

		template <class DeviceType, int RMass>
		class FixNVEKokkosFinalIntegrateFunctor;
		struct FixNVEKokkosFinalIntegrateFunctor;

		template<class DeviceType>
		class FixNVEKokkos : public FixNVE {
		@@ -67,8 +68,7 @@ class FixNVEKokkos : public FixNVE {
		};

		template <class DeviceType, int RMass>
		class FixNVEKokkosInitialIntegrateFunctor {
		public:
		struct FixNVEKokkosInitialIntegrateFunctor {
		typedef DeviceType device_type ;
		FixNVEKokkos<DeviceType> c;

		@@ -82,8 +82,7 @@ class FixNVEKokkosInitialIntegrateFunctor {
		};

		template <class DeviceType, int RMass>
		class FixNVEKokkosFinalIntegrateFunctor {
		public:
		struct FixNVEKokkosFinalIntegrateFunctor {
		typedef DeviceType device_type ;
		FixNVEKokkos<DeviceType> c;

Admin message