From 9d0ffb0ac1820216bae1c3b933a097ef07077762 Mon Sep 17 00:00:00 2001
From: Weiqun Zhang <weiqunzhang@lbl.gov>
Date: Fri, 26 Jan 2024 11:49:20 -0800
Subject: [PATCH] Fix circular header file dependency

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.
---
 Src/Base/AMReX_GpuContainers.H             | 1 -
 Src/EB/AMReX_EB_utils.cpp                  | 1 +
 Src/Extern/HYPRE/AMReX_HypreABecLap3.cpp   | 4 ++++
 Src/Extern/HYPRE/AMReX_HypreNodeLap.cpp    | 4 ++++
 Src/Particle/AMReX_DenseBins.H             | 1 +
 Src/Particle/AMReX_ParticleCommunication.H | 1 +
 6 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Src/Base/AMReX_GpuContainers.H b/Src/Base/AMReX_GpuContainers.H
index 05399b2e047..9ecb144b58c 100644
--- a/Src/Base/AMReX_GpuContainers.H
+++ b/Src/Base/AMReX_GpuContainers.H
@@ -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>
diff --git a/Src/EB/AMReX_EB_utils.cpp b/Src/EB/AMReX_EB_utils.cpp
index 857a8eb08a8..27044611343 100644
--- a/Src/EB/AMReX_EB_utils.cpp
+++ b/Src/EB/AMReX_EB_utils.cpp
@@ -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>
 
diff --git a/Src/Extern/HYPRE/AMReX_HypreABecLap3.cpp b/Src/Extern/HYPRE/AMReX_HypreABecLap3.cpp
index f29000f624f..1104c88a329 100644
--- a/Src/Extern/HYPRE/AMReX_HypreABecLap3.cpp
+++ b/Src/Extern/HYPRE/AMReX_HypreABecLap3.cpp
@@ -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>
diff --git a/Src/Extern/HYPRE/AMReX_HypreNodeLap.cpp b/Src/Extern/HYPRE/AMReX_HypreNodeLap.cpp
index 448869ca359..557d209c05a 100644
--- a/Src/Extern/HYPRE/AMReX_HypreNodeLap.cpp
+++ b/Src/Extern/HYPRE/AMReX_HypreNodeLap.cpp
@@ -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>
diff --git a/Src/Particle/AMReX_DenseBins.H b/Src/Particle/AMReX_DenseBins.H
index b13d6321da2..3bdd398fee9 100644
--- a/Src/Particle/AMReX_DenseBins.H
+++ b/Src/Particle/AMReX_DenseBins.H
@@ -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>
diff --git a/Src/Particle/AMReX_ParticleCommunication.H b/Src/Particle/AMReX_ParticleCommunication.H
index ba9a4faba49..b041bcfdcbb 100644
--- a/Src/Particle/AMReX_ParticleCommunication.H
+++ b/Src/Particle/AMReX_ParticleCommunication.H
@@ -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>