AMREX_USE_CUDA -> AMREX_USE_GPU (#424)

AMReX-Astro · Mar 26, 2024 · 324dd58 · 324dd58
1 parent 3c11738
commit 324dd58
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/Source/Maestro.H b/Source/Maestro.H
@@ -28,9 +28,9 @@ using namespace maestro;
 #include <PhysBCFunctMaestro.H>
 #include <SimpleLog.H>
 
-/// Define Real vector types for CUDA-compatability. If `AMREX_USE_CUDA`, then
-/// this will be stored in CUDA managed memory.
-#ifdef AMREX_USE_CUDA
+/// Define Real vector types for GPU-compatability. If `AMREX_USE_GPU`, then
+/// this will be stored in GPU managed memory.
+#ifdef AMREX_USE_GPU
 using RealVector = amrex::Gpu::ManagedVector<amrex::Real>;
 using IntVector = amrex::Gpu::ManagedVector<int>;
 #else

diff --git a/Source/MaestroAverage.cpp b/Source/MaestroAverage.cpp
@@ -53,7 +53,7 @@ void Maestro::Average(const Vector<MultiFab>& phi, BaseState<Real>& phibar,
 
                 const Array4<const Real> phi_arr = phi[lev].array(mfi, comp);
 
-#ifdef AMREX_USE_CUDA
+#ifdef AMREX_USE_GPU
                 // Atomic::Add is non-deterministic on the GPU. If this flag is true,
                 // run on the CPU instead
                 bool launched;
@@ -70,7 +70,7 @@ void Maestro::Average(const Vector<MultiFab>& phi, BaseState<Real>& phibar,
                                                    phi_arr(i, j, k));
                 });
 
-#ifdef AMREX_USE_CUDA
+#ifdef AMREX_USE_GPU
                 if (deterministic_nodal_solve) {
                     // turn GPU back on
                     if (launched) Gpu::setLaunchRegion(true);
@@ -231,7 +231,7 @@ void Maestro::Average(const Vector<MultiFab>& phi, BaseState<Real>& phibar,
 
                 bool use_mask = !(lev == fine_lev - 1);
 
-#ifdef AMREX_USE_CUDA
+#ifdef AMREX_USE_GPU
                 // Atomic::Add is non-deterministic on the GPU. If this flag is true,
                 // run on the CPU instead
                 bool launched;
@@ -280,7 +280,7 @@ void Maestro::Average(const Vector<MultiFab>& phi, BaseState<Real>& phibar,
                     }
                 });
 
-#ifdef AMREX_USE_CUDA
+#ifdef AMREX_USE_GPU
                 if (deterministic_nodal_solve) {
                     // turn GPU back on
                     if (launched) Gpu::setLaunchRegion(true);

diff --git a/Source/MaestroDt.cpp b/Source/MaestroDt.cpp
@@ -1,7 +1,7 @@
 
 #include <Maestro.H>
 
-#ifdef AMREX_USE_CUDA
+#ifdef AMREX_USE_GPU
 #include <AMReX_Arena.H>
 #include <cuda_runtime_api.h>
 #endif

diff --git a/Source/MaestroFill3dData.cpp b/Source/MaestroFill3dData.cpp
@@ -423,7 +423,7 @@ void Maestro::Addw0(Vector<std::array<MultiFab, AMREX_SPACEDIM> >& u_edge,
     }
 
     if (finest_level == 0) {
-#ifdef AMREX_USE_CUDA
+#ifdef AMREX_USE_GPU
         // FillBoundary can be non-deterministic on the GPU for non-cell
         // centered data (like u_edge here). If this flag is true, run
         // on the CPU instead
@@ -441,7 +441,7 @@ void Maestro::Addw0(Vector<std::array<MultiFab, AMREX_SPACEDIM> >& u_edge,
             }
         }
 
-#ifdef AMREX_USE_CUDA
+#ifdef AMREX_USE_GPU
         if (deterministic_nodal_solve) {
             // turn GPU back on
             if (launched) Gpu::setLaunchRegion(true);

diff --git a/Source/MaestroMakeEta.cpp b/Source/MaestroMakeEta.cpp
@@ -8,7 +8,7 @@ void Maestro::MakeEtarho(const Vector<MultiFab>& etarho_flux) {
     // timer for profiling
     BL_PROFILE_VAR("Maestro::MakeEtarho()", MakeEtarho);
 
-#ifdef AMREX_USE_CUDA
+#ifdef AMREX_USE_GPU
     bool launched;
     if (deterministic_nodal_solve) {
         launched = !Gpu::notInLaunchRegion();
@@ -161,7 +161,7 @@ void Maestro::MakeEtarho(const Vector<MultiFab>& etarho_flux) {
     RestrictBase(etarho_cc, true);
     FillGhostBase(etarho_cc, true);
 
-#ifdef AMREX_USE_CUDA
+#ifdef AMREX_USE_GPU
     if (deterministic_nodal_solve) {
         // turn GPU back on
         if (launched) Gpu::setLaunchRegion(true);

diff --git a/Source/MaestroNodalProj.cpp b/Source/MaestroNodalProj.cpp
@@ -212,7 +212,7 @@ void Maestro::NodalProj(int proj_type, Vector<MultiFab>& rhcc,
         rhcc[lev].mult(-1.0, 0, 1, 1);
     }
 
-#ifdef AMREX_USE_CUDA
+#ifdef AMREX_USE_GPU
     // compRHS is non-deterministic on the GPU. If this flag is true, run
     // on the CPU instead
     bool launched;
@@ -228,7 +228,7 @@ void Maestro::NodalProj(int proj_type, Vector<MultiFab>& rhcc,
     mlndlap.compRHS(amrex::GetVecOfPtrs(rhstotal), amrex::GetVecOfPtrs(Vproj),
                     {},  // pass in null rhnd
                     amrex::GetVecOfPtrs(rhcc));
-#ifdef AMREX_USE_CUDA
+#ifdef AMREX_USE_GPU
     if (deterministic_nodal_solve) {
         // turn GPU back on
         if (launched) Gpu::setLaunchRegion(true);
@@ -288,7 +288,7 @@ void Maestro::NodalProj(int proj_type, Vector<MultiFab>& rhcc,
 
     // solve for phi
     Print() << "Calling nodal solver" << std::endl;
-#ifdef AMREX_USE_CUDA
+#ifdef AMREX_USE_GPU
     if (deterministic_nodal_solve) {
         launched = !Gpu::notInLaunchRegion();
         // turn off GPU
@@ -297,7 +297,7 @@ void Maestro::NodalProj(int proj_type, Vector<MultiFab>& rhcc,
 #endif
     mlmg.solve(amrex::GetVecOfPtrs(phi), amrex::GetVecOfConstPtrs(rhstotal),
                rel_tol, abs_tol);
-#ifdef AMREX_USE_CUDA
+#ifdef AMREX_USE_GPU
     if (deterministic_nodal_solve) {
         // turn GPU back on
         if (launched) Gpu::setLaunchRegion(true);