Change Kokkos::Impl to std namespace (e298978d) · Commits · 郑智淋 / lammps

src/KOKKOS/atom_kokkos.h

+8 −8

Original line number	Diff line number	Diff line
		@@ -83,32 +83,32 @@ class SortFunctor {
		ViewType source;
		Kokkos::View<typename ViewType::non_const_data_type,typename ViewType::array_type,device_type> dest;
		IndexView index;
		SortFunctor(ViewType src, typename Kokkos::Impl::enable_if<ViewType::dynamic_rank==1,IndexView>::type ind):source(src),index(ind){
		SortFunctor(ViewType src, typename std::enable_if<ViewType::dynamic_rank==1,IndexView>::type ind):source(src),index(ind){
		dest = Kokkos::View<typename ViewType::non_const_data_type,typename ViewType::array_type,device_type>("",src.extent(0));
		}
		SortFunctor(ViewType src, typename Kokkos::Impl::enable_if<ViewType::dynamic_rank==2,IndexView>::type ind):source(src),index(ind){
		SortFunctor(ViewType src, typename std::enable_if<ViewType::dynamic_rank==2,IndexView>::type ind):source(src),index(ind){
		dest = Kokkos::View<typename ViewType::non_const_data_type,typename ViewType::array_type,device_type>("",src.extent(0),src.extent(1));
		}
		SortFunctor(ViewType src, typename Kokkos::Impl::enable_if<ViewType::dynamic_rank==3,IndexView>::type ind):source(src),index(ind){
		SortFunctor(ViewType src, typename std::enable_if<ViewType::dynamic_rank==3,IndexView>::type ind):source(src),index(ind){
		dest = Kokkos::View<typename ViewType::non_const_data_type,typename ViewType::array_type,device_type>("",src.extent(0),src.extent(1),src.extent(2));
		}
		SortFunctor(ViewType src, typename Kokkos::Impl::enable_if<ViewType::dynamic_rank==4,IndexView>::type ind):source(src),index(ind){
		SortFunctor(ViewType src, typename std::enable_if<ViewType::dynamic_rank==4,IndexView>::type ind):source(src),index(ind){
		dest = Kokkos::View<typename ViewType::non_const_data_type,typename ViewType::array_type,device_type>("",src.extent(0),src.extent(1),src.extent(2),src.extent(3));
		}
		KOKKOS_INLINE_FUNCTION
		void operator()(const typename Kokkos::Impl::enable_if<ViewType::rank==1, int>::type& i) {
		void operator()(const typename std::enable_if<ViewType::rank==1, int>::type& i) {
		dest(i) = source(index(i));
		}
		void operator()(const typename Kokkos::Impl::enable_if<ViewType::rank==2, int>::type& i) {
		void operator()(const typename std::enable_if<ViewType::rank==2, int>::type& i) {
		for(int j=0;j<source.extent(1);j++)
		dest(i,j) = source(index(i),j);
		}
		void operator()(const typename Kokkos::Impl::enable_if<ViewType::rank==3, int>::type& i) {
		void operator()(const typename std::enable_if<ViewType::rank==3, int>::type& i) {
		for(int j=0;j<source.extent(1);j++)
		for(int k=0;k<source.extent(2);k++)
		dest(i,j,k) = source(index(i),j,k);
		}
		void operator()(const typename Kokkos::Impl::enable_if<ViewType::rank==4, int>::type& i) {
		void operator()(const typename std::enable_if<ViewType::rank==4, int>::type& i) {
		for(int j=0;j<source.extent(1);j++)
		for(int k=0;k<source.extent(2);k++)
		for(int l=0;l<source.extent(3);l++)

src/KOKKOS/fix_qeq_reax_kokkos.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -91,10 +91,10 @@ void FixQEqReaxKokkos<DeviceType>::init()
		int irequest = neighbor->nrequest - 1;

		neighbor->requests[irequest]->
		kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
		!Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
		kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
		!std::is_same<DeviceType,LMPDeviceType>::value;
		neighbor->requests[irequest]->
		kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
		kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;

		if (neighflag == FULL) {
		neighbor->requests[irequest]->fix = 1;

src/KOKKOS/fix_rx_kokkos.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -146,10 +146,10 @@ void FixRxKokkos<DeviceType>::init()
		int neighflag = lmp->kokkos->neighflag;

		neighbor->requests[irequest]->
		kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
		!Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
		kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
		!std::is_same<DeviceType,LMPDeviceType>::value;
		neighbor->requests[irequest]->
		kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
		kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;

		if (neighflag == FULL) {
		neighbor->requests[irequest]->full = 1;

src/KOKKOS/fix_shardlow_kokkos.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -132,10 +132,10 @@ void FixShardlowKokkos<DeviceType>::init()
		int irequest = neighbor->nrequest - 1;

		neighbor->requests[irequest]->
		kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
		!Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
		kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
		!std::is_same<DeviceType,LMPDeviceType>::value;
		neighbor->requests[irequest]->
		kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
		kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;

		// neighbor->requests[irequest]->pair = 0;
		// neighbor->requests[irequest]->fix = 1;

src/KOKKOS/pair_buck_coul_cut_kokkos.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -296,10 +296,10 @@ void PairBuckCoulCutKokkos<DeviceType>::init_style()
		int irequest = neighbor->nrequest - 1;

		neighbor->requests[irequest]->
		kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
		!Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
		kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
		!std::is_same<DeviceType,LMPDeviceType>::value;
		neighbor->requests[irequest]->
		kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
		kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;

		if (neighflag == FULL) {
		neighbor->requests[irequest]->full = 1;

Admin message