From f59bc75e4e9c10c7c76408efc0d6627ab6211846 Mon Sep 17 00:00:00 2001 From: Weiqun Zhang Date: Mon, 7 Dec 2020 12:07:29 -0800 Subject: Remove `using namespace Gpu` (#1555) Using namespace amrex::Gpu` is not safe because of the conflict between `amrex::Gpu::memcpy` and `::memcpy`. --- Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp') diff --git a/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp b/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp index 8e296531e..d04d238ad 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp @@ -11,7 +11,6 @@ #include using namespace amrex; -using namespace Gpu; /* \brief Initialize k space object. * @@ -81,7 +80,7 @@ SpectralKSpace::getKComponent( const DistributionMapping& dm, // for each box owned by the local MPI proc for ( MFIter mfi(spectralspace_ba, dm); mfi.isValid(); ++mfi ){ Box bx = spectralspace_ba[mfi]; - DeviceVector& k = k_comp[mfi]; + Gpu::DeviceVector& k = k_comp[mfi]; // Allocate k to the right size int N = bx.length( i_dim ); @@ -140,8 +139,8 @@ SpectralKSpace::getSpectralShiftFactor( const DistributionMapping& dm, // Loop over boxes and allocate the corresponding DeviceVector // for each box owned by the local MPI proc for ( MFIter mfi(spectralspace_ba, dm); mfi.isValid(); ++mfi ){ - const DeviceVector& k = k_vec[i_dim][mfi]; - DeviceVector& shift = shift_factor[mfi]; + const Gpu::DeviceVector& k = k_vec[i_dim][mfi]; + Gpu::DeviceVector& shift = shift_factor[mfi]; // Allocate shift coefficients const int N = k.size(); @@ -189,8 +188,8 @@ SpectralKSpace::getModifiedKComponent( const DistributionMapping& dm, if (n_order == -1) { // Infinite-order case for ( MFIter mfi(spectralspace_ba, dm); mfi.isValid(); ++mfi ){ - const DeviceVector& k = k_vec[i_dim][mfi]; - DeviceVector& modified_k = modified_k_comp[mfi]; + const Gpu::DeviceVector& k = k_vec[i_dim][mfi]; + Gpu::DeviceVector& modified_k = modified_k_comp[mfi]; // Allocate modified_k to the same size as k const int N = k.size(); @@ -203,7 +202,7 @@ SpectralKSpace::getModifiedKComponent( const DistributionMapping& dm, // Compute real-space stencil coefficients Vector h_stencil_coef = getFornbergStencilCoefficients(n_order, nodal); - DeviceVector d_stencil_coef(h_stencil_coef.size()); + Gpu::DeviceVector d_stencil_coef(h_stencil_coef.size()); Gpu::copyAsync(Gpu::hostToDevice, h_stencil_coef.begin(), h_stencil_coef.end(), d_stencil_coef.begin()); Gpu::synchronize(); @@ -214,8 +213,8 @@ SpectralKSpace::getModifiedKComponent( const DistributionMapping& dm, // for each box owned by the local MPI proc for ( MFIter mfi(spectralspace_ba, dm); mfi.isValid(); ++mfi ){ Real delta_x = dx[i_dim]; - const DeviceVector& k = k_vec[i_dim][mfi]; - DeviceVector& modified_k = modified_k_comp[mfi]; + const Gpu::DeviceVector& k = k_vec[i_dim][mfi]; + Gpu::DeviceVector& modified_k = modified_k_comp[mfi]; // Allocate modified_k to the same size as k const int N = k.size(); -- cgit v1.2.3