Initial pass at guarding all Umpire code

LLNL · Feb 20, 2020 · 85c9443 · 85c9443
1 parent a31dcfe
commit 85c9443
Show file tree

Hide file tree

Showing 14 changed files with 48 additions and 15 deletions.
diff --git a/source/SAMRAI/geom/CartesianCellConservativeLinearRefine.C b/source/SAMRAI/geom/CartesianCellConservativeLinearRefine.C
@@ -126,11 +126,15 @@ void CartesianCellConservativeLinearRefine<T>::refine(
    SAMRAI::hier::Box diff_box = coarse_box;
    diff_box.growUpper(SAMRAI::hier::IntVector::getOne(dim));
 
+#ifdef HAVE_UMPIRE
    tbox::AllocatorDatabase *alloc_db = tbox::AllocatorDatabase::getDatabase();
 
    // change to alloc_db->getDevicePool or other generic pool allocator for gpu policies
    //pdat::ArrayData<T> slope(cgbox, dim.getValue(), alloc_db->getTagAllocator());
    pdat::ArrayData<T> slope(cgbox, dim.getValue(), alloc_db->getDevicePool());
+#else
+   pdat::ArrayData<T> slope(cgbox, dim.getValue());
+#endif
 
 
    for (int d = 0; d < fdata->getDepth(); ++d) {
@@ -402,11 +406,15 @@ void CartesianCellConservativeLinearRefine<dcomplex>::refine(
    SAMRAI::hier::Box diff_box = coarse_box;
    diff_box.growUpper(SAMRAI::hier::IntVector::getOne(dim));
 
+#ifdef HAVE_UMPIRE
    tbox::AllocatorDatabase *alloc_db = tbox::AllocatorDatabase::getDatabase();
 
    // change to alloc_db->getDevicePool or other generic pool allocator for gpu policies
    //pdat::ArrayData<T> slope(cgbox, dim.getValue(), alloc_db->getTagAllocator());
    pdat::ArrayData<dcomplex> slope(cgbox, dim.getValue(), alloc_db->getDevicePool());
+#else
+   pdat::ArrayData<dcomplex> slope(cgbox, dim.getValue());
+#endif
 
 
    for (int d = 0; d < fdata->getDepth(); ++d) {
@@ -770,9 +778,9 @@ void CartesianCellConservativeLinearRefine<dcomplex>::refine(
 
 #else // Fortran dim 3
 
-         std::vector<T> diff0_f(cgbox.numberCells(0) + 1);
-         std::vector<T> diff1_f(cgbox.numberCells(1) + 1);
-         std::vector<T> diff2_f(cgbox.numberCells(2) + 1);
+         std::vector<dcomplex> diff0_f(cgbox.numberCells(0) + 1);
+         std::vector<dcomplex> diff1_f(cgbox.numberCells(1) + 1);
+         std::vector<dcomplex> diff2_f(cgbox.numberCells(2) + 1);
          Call3dFortranCellLinearRefine(
           ifirstc(0),
           ifirstc(1), ifirstc(2),

diff --git a/source/SAMRAI/hier/VariableDatabase.C b/source/SAMRAI/hier/VariableDatabase.C
@@ -13,9 +13,6 @@
 #include "SAMRAI/tbox/MathUtilities.h"
 #include "SAMRAI/tbox/Utilities.h"
 
-#include "SAMRAI/tbox/AllocatorDatabase.h"
-
-
 namespace SAMRAI {
 namespace hier {
 
@@ -77,8 +74,6 @@ VariableDatabase::VariableDatabase():
    d_num_registered_patch_data_ids = 0;
 
    d_internal_SAMRAI_context = getContext("Internal_SAMRAI_Variable");
-
-   auto allocator_db = tbox::AllocatorDatabase::getDatabase();
 }
 
 VariableDatabase::~VariableDatabase()

diff --git a/source/SAMRAI/pdat/ArrayData.C b/source/SAMRAI/pdat/ArrayData.C
@@ -22,7 +22,7 @@
 #include "SAMRAI/pdat/CopyOperation.h"
 #include "SAMRAI/pdat/SumOperation.h"
 
-#if defined(HAVE_UMPIRE)
+#ifdef HAVE_UMPIRE
 #include "umpire/ResourceManager.hpp"
 #endif
 
@@ -99,6 +99,7 @@ ArrayData<TYPE>::ArrayData(
 #endif
 }
 
+#ifdef HAVE_UMPIRE
 template<class TYPE>
 ArrayData<TYPE>::ArrayData(
    const hier::Box& box,
@@ -107,19 +108,16 @@ ArrayData<TYPE>::ArrayData(
    d_depth(depth),
    d_offset(box.size()),
    d_box(box)
-#if defined(HAVE_UMPIRE)
    , d_allocator(allocator)
    , d_array(d_allocator.allocate(d_depth * d_offset * sizeof(TYPE)))
-#else
-   , d_array(d_depth * d_offset)
-#endif
 {
    TBOX_ASSERT(depth > 0);
 
 #ifdef DEBUG_INITIALIZE_UNDEFINED
    undefineData();
 #endif
 }
+#endif
 
 template<class TYPE>
 ArrayData<TYPE>::~ArrayData()

diff --git a/source/SAMRAI/pdat/ArrayData.h b/source/SAMRAI/pdat/ArrayData.h
@@ -106,7 +106,7 @@ class ArrayData
       const hier::Box& box,
       unsigned int depth);
 
-#if defined(HAVE_UMPIRE)
+#ifdef HAVE_UMPIRE
    /*!
     * Construct an array data object using an Umpire allocator.
     *

diff --git a/source/SAMRAI/pdat/CellData.C b/source/SAMRAI/pdat/CellData.C
@@ -87,6 +87,7 @@ CellData<TYPE>::CellData(
    d_data.reset(new ArrayData<TYPE>(getGhostBox(), depth));
 }
 
+#ifdef HAVE_UMPIRE
 template<class TYPE>
 CellData<TYPE>::CellData(
    const hier::Box& box,
@@ -105,6 +106,7 @@ CellData<TYPE>::CellData(
 
    d_data.reset(new ArrayData<TYPE>(getGhostBox(), depth, allocator));
 }
+#endif
 
 template<class TYPE>
 CellData<TYPE>::~CellData()

diff --git a/source/SAMRAI/pdat/EdgeData.C b/source/SAMRAI/pdat/EdgeData.C
@@ -54,6 +54,7 @@ EdgeData<TYPE>::EdgeData(
    }
 }
 
+#if defined(HAVE_UMPIRE)
 template<class TYPE>
 EdgeData<TYPE>::EdgeData(
    const hier::Box& box,
@@ -74,6 +75,7 @@ EdgeData<TYPE>::EdgeData(
       d_data[d].reset(new ArrayData<TYPE>(edge_box, depth, allocator));
    }
 }
+#endif
 
 template<class TYPE>
 EdgeData<TYPE>::~EdgeData()

diff --git a/source/SAMRAI/pdat/FaceData.C b/source/SAMRAI/pdat/FaceData.C
@@ -54,6 +54,7 @@ FaceData<TYPE>::FaceData(
    }
 }
 
+#if defined(HAVE_UMPIRE)
 template <class TYPE>
 FaceData<TYPE>::FaceData(const hier::Box& box,
                          int depth,
@@ -70,6 +71,7 @@ FaceData<TYPE>::FaceData(const hier::Box& box,
     d_data[d].reset(new ArrayData<TYPE>(face, depth, allocator));
   }
 }
+#endif
 
 template<class TYPE>
 FaceData<TYPE>::~FaceData()

diff --git a/source/SAMRAI/pdat/FaceData.h b/source/SAMRAI/pdat/FaceData.h
@@ -135,7 +135,7 @@ class FaceData:public hier::PatchData
       int depth,
       const hier::IntVector& ghosts);
 
-#if defined(HAVE_UMPIRE)
+#ifdef HAVE_UMPIRE
   FaceData(const hier::Box& box, int depth, const hier::IntVector& ghosts,umpire::Allocator allocator);
 #endif
 

diff --git a/source/SAMRAI/pdat/OuterfaceData.C b/source/SAMRAI/pdat/OuterfaceData.C
@@ -59,6 +59,7 @@ OuterfaceData<TYPE>::OuterfaceData(
    }
 }
 
+#ifdef HAVE_UMPIRE
 template<class TYPE>
 OuterfaceData<TYPE>::OuterfaceData(
    const hier::Box& box,
@@ -81,6 +82,8 @@ OuterfaceData<TYPE>::OuterfaceData(
       d_data[d][1].reset(new ArrayData<TYPE>(outerfacebox, depth,allocator));
    }
 }
+#endif
+
 template<class TYPE>
 OuterfaceData<TYPE>::~OuterfaceData()
 {

diff --git a/source/SAMRAI/pdat/SideData.C b/source/SAMRAI/pdat/SideData.C
@@ -61,6 +61,7 @@ SideData<TYPE>::SideData(
    }
 }
 
+#ifdef HAVE_UMPIRE
 template<class TYPE>
 SideData<TYPE>::SideData(
    const hier::Box& box,
@@ -109,6 +110,7 @@ SideData<TYPE>::SideData(
       d_data[d].reset(new ArrayData<TYPE>(side, depth, allocator));
    }
 }
+#endif
 
 template<class TYPE>
 SideData<TYPE>::SideData(

diff --git a/source/SAMRAI/tbox/AllocatorDatabase.C b/source/SAMRAI/tbox/AllocatorDatabase.C
@@ -10,6 +10,8 @@
 
 #include "SAMRAI/tbox/AllocatorDatabase.h"
 
+#ifdef HAVE_UMPIRE
+
 #include "umpire/strategy/DynamicPool.hpp"
 #include "umpire/ResourceManager.hpp"
 
@@ -136,3 +138,5 @@ AllocatorDatabase::getTagAllocator()
 
 }
 }
+
+#endif
diff --git a/source/SAMRAI/tbox/AllocatorDatabase.h b/source/SAMRAI/tbox/AllocatorDatabase.h
@@ -13,6 +13,8 @@
 
 #include "SAMRAI/SAMRAI_config.h"
 
+#ifdef HAVE_UMPIRE
+
 #include "SAMRAI/tbox/StartupShutdownManager.h"
 
 #include "umpire/Allocator.hpp"
@@ -56,3 +58,4 @@ class AllocatorDatabase
 }
 
 #endif
+#endif
diff --git a/source/SAMRAI/tbox/MessageStream.C b/source/SAMRAI/tbox/MessageStream.C
@@ -29,7 +29,11 @@ MessageStream::MessageStream(
    const void* data_to_read,
    bool deep_copy):
    d_mode(mode),
+#ifdef HAVE_UMPIRE
    d_write_buffer(AllocatorDatabase::getDatabase()->getStreamAllocator()),
+#else
+   d_write_buffer(),
+#endif
    d_read_buffer(0),
    d_buffer_size(0),
    d_buffer_index(0),
@@ -57,7 +61,11 @@ MessageStream::MessageStream(
 
 MessageStream::MessageStream():
    d_mode(Write),
+#ifdef HAVE_UMPIRE
    d_write_buffer(AllocatorDatabase::getDatabase()->getStreamAllocator()),
+#else
+   d_write_buffer(),
+#endif
    d_read_buffer(0),
    d_buffer_size(0),
    d_buffer_index(0),

diff --git a/source/SAMRAI/tbox/MessageStream.h b/source/SAMRAI/tbox/MessageStream.h
@@ -16,7 +16,9 @@
 #include "SAMRAI/tbox/Complex.h"
 #include "SAMRAI/tbox/Utilities.h"
 
+#ifdef HAVE_UMPIRE
 #include "umpire/TypedAllocator.hpp"
+#endif
 
 #include <cstring>
 #include <iostream>
@@ -416,7 +418,11 @@ class MessageStream
    /*!
     * The buffer for the streamed data to be written.
     */
+#ifdef HAVE_UMPIRE
    std::vector<char, umpire::TypedAllocator<char> > d_write_buffer;
+#else
+   std::vector<char> d_write_buffer;
+#endif
 
    /*!
     * @brief Pointer to the externally supplied memory to read from in