Safe Compile Time: Available Arenas

AMReX-Codes · Feb 8, 2023 · 9a4d7d8 · 9a4d7d8
1 parent b310260
commit 9a4d7d8
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/src/Base/PODVector.cpp b/src/Base/PODVector.cpp
@@ -117,10 +117,12 @@ void make_PODVector(py::module &m, std::string typestr)
     // see Src/Base/AMReX_GpuContainers.H
     make_PODVector<T, std::allocator<T>> (m, typestr, "std");
     make_PODVector<T, amrex::ArenaAllocator<T>> (m, typestr, "arena");
+    make_PODVector<T, amrex::PinnedArenaAllocator<T>> (m, typestr, "pinned");
+#ifdef AMREX_USE_GPU
     make_PODVector<T, amrex::DeviceArenaAllocator<T>> (m, typestr, "device");
     make_PODVector<T, amrex::ManagedArenaAllocator<T>> (m, typestr, "managed");
-    make_PODVector<T, amrex::PinnedArenaAllocator<T>> (m, typestr, "pinned");
     make_PODVector<T, amrex::AsyncArenaAllocator<T>> (m, typestr, "async");
+#endif
 }
 
 void init_PODVector(py::module& m) {

diff --git a/src/Particle/ArrayOfStructs.cpp b/src/Particle/ArrayOfStructs.cpp
@@ -126,10 +126,12 @@ void make_ArrayOfStructs(py::module &m)
     // see Src/Base/AMReX_GpuContainers.H
     make_ArrayOfStructs<NReal, NInt, std::allocator> (m, "std");
     make_ArrayOfStructs<NReal, NInt, amrex::ArenaAllocator> (m, "arena");
+    make_ArrayOfStructs<NReal, NInt, amrex::PinnedArenaAllocator> (m, "pinned");
+#ifdef AMREX_USE_GPU
     make_ArrayOfStructs<NReal, NInt, amrex::DeviceArenaAllocator> (m, "device");
     make_ArrayOfStructs<NReal, NInt, amrex::ManagedArenaAllocator> (m, "managed");
-    make_ArrayOfStructs<NReal, NInt, amrex::PinnedArenaAllocator> (m, "pinned");
     make_ArrayOfStructs<NReal, NInt, amrex::AsyncArenaAllocator> (m, "async");
+#endif
 }
 
 void init_ArrayOfStructs(py::module& m) {

diff --git a/src/Particle/ParticleContainer.cpp b/src/Particle/ParticleContainer.cpp
@@ -352,14 +352,16 @@ void make_ParticleContainer_and_Iterators (py::module &m)
                                          std::allocator>(m, "std");
     make_ParticleContainer_and_Iterators<T_NStructReal, T_NStructInt, T_NArrayReal, T_NArrayInt,
                                          amrex::ArenaAllocator>(m, "arena");
+    make_ParticleContainer_and_Iterators<T_NStructReal, T_NStructInt, T_NArrayReal, T_NArrayInt,
+                                         amrex::PinnedArenaAllocator>(m, "pinned");
+#ifdef AMREX_USE_GPU
     make_ParticleContainer_and_Iterators<T_NStructReal, T_NStructInt, T_NArrayReal, T_NArrayInt,
                                          amrex::DeviceArenaAllocator>(m, "device");
     make_ParticleContainer_and_Iterators<T_NStructReal, T_NStructInt, T_NArrayReal, T_NArrayInt,
                                          amrex::ManagedArenaAllocator>(m, "managed");
-    make_ParticleContainer_and_Iterators<T_NStructReal, T_NStructInt, T_NArrayReal, T_NArrayInt,
-                                         amrex::PinnedArenaAllocator>(m, "pinned");
     make_ParticleContainer_and_Iterators<T_NStructReal, T_NStructInt, T_NArrayReal, T_NArrayInt,
                                          amrex::AsyncArenaAllocator>(m, "async");
+#endif
 }
 
 void init_ParticleContainer(py::module& m) {

diff --git a/src/Particle/ParticleTile.cpp b/src/Particle/ParticleTile.cpp
@@ -116,14 +116,16 @@ void make_ParticleTile(py::module &m)
                       std::allocator>(m, "std");
     make_ParticleTile<NStructReal, NStructInt, NArrayReal, NArrayInt,
                       amrex::ArenaAllocator>(m, "arena");
+    make_ParticleTile<NStructReal, NStructInt, NArrayReal, NArrayInt,
+                      amrex::PinnedArenaAllocator>(m, "pinned");
+#ifdef AMREX_USE_GPU
     make_ParticleTile<NStructReal, NStructInt, NArrayReal, NArrayInt,
                       amrex::DeviceArenaAllocator>(m, "device");
     make_ParticleTile<NStructReal, NStructInt, NArrayReal, NArrayInt,
                       amrex::ManagedArenaAllocator>(m, "managed");
-    make_ParticleTile<NStructReal, NStructInt, NArrayReal, NArrayInt,
-                      amrex::PinnedArenaAllocator>(m, "pinned");
     make_ParticleTile<NStructReal, NStructInt, NArrayReal, NArrayInt,
                       amrex::AsyncArenaAllocator>(m, "async");
+#endif
 }
 
 void init_ParticleTile(py::module& m) {

diff --git a/src/Particle/StructOfArrays.cpp b/src/Particle/StructOfArrays.cpp
@@ -48,10 +48,12 @@ void make_StructOfArrays(py::module &m)
     // see Src/Base/AMReX_GpuContainers.H
     make_StructOfArrays<NReal, NInt, std::allocator>(m, "std");
     make_StructOfArrays<NReal, NInt, amrex::ArenaAllocator>(m, "arena");
+    make_StructOfArrays<NReal, NInt, amrex::PinnedArenaAllocator>(m, "pinned");
+#ifdef AMREX_USE_GPU
     make_StructOfArrays<NReal, NInt, amrex::DeviceArenaAllocator>(m, "device");
     make_StructOfArrays<NReal, NInt, amrex::ManagedArenaAllocator>(m, "managed");
-    make_StructOfArrays<NReal, NInt, amrex::PinnedArenaAllocator>(m, "pinned");
     make_StructOfArrays<NReal, NInt, amrex::AsyncArenaAllocator>(m, "async");
+#endif
 }
 
 void init_StructOfArrays(py::module& m) {