Skip to content

Commit 6486a22

Browse files
committed
Made track finding work with the SYCL OpenCL backend!
1 parent d3f3fc5 commit 6486a22

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

device/sycl/src/finding/find_tracks.hpp

+7-8
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ track_candidate_container_types::buffer find_tracks(
119119
measurements.ptr() + n_measurements,
120120
uniques.begin(), uniques.begin() + n_modules,
121121
upper_bounds.begin(), measurement_sort_comp());
122+
queue.wait_and_throw();
122123

123124
/*****************************************************************
124125
* Kernel1: Create barcode sequence
@@ -242,7 +243,7 @@ track_candidate_container_types::buffer find_tracks(
242243
shared_num_candidates(nFindTracksThreads, h);
243244
vecmem::sycl::local_accessor<
244245
std::pair<unsigned int, unsigned int>>
245-
shared_candidates(nFindTracksThreads, h);
246+
shared_candidates(2 * nFindTracksThreads, h);
246247
vecmem::sycl::local_accessor<unsigned int>
247248
shared_candidates_size(1, h);
248249

@@ -331,13 +332,10 @@ track_candidate_container_types::buffer find_tracks(
331332
keys_buffer);
332333
vecmem::device_vector<unsigned int> param_ids_device(
333334
param_ids_buffer);
334-
auto zipped_first = oneapi::dpl::make_zip_iterator(
335-
keys_device.begin(), param_ids_device.begin());
336-
oneapi::dpl::sort(
337-
policy, zipped_first, zipped_first + keys_device.size(),
338-
[](auto lhs, auto rhs) {
339-
return std::get<0>(lhs) < std::get<0>(rhs);
340-
});
335+
oneapi::dpl::sort_by_key(policy, keys_device.begin(),
336+
keys_device.end(),
337+
param_ids_device.begin());
338+
queue.wait_and_throw();
341339
}
342340

343341
/*****************************************************************
@@ -415,6 +413,7 @@ track_candidate_container_types::buffer find_tracks(
415413
oneapi::dpl::copy(policy, in.begin(),
416414
in.begin() + n_candidates_per_step[it], out.begin());
417415
}
416+
queue.wait_and_throw();
418417

419418
/*****************************************************************
420419
* Kernel6: Build tracks

0 commit comments

Comments
 (0)