Fixing some Kokkos issues (f314fbc9) · Commits · 郑智淋 / lammps

src/KOKKOS/pair_coul_cut_kokkos.h

+4 −5

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ namespace LAMMPS_NS {
		template<class DeviceType>
		class PairCoulCutKokkos : public PairCoulCut {
		public:
		enum {EnabledNeighFlags=FULL&HALFTHREAD&HALF};
		enum {EnabledNeighFlags=FULL\|HALFTHREAD\|HALF};
		enum {COUL_FLAG=1};
		typedef DeviceType device_type;
		PairCoulCutKokkos(class LAMMPS *);
		@@ -114,13 +114,12 @@ class PairCoulCutKokkos : public PairCoulCut {
		friend class PairComputeFunctor<PairCoulCutKokkos,FULL,true>;
		friend class PairComputeFunctor<PairCoulCutKokkos,HALF,true>;
		friend class PairComputeFunctor<PairCoulCutKokkos,HALFTHREAD,true>;
		friend class PairComputeFunctor<PairCoulCutKokkos,N2,true>;
		friend class PairComputeFunctor<PairCoulCutKokkos,FULLCLUSTER,true >;
		friend class PairComputeFunctor<PairCoulCutKokkos,FULL,false>;
		friend class PairComputeFunctor<PairCoulCutKokkos,HALF,false>;
		friend class PairComputeFunctor<PairCoulCutKokkos,HALFTHREAD,false>;
		friend class PairComputeFunctor<PairCoulCutKokkos,N2,false>;
		friend class PairComputeFunctor<PairCoulCutKokkos,FULLCLUSTER,false >;
		friend EV_FLOAT pair_compute_neighlist<PairCoulCutKokkos,FULL,void>(PairCoulCutKokkos,NeighListKokkos<DeviceType>);
		friend EV_FLOAT pair_compute_neighlist<PairCoulCutKokkos,HALF,void>(PairCoulCutKokkos,NeighListKokkos<DeviceType>);
		friend EV_FLOAT pair_compute_neighlist<PairCoulCutKokkos,HALFTHREAD,void>(PairCoulCutKokkos,NeighListKokkos<DeviceType>);
		friend EV_FLOAT pair_compute<PairCoulCutKokkos,void>(PairCoulCutKokkos*,
		NeighListKokkos<DeviceType>*);
		friend void pair_virial_fdotr_compute<PairCoulCutKokkos>(PairCoulCutKokkos*);

src/KOKKOS/pair_coul_dsf_kokkos.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ struct TagPairCoulDSFKernelA{};
		template<class DeviceType>
		class PairCoulDSFKokkos : public PairCoulDSF {
		public:
		enum {EnabledNeighFlags=FULL&HALFTHREAD&HALF};
		enum {EnabledNeighFlags=FULL\|HALFTHREAD\|HALF};
		enum {COUL_FLAG=1};
		typedef DeviceType device_type;
		typedef EV_FLOAT value_type;

src/KOKKOS/pair_coul_wolf_kokkos.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ struct TagPairCoulWolfKernelA{};
		template<class DeviceType>
		class PairCoulWolfKokkos : public PairCoulWolf {
		public:
		enum {EnabledNeighFlags=FULL&HALFTHREAD&HALF};
		enum {EnabledNeighFlags=FULL\|HALFTHREAD\|HALF};
		enum {COUL_FLAG=1};
		typedef DeviceType device_type;
		typedef EV_FLOAT value_type;

src/KOKKOS/pair_table_kokkos.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ template<class DeviceType>
		class PairTableKokkos : public Pair {
		public:

		enum {EnabledNeighFlags=FULL&HALFTHREAD&HALF&N2&FULLCLUSTER};
		enum {EnabledNeighFlags=FULL\|HALFTHREAD\|HALF\|N2\|FULLCLUSTER};
		enum {COUL_FLAG=0};
		typedef DeviceType device_type;

Admin message