Merge pull request #425 from beomki-yeo/update-vecmem

Use `vecmem::sycl::local_accessor`
acts-project · Jun 22, 2023 · 19e1f8f · 19e1f8f
2 parents 48ad5a3 + ba0c6cc
commit 19e1f8f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/device/sycl/src/clusterization/clusterization_algorithm.sycl b/device/sycl/src/clusterization/clusterization_algorithm.sycl
@@ -20,6 +20,7 @@
 // Vecmem include(s).
 #include <vecmem/memory/device_atomic_ref.hpp>
 #include <vecmem/utils/sycl/copy.hpp>
+#include <vecmem/utils/sycl/local_accessor.hpp>
 
 // System include(s).
 #include <algorithm>
@@ -117,8 +118,8 @@ clusterization_algorithm::output_type clusterization_algorithm::operator()(
     // Run ccl kernel
     details::get_queue(m_queue)
         .submit([&](::sycl::handler& h) {
-            ::sycl::local_accessor<unsigned int> shared_uint(3, h);
-            ::sycl::local_accessor<index_t> shared_idx(
+            vecmem::sycl::local_accessor<unsigned int> shared_uint(3, h);
+            vecmem::sycl::local_accessor<index_t> shared_idx(
                 2 * max_cells_per_partition, h);
 
             h.parallel_for<kernels::ccl_kernel>(

diff --git a/device/sycl/src/seeding/seed_finding.sycl b/device/sycl/src/seeding/seed_finding.sycl
@@ -31,6 +31,9 @@
 #include "traccc/seeding/device/select_seeds.hpp"
 #include "traccc/seeding/device/update_triplet_weights.hpp"
 
+// VecMem include(s).
+#include <vecmem/utils/sycl/local_accessor.hpp>
+
 namespace traccc::sycl {
 namespace kernels {
 
@@ -294,7 +297,7 @@ seed_finding::output_type seed_finding::operator()(
         details::get_queue(m_queue).submit([&](::sycl::handler& h) {
             // Array for temporary storage of triplet weights for comparing
             // within kernel
-            ::sycl::local_accessor<scalar> local_mem(
+            vecmem::sycl::local_accessor<scalar> local_mem(
                 m_seedfilter_config.compatSeedLimit * weightUpdatingLocalSize,
                 h);
 
@@ -341,7 +344,7 @@ seed_finding::output_type seed_finding::operator()(
         .submit([&](::sycl::handler& h) {
             // Array for temporary storage of triplets for comparing within
             // kernel
-            ::sycl::local_accessor<triplet> local_mem(
+            vecmem::sycl::local_accessor<triplet> local_mem(
                 m_seedfilter_config.max_triplets_per_spM *
                     seedSelectingLocalSize,
                 h);