Merge pull request #1423 from LLNL/feature/yang39/warnings-cleanup

Cleanup a bunch of GPU warnings

src/axom/core/Array.hpp

@@ -842,7 +842,7 @@ class Array : public ArrayBase<T, DIM, Array<T, DIM, SPACE>>
   /*!
    * \brief Get the ID for the umpire allocator
    */
-  int getAllocatorID() const { return m_allocator_id; }
+  AXOM_HOST_DEVICE int getAllocatorID() const { return m_allocator_id; }
 
   /*!
    * \brief Sets the preferred space where operations on this array should be

src/axom/core/ArrayBase.hpp

@@ -221,7 +221,7 @@ class ArrayBase
    * memory spaces
    */
   template <typename OtherArrayType>
-  ArrayBase(
+  AXOM_HOST_DEVICE ArrayBase(
     const ArrayBase<typename std::remove_const<T>::type, DIM, OtherArrayType>& other)
     : m_shape(other.shape())
     , m_mapping(other.mapping())
@@ -230,7 +230,7 @@ class ArrayBase
 
   /// \overload
   template <typename OtherArrayType>
-  ArrayBase(
+  AXOM_HOST_DEVICE ArrayBase(
     const ArrayBase<const typename std::remove_const<T>::type, DIM, OtherArrayType>& other)
     : m_shape(other.shape())
     , m_mapping(other.mapping())
@@ -618,12 +618,13 @@ class ArrayBase<T, 1, ArrayType>
 
   // Empty implementation because no member data
   template <typename OtherArrayType>
-  ArrayBase(const ArrayBase<typename std::remove_const<T>::type, 1, OtherArrayType>&)
+  AXOM_HOST_DEVICE ArrayBase(
+    const ArrayBase<typename std::remove_const<T>::type, 1, OtherArrayType>&)
   { }
 
   // Empty implementation because no member data
   template <typename OtherArrayType>
-  ArrayBase(
+  AXOM_HOST_DEVICE ArrayBase(
     const ArrayBase<const typename std::remove_const<T>::type, 1, OtherArrayType>&)
   { }
 
@@ -1812,7 +1813,10 @@ class ArraySubslice
   /*!
    * \brief Get the ID for the umpire allocator
    */
-  int getAllocatorID() const { return m_array->getAllocatorID(); }
+  AXOM_HOST_DEVICE int getAllocatorID() const
+  {
+    return m_array->getAllocatorID();
+  }
 
 protected:
   friend BaseClass;

src/axom/core/ArrayView.hpp

@@ -114,10 +114,10 @@ class ArrayView : public ArrayBase<T, DIM, ArrayView<T, DIM, SPACE>>
    * space.
    */
   template <typename OtherArrayType>
-  ArrayView(ArrayBase<T, DIM, OtherArrayType>& other);
+  AXOM_HOST_DEVICE ArrayView(ArrayBase<T, DIM, OtherArrayType>& other);
   /// \overload
   template <typename OtherArrayType>
-  ArrayView(
+  AXOM_HOST_DEVICE ArrayView(
     const ArrayBase<typename std::remove_const<T>::type, DIM, OtherArrayType>& other);
 
   /*!
@@ -156,7 +156,7 @@ class ArrayView : public ArrayBase<T, DIM, ArrayView<T, DIM, SPACE>>
   /*!
    * \brief Get the ID for the umpire allocator
    */
-  int getAllocatorID() const { return m_allocator_id; }
+  AXOM_HOST_DEVICE int getAllocatorID() const { return m_allocator_id; }
 
   /*!
    * \brief Returns an ArrayView that is a subspan of the original range of
@@ -341,13 +341,14 @@ AXOM_HOST_DEVICE ArrayView<T, DIM, SPACE>::ArrayView(
 //------------------------------------------------------------------------------
 template <typename T, int DIM, MemorySpace SPACE>
 template <typename OtherArrayType>
-ArrayView<T, DIM, SPACE>::ArrayView(ArrayBase<T, DIM, OtherArrayType>& other)
+AXOM_HOST_DEVICE ArrayView<T, DIM, SPACE>::ArrayView(
+  ArrayBase<T, DIM, OtherArrayType>& other)
   : ArrayBase<T, DIM, ArrayView<T, DIM, SPACE>>(other)
   , m_data(static_cast<OtherArrayType&>(other).data())
   , m_num_elements(static_cast<OtherArrayType&>(other).size())
   , m_allocator_id(static_cast<OtherArrayType&>(other).getAllocatorID())
 {
-#ifdef AXOM_DEBUG
+#if !defined(AXOM_DEVICE_CODE) && defined(AXOM_DEBUG)
   // If it's not dynamic, the allocator ID from the argument array has to match the template param.
   // If that's not the case then things have gone horribly wrong somewhere.
   if(SPACE != MemorySpace::Dynamic &&
@@ -363,7 +364,7 @@ ArrayView<T, DIM, SPACE>::ArrayView(ArrayBase<T, DIM, OtherArrayType>& other)
 //------------------------------------------------------------------------------
 template <typename T, int DIM, MemorySpace SPACE>
 template <typename OtherArrayType>
-ArrayView<T, DIM, SPACE>::ArrayView(
+AXOM_HOST_DEVICE ArrayView<T, DIM, SPACE>::ArrayView(
   const ArrayBase<typename std::remove_const<T>::type, DIM, OtherArrayType>& other)
   : ArrayBase<T, DIM, ArrayView<T, DIM, SPACE>>(other)
   , m_data(static_cast<const OtherArrayType&>(other).data())
@@ -373,7 +374,7 @@ ArrayView<T, DIM, SPACE>::ArrayView(
   static_assert(
     std::is_const<T>::value || detail::ArrayTraits<OtherArrayType>::is_view,
     "Cannot create an ArrayView of non-const type from a const Array");
-#ifdef AXOM_DEBUG
+#if !defined(AXOM_DEVICE_CODE) && defined(AXOM_DEBUG)
   // If it's not dynamic, the allocator ID from the argument array has to match the template param.
   // If that's not the case then things have gone horribly wrong somewhere.
   if(SPACE != MemorySpace::Dynamic &&

src/axom/core/IteratorBase.hpp

@@ -156,6 +156,8 @@ class IteratorBase
   }
 
   /// Addition-assignment operator
+  AXOM_SUPPRESS_HD_WARN
+  AXOM_HOST_DEVICE
   IterType& operator+=(PosType n)
   {
     adv(getIter(), n);
@@ -169,6 +171,8 @@ class IteratorBase
   }
 
   /// Addition operator with iterator on left and position on right
+  AXOM_SUPPRESS_HD_WARN
+  AXOM_HOST_DEVICE
   friend IterType operator+(const IterType& it, PosType n)
   {
     IterType ret(it);

src/axom/core/detail/FlatTable.hpp

@@ -258,7 +258,6 @@ struct SequentialLookupPolicy : ProbePolicy
       {
         // Stop probing if the "overflow" bit is not set.
         keep_going = false;
-        curr_group = NO_MATCH;
       }
 
       if(!keep_going)

src/axom/slam/BivariateMap.hpp

@@ -83,7 +83,7 @@ template <typename T,
           typename IndPol =
             policies::STLVectorIndirection<typename BSet::PositionType, T>,
           typename StrPol = policies::StrideOne<typename BSet::PositionType>,
-          typename IfacePol = policies::VirtualInterface>
+          typename IfacePol = policies::ConcreteInterface>
 class BivariateMap
   : public policies::MapInterface<IfacePol, typename BSet::PositionType>,
     public StrPol
@@ -481,10 +481,8 @@ class BivariateMap
 
 public:
   /** BivariateMap iterator functions */
-  AXOM_SUPPRESS_HD_WARN
   AXOM_HOST_DEVICE iterator begin() { return iterator(this, 0); }
 
-  AXOM_SUPPRESS_HD_WARN
   AXOM_HOST_DEVICE iterator end()
   {
     return iterator(this, totalSize() * numComp());
@@ -500,25 +498,21 @@ class BivariateMap
     return const_iterator(this, totalSize() * numComp());
   }
 
-  AXOM_SUPPRESS_HD_WARN
   AXOM_HOST_DEVICE range_iterator set_begin()
   {
     return range_iterator(this, 0);
   }
 
-  AXOM_SUPPRESS_HD_WARN
   AXOM_HOST_DEVICE range_iterator set_end()
   {
     return range_iterator(this, totalSize());
   }
 
-  AXOM_SUPPRESS_HD_WARN
   AXOM_HOST_DEVICE const_range_iterator set_begin() const
   {
     return const_range_iterator(this, 0);
   }
 
-  AXOM_SUPPRESS_HD_WARN
   AXOM_HOST_DEVICE const_range_iterator set_end() const
   {
     return const_range_iterator(this, totalSize());
@@ -562,9 +556,9 @@ class BivariateMap
 public:
   AXOM_HOST_DEVICE const BivariateSetType* set() const { return m_bset.get(); }
 
-  const MapType* getMap() const { return &m_map; }
+  AXOM_HOST_DEVICE const MapType* getMap() const { return &m_map; }
 
-  MapType* getMap() { return &m_map; }
+  AXOM_HOST_DEVICE MapType* getMap() { return &m_map; }
 
   bool isValid(bool verboseOutput = false) const
   {
@@ -576,11 +570,10 @@ class BivariateMap
   ///
 
   /** \brief Returns the BivariateSet size. */
-  AXOM_SUPPRESS_HD_WARN
   AXOM_HOST_DEVICE SetPosition size() const { return set()->size(); }
 
   /** \brief Returns the BivariateSet size. */
-  SetPosition totalSize() const { return set()->size(); }
+  AXOM_HOST_DEVICE SetPosition totalSize() const { return set()->size(); }
 
   SetPosition firstSetSize() const { return set()->firstSetSize(); }
 
@@ -594,7 +587,7 @@ class BivariateMap
   SetPosition size(SetPosition s) const { return set()->size(s); }
 
   /** \brief Return the number of components of the map  */
-  SetPosition numComp() const { return StrPol::stride(); }
+  AXOM_HOST_DEVICE SetPosition numComp() const { return StrPol::stride(); }
 
   /// @}
 
@@ -682,7 +675,7 @@ class BivariateMap<T, BSet, IndPol, StrPol, IfacePol>::FlatIterator
   /**
      * \brief Construct a new BivariateMap Iterator given an ElementFlatIndex
      */
-  FlatIterator(BivariateMapPtr sMap, PositionType pos)
+  AXOM_HOST_DEVICE FlatIterator(BivariateMapPtr sMap, PositionType pos)
     : IterBase(pos)
     , m_map(sMap)
     , m_bsetIterator(m_map->set(), pos / m_map->numComp())
@@ -771,7 +764,7 @@ class BivariateMap<T, BSet, IndPol, StrPol, IfacePol>::RangeIterator
   /*!
    * \brief Construct a new BivariateMap Iterator given an ElementFlatIndex
    */
-  RangeIterator(BivariateMapPtr sMap, PositionType pos)
+  AXOM_HOST_DEVICE RangeIterator(BivariateMapPtr sMap, PositionType pos)
     : IterBase(pos)
     , m_map(sMap)
     , m_mapIterator(m_map->getMap()->set_begin() + pos)
@@ -828,7 +821,10 @@ class BivariateMap<T, BSet, IndPol, StrPol, IfacePol>::RangeIterator
   /**
    * \brief Return the current iterator's flat bivariate index.
    */
-  PositionType flatIndex() const { return m_mapIterator.flatIndex(); }
+  AXOM_HOST_DEVICE PositionType flatIndex() const
+  {
+    return m_mapIterator.flatIndex();
+  }
 
   /** \brief Returns the number of components per element in the map. */
   PositionType numComp() const { return m_map->numComp(); }

src/axom/slam/BivariateSet.hpp

@@ -318,7 +318,8 @@ struct BivariateSetIterator
   using pointer = value_type*;
   using iterator_category = std::forward_iterator_tag;
 
-  BivariateSetIterator(const BivariateSetType* bset, IndexType flatPos = 0)
+  AXOM_HOST_DEVICE BivariateSetIterator(const BivariateSetType* bset,
+                                        IndexType flatPos = 0)
     : BaseType(flatPos)
     , m_bset(bset)
   { }