Use span<const int> in getClusters and validation

cms-patatrack · Feb 26, 2025 · f7e1d55 · f7e1d55
1 parent 0edb1b9
commit f7e1d55
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/benchmark/profiling/main.cpp b/benchmark/profiling/main.cpp
@@ -28,6 +28,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE_CLUE {
 
     const std::size_t block_size{256};
     algo.make_clusters(h_points, d_points, FlatKernel{.5f}, queue_, block_size);
+	auto clusters = algo.getClusters(h_points);
   }
 };  // namespace ALPAKA_ACCELERATOR_NAMESPACE_CLUE
 

diff --git a/include/CLUEstering/CLUEstering.hpp b/include/CLUEstering/CLUEstering.hpp
@@ -275,7 +275,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE_CLUE {
   template <uint8_t Ndim>
   std::vector<std::vector<int>> CLUEAlgoAlpaka<Ndim>::getClusters(
       const PointsSoA<Ndim>& h_points) {
-    std::span<int> cluster_ids{h_points.clusterIndexes(), h_points.nPoints()};
+    std::span<const int> cluster_ids{h_points.clusterIndexes(), h_points.nPoints()};
     return clue::compute_clusters_points(cluster_ids);
   }
 

diff --git a/include/CLUEstering/utility/validation.hpp b/include/CLUEstering/utility/validation.hpp
@@ -5,11 +5,11 @@
 
 namespace clue {
 
-  int compute_nclusters(std::span<int> cluster_ids) {
+  int compute_nclusters(std::span<const int> cluster_ids) {
     return *std::ranges::max_element(cluster_ids) + 1;
   }
 
-  std::vector<std::vector<int>> compute_clusters_points(std::span<int> cluster_ids) {
+  std::vector<std::vector<int>> compute_clusters_points(std::span<const int> cluster_ids) {
     const auto nclusters = compute_nclusters(cluster_ids);
     std::vector<std::vector<int>> clusters_points(nclusters);
 
@@ -21,7 +21,7 @@ namespace clue {
     return clusters_points;
   }
 
-  std::vector<int> compute_clusters_size(std::span<int> cluster_ids) {
+  std::vector<int> compute_clusters_size(std::span<const int> cluster_ids) {
     const auto nclusters = compute_nclusters(cluster_ids);
     const auto clusters_points = compute_clusters_points(cluster_ids);
 
@@ -32,7 +32,7 @@ namespace clue {
     return clusters;
   }
 
-  bool validate_results(std::span<int> cluster_ids, std::span<int> truth) {
+  bool validate_results(std::span<int> cluster_ids, std::span<const int> truth) {
     auto result_clusters_sizes = compute_clusters_size(cluster_ids);
     auto truth_clusters_sizes = compute_clusters_size(truth);
     std::ranges::sort(result_clusters_sizes);