Skip to content

Commit 2cc2ede

Browse files
committed
fixes
1 parent ef33827 commit 2cc2ede

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

include/CLUEstering/core/detail/Clusterer.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ namespace clue {
162162
alpaka::wait(queue);
163163

164164
const auto n_points = h_points.size();
165-
std::cout << "ntiles = " << m_tiles->view().ntiles << std::endl;
166165
m_tiles->template fill_batch<Acc>(queue, dev_points, n_points, d_event_offsets, max_event_size);
167166

168167
detail::computeLocalDensityBatched<internal::Acc2D>(queue,

include/CLUEstering/core/detail/ClusteringKernels.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ namespace clue::detail {
399399
std::size_t max_event_size,
400400
std::size_t block_size) {
401401
const auto blocks_per_event = divide_up_by(max_event_size, block_size);
402-
const auto batch_size = event_offsets.size() - 1;
402+
const auto batch_size = alpaka::getExtents(event_offsets)[0] - 1;
403403
const Idx grid_size = clue::divide_up_by(max_event_size, block_size);
404404
const auto work_division =
405405
make_workdiv<internal::Acc2D>({batch_size, blocks_per_event}, {1, block_size});
@@ -452,7 +452,7 @@ namespace clue::detail {
452452
alpaka::memset(queue, d_seed_candidates, 0u);
453453

454454
const auto blocks_per_event = divide_up_by(max_event_size, block_size);
455-
const auto batch_size = event_offsets.size() - 1;
455+
const auto batch_size = alpaka::getExtents(event_offsets)[0] - 1;
456456
const Idx grid_size = clue::divide_up_by(max_event_size, block_size);
457457
const auto work_division =
458458
make_workdiv<internal::Acc2D>({batch_size, blocks_per_event}, {1, block_size});

include/CLUEstering/data_structures/detail/AssociationMap.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ namespace clue {
445445

446446
const auto blocksize = 256;
447447
const auto blocks_per_event = divide_up_by(max_event_size, blocksize);
448-
const auto batch_size = event_offsets.size() - 1;
448+
const auto batch_size = alpaka::getExtents(event_offsets)[0] - 1;
449449
const auto batch_workdiv =
450450
make_workdiv<internal::Acc2D>({batch_size, blocks_per_event}, {1, blocksize});
451451
alpaka::exec<internal::Acc2D>(queue,

tests/test_batched_clustering.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ TEST_CASE("Test batched clustering with fixed batch size") {
1919

2020
std::vector<std::size_t> event_sizes(10, batch_size);
2121
algo.make_clusters(queue, h_points, d_points, event_sizes, clue::FlatKernel{.5f});
22+
alpaka::wait(queue);
2223

2324
auto truth = clue::read_output<2>(queue, "../../../data/truth_files/data_1024_truth.csv");
2425
auto truth_n_clusters = clue::detail::compute_nclusters(truth.clusterIndexes());

0 commit comments

Comments
 (0)