Skip to content

Commit

Permalink
Fix circular header file dependency
Browse files Browse the repository at this point in the history
AMReX_GpuContainers.H included AMReX_Scan.H, which in turn includes
AMReX_Gpu.H, which in turn includes AMReX_GpuContainers.H.

In this PR, AMReX_Scan.H is removed from AMReX_GpuContainers.H, because it
does not need it.
  • Loading branch information
WeiqunZhang committed Jan 26, 2024
1 parent d5cc579 commit 9d0ffb0
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 1 deletion.
1 change: 0 additions & 1 deletion Src/Base/AMReX_GpuContainers.H
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include <AMReX_Vector.H>
#include <AMReX_PODVector.H>
#include <AMReX_GpuAllocators.H>
#include <AMReX_Scan.H>
#include <type_traits>

#include <numeric>
Expand Down
1 change: 1 addition & 0 deletions Src/EB/AMReX_EB_utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include <AMReX_Geometry.H>
#include <AMReX_MultiCutFab.H>
#include <AMReX_REAL.H>
#include <AMReX_Scan.H>
#include <AMReX_EBFabFactory.H>
#include <AMReX_EBFArrayBox.H>

Expand Down
4 changes: 4 additions & 0 deletions Src/Extern/HYPRE/AMReX_HypreABecLap3.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@

#include <AMReX_Habec_K.H>

#ifdef AMREX_USE_GPU
#include <AMReX_Scan.H>
#endif

#ifdef AMREX_USE_EB
#include <AMReX_EBMultiFabUtil.H>
#include <AMReX_MultiCutFab.H>
Expand Down
4 changes: 4 additions & 0 deletions Src/Extern/HYPRE/AMReX_HypreNodeLap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
#include <AMReX_VisMF.H>
#include <AMReX_MLNodeLaplacian.H>

#ifdef AMREX_USE_GPU
#include <AMReX_Scan.H>
#endif

#include <cmath>
#include <numeric>
#include <limits>
Expand Down
1 change: 1 addition & 0 deletions Src/Particle/AMReX_DenseBins.H
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include <AMReX_Config.H>

#include <AMReX_Gpu.H>
#include <AMReX_Scan.H>
#include <AMReX_IntVect.H>
#include <AMReX_BLProfiler.H>
#include <AMReX_BinIterator.H>
Expand Down
1 change: 1 addition & 0 deletions Src/Particle/AMReX_ParticleCommunication.H
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include <AMReX_IntVect.H>
#include <AMReX_ParticleBufferMap.H>
#include <AMReX_MFIter.H>
#include <AMReX_Scan.H>
#include <AMReX_TypeTraits.H>
#include <AMReX_MakeParticle.H>

Expand Down

0 comments on commit 9d0ffb0

Please sign in to comment.