consistently use Kokkos:: namespace prefix when calling deep_copy()

This commit is contained in:
Axel Kohlmeyer
2023-01-08 11:07:47 -05:00
parent caa7940b34
commit 4ab1ce5d7d
6 changed files with 22 additions and 22 deletions

View File

@ -1238,7 +1238,7 @@ int FixACKS2ReaxFFKokkos<DeviceType>::bicgstab_solve()
rnorm = sqrt(norm_sqr);
if (bnorm == 0.0 ) bnorm = 1.0;
deep_copy(d_r_hat,d_r);
Kokkos::deep_copy(d_r_hat,d_r);
omega = 1.0;
rho = 1.0;

View File

@ -97,12 +97,12 @@ void FixNeighHistoryKokkos<DeviceType>::pre_exchange()
Kokkos::parallel_for(nlocal_neigh,zero);
h_resize() = 0;
deep_copy(d_resize, h_resize);
Kokkos::deep_copy(d_resize, h_resize);
FixNeighHistoryKokkosPreExchangeFunctor<DeviceType> f(this);
Kokkos::parallel_for(nlocal_neigh,f);
deep_copy(h_resize, d_resize);
Kokkos::deep_copy(h_resize, d_resize);
if (h_resize() > 0) {
maxpartner += 8;
memoryKK->grow_kokkos(k_partner,partner,atom->nmax,maxpartner,"neighbor_history:partner");

View File

@ -596,7 +596,7 @@ void FixShardlowKokkos<DeviceType>::initial_integrate(int /*vflag*/)
for (int i = 0; i < maxWorkItemCt; ++i) {
es_genNextParallelState(serial_rand_state, h_rand_state(i));
}
deep_copy(d_rand_state,h_rand_state);
Kokkos::deep_copy(d_rand_state,h_rand_state);
maxRNG = maxWorkItemCt;
}
@ -606,8 +606,8 @@ void FixShardlowKokkos<DeviceType>::initial_integrate(int /*vflag*/)
for (int j = 0; j < 3; ++j)
h_counters(i,j) = 0;
for (int i = 0; i < 32; ++i) h_hist[i] = 0;
deep_copy(d_counters, h_counters);
deep_copy(d_hist, h_hist);
Kokkos::deep_copy(d_counters, h_counters);
Kokkos::deep_copy(d_hist, h_hist);
#endif
//theta_ij_inv = 1.0/k_pairDPD->temperature; // independent of i,j

View File

@ -91,7 +91,7 @@ void NBinKokkos<DeviceType>::bin_atoms()
while (h_resize() > 0) {
h_resize() = 0;
deep_copy(d_resize, h_resize);
Kokkos::deep_copy(d_resize, h_resize);
MemsetZeroFunctor<DeviceType> f_zero;
f_zero.ptr = (void*) k_bincount.view<DeviceType>().data();
@ -107,7 +107,7 @@ void NBinKokkos<DeviceType>::bin_atoms()
Kokkos::parallel_for(atom->nlocal+atom->nghost, f);
deep_copy(h_resize, d_resize);
Kokkos::deep_copy(h_resize, d_resize);
if (h_resize()) {
atoms_per_bin += 16;

View File

@ -82,12 +82,12 @@ void NBinSSAKokkos<DeviceType>::bin_atoms_setup(int /*nall*/)
h_lbinxhi() = 0; // Safe to = mbinx - stencil->sx - 1
h_lbinyhi() = 0; // Safe to = mbiny - stencil->sy - 1
h_lbinzhi() = 0; // Safe to = mbinz - stencil->sz - 1
deep_copy(d_lbinxlo, h_lbinxlo);
deep_copy(d_lbinylo, h_lbinylo);
deep_copy(d_lbinzlo, h_lbinzlo);
deep_copy(d_lbinxhi, h_lbinxhi);
deep_copy(d_lbinyhi, h_lbinyhi);
deep_copy(d_lbinzhi, h_lbinzhi);
Kokkos::deep_copy(d_lbinxlo, h_lbinxlo);
Kokkos::deep_copy(d_lbinylo, h_lbinylo);
Kokkos::deep_copy(d_lbinzlo, h_lbinzlo);
Kokkos::deep_copy(d_lbinxhi, h_lbinxhi);
Kokkos::deep_copy(d_lbinyhi, h_lbinyhi);
Kokkos::deep_copy(d_lbinzhi, h_lbinzhi);
}
/* ----------------------------------------------------------------------
@ -128,12 +128,12 @@ void NBinSSAKokkos<DeviceType>::bin_atoms()
NPairSSAKokkosBinIDAtomsFunctor<DeviceType> f(*this);
Kokkos::parallel_reduce(nlocal, f, atoms_per_bin);
}
deep_copy(h_lbinxlo, d_lbinxlo);
deep_copy(h_lbinylo, d_lbinylo);
deep_copy(h_lbinzlo, d_lbinzlo);
deep_copy(h_lbinxhi, d_lbinxhi);
deep_copy(h_lbinyhi, d_lbinyhi);
deep_copy(h_lbinzhi, d_lbinzhi);
Kokkos::deep_copy(h_lbinxlo, d_lbinxlo);
Kokkos::deep_copy(h_lbinylo, d_lbinylo);
Kokkos::deep_copy(h_lbinzlo, d_lbinzlo);
Kokkos::deep_copy(h_lbinxhi, d_lbinxhi);
Kokkos::deep_copy(h_lbinyhi, d_lbinyhi);
Kokkos::deep_copy(h_lbinzhi, d_lbinzhi);
// find each ghost's binID (AIR number)
{

View File

@ -490,10 +490,10 @@ fprintf(stdout, "tota%03d total %3d could use %6d inums, expected %6d inums. inu
h_ssa_gitemLen(ssa_gphaseCt-1,h_ssa_gphaseLen(ssa_gphaseCt-1)-1) - data.neigh_list.inum;
firstTry = false;
deep_copy(data.h_resize, data.resize);
Kokkos::deep_copy(data.h_resize, data.resize);
if (data.h_resize()) {
deep_copy(data.h_new_maxneighs, data.new_maxneighs);
Kokkos::deep_copy(data.h_new_maxneighs, data.new_maxneighs);
list->maxneighs = data.h_new_maxneighs() * 1.2;
list->d_neighbors = typename ArrayTypes<DeviceType>::t_neighbors_2d("neighbors", list->d_neighbors.extent(0), list->maxneighs);
data.neigh_list.d_neighbors = list->d_neighbors;