Fix sign-ness in tiles members

Author: sbaldu

include/CLUEstering/CLUEstering.hpp

@@ -112,13 +112,12 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE_CLUE {
   }
 
   template <uint8_t Ndim>
-  void CLUEAlgoAlpaka<Ndim>::setupTiles(Queue queue,
-                                        const PointsSoA<Ndim>& h_points) {
-	// TODO: reconsider the way that we compute the number of tiles
-    auto nTiles =
-        static_cast<uint32_t>(std::ceil(h_points.nPoints() / static_cast<float>(pointsPerTile_)));
-    const auto nPerDim = static_cast<uint32_t>(std::ceil(std::pow(nTiles, 1. / Ndim)));
-	nTiles = static_cast<uint32_t>(std::pow(nPerDim, Ndim));
+  void CLUEAlgoAlpaka<Ndim>::setupTiles(Queue queue, const PointsSoA<Ndim>& h_points) {
+    // TODO: reconsider the way that we compute the number of tiles
+    auto nTiles = static_cast<int32_t>(
+        std::ceil(h_points.nPoints() / static_cast<float>(pointsPerTile_)));
+    const auto nPerDim = static_cast<int32_t>(std::ceil(std::pow(nTiles, 1. / Ndim)));
+    nTiles = static_cast<int32_t>(std::pow(nPerDim, Ndim));
 
     // TODO: check if nullptr and if not, reset without allocating
     d_tiles =
@@ -131,8 +130,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE_CLUE {
 
     // these are now private members
     const auto device = alpaka::getDev(queue);
-    alpaka::memcpy(
-        queue, d_tiles->minMax(), min_max);
+    alpaka::memcpy(queue, d_tiles->minMax(), min_max);
     alpaka::memcpy(queue, d_tiles->tileSize(), tile_sizes);
     alpaka::wait(queue);
   }
@@ -251,7 +249,6 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE_CLUE {
 
     // Wait for all the operations in the queue to finish
     alpaka::wait(queue);
-
   }
 
   template <uint8_t Ndim>

include/CLUEstering/DataFormats/alpaka/AssociationMap.hpp

@@ -321,7 +321,6 @@ namespace clue {
 
     template <typename TFunc>
     ALPAKA_FN_HOST void fill(size_t size, TFunc func, Queue queue) {
-	  std::cout << "nbins = " << m_size << std::endl;
       auto bin_buffer = make_device_buffer<uint32_t[]>(queue, size);
 
 	  const auto dev = alpaka::getDev(queue);

include/CLUEstering/DataFormats/alpaka/TilesAlpaka.hpp

@@ -41,8 +41,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE_CLUE {
     CoordinateExtremes<Ndim>* minmax;
     float* tilesizes;
     size_t npoints;
-    size_t ntiles;
-    size_t nperdim;
+    int32_t ntiles;
+    int32_t nperdim;
 
     ALPAKA_FN_ACC inline constexpr const float* minMax() const { return minmax; }
     ALPAKA_FN_ACC inline constexpr float* minMax() { return minmax; }
@@ -57,7 +57,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE_CLUE {
       int coord_bin{(int)((coord - minmax->min(dim)) / tilesizes[dim])};
 
       // Address the cases of underflow and overflow
-      coord_bin = alpaka::math::min(acc, (size_t)coord_bin, nperdim - 1);
+      coord_bin = alpaka::math::min(acc, coord_bin, nperdim - 1);
       coord_bin = alpaka::math::max(acc, coord_bin, 0);
 
       return coord_bin;
@@ -111,7 +111,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE_CLUE {
   template <uint8_t Ndim>
   class TilesAlpaka {
   public:
-    TilesAlpaka(Queue queue, uint32_t n_points, uint32_t n_perdim, uint32_t n_tiles)
+    TilesAlpaka(Queue queue, uint32_t n_points, int32_t n_perdim, uint32_t n_tiles)
         : m_ntiles{n_tiles},
           m_nperdim{n_perdim},
           m_minmax{clue::make_device_buffer<CoordinateExtremes<Ndim>>(queue)},
@@ -125,7 +125,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE_CLUE {
       host_view->tilesizes = m_tilesizes.data();
       host_view->npoints = n_points;
       host_view->ntiles = n_tiles;
-	  host_view->nperdim = n_perdim;
+      host_view->nperdim = n_perdim;
 
       alpaka::memcpy(queue, m_view, host_view);
     }
@@ -137,27 +137,25 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE_CLUE {
       m_assoc.initialize(size, nbins, queue);
     }
 
-	struct GetGlobalBin {
-	  PointsAlpaka<Ndim>::PointsAlpakaView* pointsView;
-	  TilesAlpakaView<Ndim>* tilesView;
+    struct GetGlobalBin {
+      PointsAlpaka<Ndim>::PointsAlpakaView* pointsView;
+      TilesAlpakaView<Ndim>* tilesView;
 
-	  template <typename TAcc>
-	  ALPAKA_FN_ACC uint32_t operator()(const TAcc& acc, uint32_t index) const {
+      template <typename TAcc>
+      ALPAKA_FN_ACC uint32_t operator()(const TAcc& acc, uint32_t index) const {
         float coords[Ndim];
         for (auto dim = 0; dim < Ndim; ++dim) {
           coords[dim] = pointsView->coords[index + dim * pointsView->n];
         }
 
-		auto bin = tilesView->getGlobalBin(acc, coords);
+        auto bin = tilesView->getGlobalBin(acc, coords);
         return bin;
-	  }
-	};
+      }
+    };
 
-    ALPAKA_FN_HOST void fill(Queue queue,
-                             PointsAlpaka<Ndim>& d_points,
-                             size_t size) {
+    ALPAKA_FN_HOST void fill(Queue queue, PointsAlpaka<Ndim>& d_points, size_t size) {
       auto dev = alpaka::getDev(queue);
-	  auto pointsView = d_points.view();
+      auto pointsView = d_points.view();
       m_assoc.fill(size, GetGlobalBin{pointsView, m_view.data()}, queue);
     }
 
@@ -176,7 +174,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE_CLUE {
     ALPAKA_FN_HOST inline constexpr void clear(const Queue& queue) {}
 
     ALPAKA_FN_HOST clue::device_view<Device, uint32_t[]> indexes(const Device& dev,
-                                                            size_t assoc_id) {
+                                                                 size_t assoc_id) {
       return m_assoc.indexes(dev, assoc_id);
     }
 
@@ -185,8 +183,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE_CLUE {
     clue::device_buffer<Device, CoordinateExtremes<Ndim>> m_minmax;
     clue::device_buffer<Device, float[Ndim]> m_tilesizes;
     clue::device_buffer<Device, TilesAlpakaView<Ndim>> m_view;
-    uint32_t m_ntiles;
-    uint32_t m_nperdim;
+    int32_t m_ntiles;
+    int32_t m_nperdim;
   };
 
 }  // namespace ALPAKA_ACCELERATOR_NAMESPACE_CLUE