From 9ef669067006106cd6cbb876b2910a5e3e322d23 Mon Sep 17 00:00:00 2001 From: beomki-yeo Date: Thu, 19 Oct 2023 11:45:47 +0200 Subject: [PATCH] Backup --- .../finding/device/apply_interaction.hpp | 2 +- .../traccc/finding/device/find_tracks.hpp | 2 +- .../finding/device/impl/apply_interaction.ipp | 2 +- .../finding/device/impl/find_tracks.ipp | 2 +- .../device/experimental/form_spacepoints.hpp | 3 +-- .../experimental/impl/form_spacepoints.ipp | 3 +-- .../experimental/spacepoint_formation.hpp | 4 ++-- device/cuda/src/finding/finding_algorithm.cu | 22 +++++++++---------- .../experimental/spacepoint_formation.cu | 4 ++-- .../experimental/spacepoint_formation.hpp | 4 ++-- .../experimental/spacepoint_formation.sycl | 2 +- 11 files changed, 24 insertions(+), 26 deletions(-) diff --git a/device/common/include/traccc/finding/device/apply_interaction.hpp b/device/common/include/traccc/finding/device/apply_interaction.hpp index b7ed6729df..fafd400721 100644 --- a/device/common/include/traccc/finding/device/apply_interaction.hpp +++ b/device/common/include/traccc/finding/device/apply_interaction.hpp @@ -23,7 +23,7 @@ namespace traccc::device { /// template TRACCC_DEVICE inline void apply_interaction( - std::size_t globalIndex, typename detector_t::detector_view_type det_data, + std::size_t globalIndex, typename detector_t::view_type det_data, vecmem::data::jagged_vector_view> nav_candidates_buffer, diff --git a/device/common/include/traccc/finding/device/find_tracks.hpp b/device/common/include/traccc/finding/device/find_tracks.hpp index 19faba0482..8f1ea3fb0d 100644 --- a/device/common/include/traccc/finding/device/find_tracks.hpp +++ b/device/common/include/traccc/finding/device/find_tracks.hpp @@ -38,7 +38,7 @@ namespace traccc::device { template TRACCC_DEVICE inline void find_tracks( std::size_t globalIndex, const config_t cfg, - typename detector_t::detector_view_type det_data, + typename detector_t::view_type det_data, measurement_collection_types::const_view measurements_view, vecmem::data::vector_view barcodes_view, vecmem::data::vector_view upper_bounds_view, diff --git a/device/common/include/traccc/finding/device/impl/apply_interaction.ipp b/device/common/include/traccc/finding/device/impl/apply_interaction.ipp index 472cee23c7..d7249ed786 100644 --- a/device/common/include/traccc/finding/device/impl/apply_interaction.ipp +++ b/device/common/include/traccc/finding/device/impl/apply_interaction.ipp @@ -15,7 +15,7 @@ namespace traccc::device { template TRACCC_DEVICE inline void apply_interaction( - std::size_t globalIndex, typename detector_t::detector_view_type det_data, + std::size_t globalIndex, typename detector_t::view_type det_data, vecmem::data::jagged_vector_view> nav_candidates_buffer, diff --git a/device/common/include/traccc/finding/device/impl/find_tracks.ipp b/device/common/include/traccc/finding/device/impl/find_tracks.ipp index 89ac2ae458..82e78910d7 100644 --- a/device/common/include/traccc/finding/device/impl/find_tracks.ipp +++ b/device/common/include/traccc/finding/device/impl/find_tracks.ipp @@ -18,7 +18,7 @@ namespace traccc::device { template TRACCC_DEVICE inline void find_tracks( std::size_t globalIndex, const config_t cfg, - typename detector_t::detector_view_type det_data, + typename detector_t::view_type det_data, measurement_collection_types::const_view measurements_view, vecmem::data::vector_view barcodes_view, vecmem::data::vector_view upper_bounds_view, diff --git a/device/common/include/traccc/seeding/device/experimental/form_spacepoints.hpp b/device/common/include/traccc/seeding/device/experimental/form_spacepoints.hpp index ae75da1682..599e36f087 100644 --- a/device/common/include/traccc/seeding/device/experimental/form_spacepoints.hpp +++ b/device/common/include/traccc/seeding/device/experimental/form_spacepoints.hpp @@ -18,8 +18,7 @@ namespace traccc::device::experimental { /// template TRACCC_HOST_DEVICE inline void form_spacepoints( - const std::size_t globalIndex, - typename detector_t::detector_view_type det_data, + const std::size_t globalIndex, typename detector_t::view_type det_data, measurement_collection_types::const_view measurements_view, spacepoint_collection_types::view spacepoints_view); diff --git a/device/common/include/traccc/seeding/device/experimental/impl/form_spacepoints.ipp b/device/common/include/traccc/seeding/device/experimental/impl/form_spacepoints.ipp index 54a1bb0280..5ff2134f18 100644 --- a/device/common/include/traccc/seeding/device/experimental/impl/form_spacepoints.ipp +++ b/device/common/include/traccc/seeding/device/experimental/impl/form_spacepoints.ipp @@ -14,8 +14,7 @@ namespace traccc::device::experimental { /// template TRACCC_HOST_DEVICE inline void form_spacepoints( - const std::size_t globalIndex, - typename detector_t::detector_view_type det_data, + const std::size_t globalIndex, typename detector_t::view_type det_data, measurement_collection_types::const_view measurements_view, spacepoint_collection_types::view spacepoints_view) { diff --git a/device/cuda/include/traccc/cuda/seeding/experimental/spacepoint_formation.hpp b/device/cuda/include/traccc/cuda/seeding/experimental/spacepoint_formation.hpp index a74903423c..722942271a 100644 --- a/device/cuda/include/traccc/cuda/seeding/experimental/spacepoint_formation.hpp +++ b/device/cuda/include/traccc/cuda/seeding/experimental/spacepoint_formation.hpp @@ -31,7 +31,7 @@ namespace traccc::cuda::experimental { template class spacepoint_formation : public algorithm { public: @@ -50,7 +50,7 @@ class spacepoint_formation /// @param measurements a collection of measurements /// @return a spacepoint collection (buffer) spacepoint_collection_types::buffer operator()( - const typename detector_t::detector_view_type& det_view, + const typename detector_t::view_type& det_view, const measurement_collection_types::const_view& measurements_view) const override; diff --git a/device/cuda/src/finding/finding_algorithm.cu b/device/cuda/src/finding/finding_algorithm.cu index 8824a685be..fcf0415c31 100644 --- a/device/cuda/src/finding/finding_algorithm.cu +++ b/device/cuda/src/finding/finding_algorithm.cu @@ -20,6 +20,7 @@ // detray include(s). #include "detray/core/detector.hpp" +#include "detray/detectors/bfield.hpp" #include "detray/detectors/telescope_metadata.hpp" #include "detray/detectors/toy_metadata.hpp" #include "detray/masks/unbounded.hpp" @@ -59,7 +60,7 @@ __global__ void make_barcode_sequence( /// CUDA kernel for running @c traccc::device::apply_interaction template __global__ void apply_interaction( - typename detector_t::detector_view_type det_data, + typename detector_t::view_type det_data, vecmem::data::jagged_vector_view> nav_candidates_buffer, @@ -94,7 +95,7 @@ __global__ void count_threads( /// CUDA kernel for running @c traccc::device::find_tracks template __global__ void find_tracks( - const config_t cfg, typename detector_t::detector_view_type det_data, + const config_t cfg, typename detector_t::view_type det_data, measurement_collection_types::const_view measurements_view, vecmem::data::vector_view barcodes_view, vecmem::data::vector_view upper_bounds_view, @@ -519,20 +520,19 @@ finding_algorithm::operator()( // Explicit template instantiation using toy_detector_type = - detray::detector, covfie::field_view, - detray::device_container_types>; -using toy_stepper_type = detray::rk_stepper< - covfie::field::view_t, transform3, - detray::constrained_step<>>; + detray::detector; +using toy_stepper_type = + detray::rk_stepper, + transform3, detray::constrained_step<>>; using toy_navigator_type = detray::navigator; template class finding_algorithm; using device_detector_type = detray::detector>, - covfie::field_view, detray::device_container_types>; -using rk_stepper_type = detray::rk_stepper< - covfie::field::view_t, - transform3, detray::constrained_step<>>; + detray::device_container_types>; +using rk_stepper_type = + detray::rk_stepper, + transform3, detray::constrained_step<>>; using device_navigator_type = detray::navigator; template class finding_algorithm; diff --git a/device/cuda/src/seeding/experimental/spacepoint_formation.cu b/device/cuda/src/seeding/experimental/spacepoint_formation.cu index 663f6a8487..dfd6775622 100644 --- a/device/cuda/src/seeding/experimental/spacepoint_formation.cu +++ b/device/cuda/src/seeding/experimental/spacepoint_formation.cu @@ -22,7 +22,7 @@ namespace kernels { template __global__ void form_spacepoints( - typename detector_t::detector_view_type det_data, + typename detector_t::view_type det_data, measurement_collection_types::const_view measurements_view, spacepoint_collection_types::view spacepoints_view) { @@ -41,7 +41,7 @@ spacepoint_formation::spacepoint_formation( template spacepoint_collection_types::buffer spacepoint_formation::operator()( - const typename detector_t::detector_view_type& det_view, + const typename detector_t::view_type& det_view, const measurement_collection_types::const_view& measurements_view) const { // Get a convenience variable for the stream that we'll be using. diff --git a/device/sycl/include/traccc/sycl/seeding/experimental/spacepoint_formation.hpp b/device/sycl/include/traccc/sycl/seeding/experimental/spacepoint_formation.hpp index 54ae326711..fbe939f251 100644 --- a/device/sycl/include/traccc/sycl/seeding/experimental/spacepoint_formation.hpp +++ b/device/sycl/include/traccc/sycl/seeding/experimental/spacepoint_formation.hpp @@ -31,7 +31,7 @@ namespace traccc::sycl::experimental { template class spacepoint_formation : public algorithm { public: @@ -50,7 +50,7 @@ class spacepoint_formation /// @param measurements a collection of measurements /// @return a spacepoint collection (buffer) spacepoint_collection_types::buffer operator()( - const typename detector_t::detector_view_type& det_view, + const typename detector_t::view_type& det_view, const measurement_collection_types::const_view& measurements_view) const override; diff --git a/device/sycl/src/seeding/experimental/spacepoint_formation.sycl b/device/sycl/src/seeding/experimental/spacepoint_formation.sycl index 05b4cdb252..0062f4de37 100644 --- a/device/sycl/src/seeding/experimental/spacepoint_formation.sycl +++ b/device/sycl/src/seeding/experimental/spacepoint_formation.sycl @@ -32,7 +32,7 @@ spacepoint_formation::spacepoint_formation( template spacepoint_collection_types::buffer spacepoint_formation::operator()( - const typename detector_t::detector_view_type& det_view, + const typename detector_t::view_type& det_view, const measurement_collection_types::const_view& measurements_view) const { const std::size_t n_measurements = m_copy.get_size(measurements_view);