From c18573ad1e4f4ffb06ba6f8331146339fc4e7870 Mon Sep 17 00:00:00 2001 From: beomki-yeo Date: Thu, 22 Jun 2023 15:22:33 +0200 Subject: [PATCH] Update vecmem version to v0.26.0 --- .../sycl/src/clusterization/clusterization_algorithm.sycl | 5 +++-- device/sycl/src/seeding/seed_finding.sycl | 7 +++++-- extern/vecmem/CMakeLists.txt | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/device/sycl/src/clusterization/clusterization_algorithm.sycl b/device/sycl/src/clusterization/clusterization_algorithm.sycl index 6c76d55430..68bceeb94d 100644 --- a/device/sycl/src/clusterization/clusterization_algorithm.sycl +++ b/device/sycl/src/clusterization/clusterization_algorithm.sycl @@ -20,6 +20,7 @@ // Vecmem include(s). #include #include +#include // System include(s). #include @@ -112,8 +113,8 @@ clusterization_algorithm::output_type clusterization_algorithm::operator()( // Run ccl kernel details::get_queue(m_queue) .submit([&](::sycl::handler& h) { - ::sycl::local_accessor shared_uint(3, h); - ::sycl::local_accessor shared_idx( + vecmem::sycl::local_accessor shared_uint(3, h); + vecmem::sycl::local_accessor shared_idx( 2 * max_cells_per_partition, h); h.parallel_for( diff --git a/device/sycl/src/seeding/seed_finding.sycl b/device/sycl/src/seeding/seed_finding.sycl index 7df55ac0b2..e70a74e2ea 100644 --- 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 + namespace traccc::sycl { namespace kernels { @@ -281,7 +284,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 local_mem( + vecmem::sycl::local_accessor local_mem( m_seedfilter_config.compatSeedLimit * weightUpdatingLocalSize, h); @@ -328,7 +331,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 local_mem( + vecmem::sycl::local_accessor local_mem( m_seedfilter_config.max_triplets_per_spM * seedSelectingLocalSize, h); diff --git a/extern/vecmem/CMakeLists.txt b/extern/vecmem/CMakeLists.txt index 61f9d6aced..b328ba156c 100644 --- a/extern/vecmem/CMakeLists.txt +++ b/extern/vecmem/CMakeLists.txt @@ -18,7 +18,7 @@ message( STATUS "Building VecMem as part of the TRACCC project" ) # Declare where to get VecMem from. set( TRACCC_VECMEM_SOURCE - "URL;https://github.com/acts-project/vecmem/archive/refs/tags/v0.25.0.tar.gz;URL_MD5;7fc14592c693c9853d27ca21ec528555" + "URL;https://github.com/acts-project/vecmem/archive/refs/tags/v0.26.0.tar.gz;URL_MD5;3162c26ced6bb7ce25a5873002e8a2b4" CACHE STRING "Source for VecMem, when built as part of this project" ) mark_as_advanced( TRACCC_VECMEM_SOURCE ) FetchContent_Declare( VecMem ${TRACCC_VECMEM_SOURCE} )