Removed device::combinatorial_kalman_filter_algorithm::propagate_to_next_surface_kernel_payload.

krasznaa · krasznaa · commit e0e2ca5168e5 · 2026-02-13T17:26:04.000+01:00
diff --git a/device/alpaka/include/traccc/alpaka/finding/combinatorial_kalman_filter_algorithm.hpp b/device/alpaka/include/traccc/alpaka/finding/combinatorial_kalman_filter_algorithm.hpp
@@ -132,11 +132,16 @@ class combinatorial_kalman_filter_algorithm
     /// Launch the @c propagate_to_next_surface kernel
     ///
     /// @param n_threads The number of threads to launch the kernel with
+    /// @param config The track finding configuration
+    /// @param det The detector object
+    /// @param bfield The magnetic field object
     /// @param payload The payload for the kernel
     ///
     void propagate_to_next_surface_kernel(
-        unsigned int n_threads,
-        const propagate_to_next_surface_kernel_payload& payload) const override;
+        unsigned int n_threads, const finding_config& config,
+        const detector_buffer& det, const magnetic_field& bfield,
+        const device::propagate_to_next_surface_payload& payload)
+        const override;
 
     /// Launch the @c gather_best_tips_per_measurement kernel
     ///
diff --git a/device/alpaka/src/finding/combinatorial_kalman_filter_algorithm.cpp b/device/alpaka/src/finding/combinatorial_kalman_filter_algorithm.cpp
@@ -131,13 +131,14 @@ struct propagate_to_next_surface {
     template <typename TAcc>
     ALPAKA_FN_ACC void operator()(
         TAcc const& acc, const finding_config& cfg,
-        const device::propagate_to_next_surface_payload<propagator_t, bfield_t>*
-            payload) const {
+        const typename propagator_t::detector_type::const_view_type* det_data,
+        const bfield_t& field_data,
+        const device::propagate_to_next_surface_payload& payload) const {
 
         device::global_index_t globalThreadIdx =
             ::alpaka::getIdx<::alpaka::Grid, ::alpaka::Threads>(acc)[0];
         device::propagate_to_next_surface<propagator_t, bfield_t>(
-            globalThreadIdx, cfg, *payload);
+            globalThreadIdx, cfg, *det_data, field_data, payload);
     }
 };
 
@@ -379,8 +380,9 @@ void combinatorial_kalman_filter_algorithm::sort_param_ids_by_keys(
 }
 
 void combinatorial_kalman_filter_algorithm::propagate_to_next_surface_kernel(
-    unsigned int n_threads,
-    const propagate_to_next_surface_kernel_payload& payload) const {
+    unsigned int n_threads, const finding_config& config,
+    const detector_buffer& detector, const magnetic_field& field,
+    const device::propagate_to_next_surface_payload& payload) const {
 
     // Establish the kernel launch parameters.
     const unsigned int deviceThreads = warp_size() * 2;
@@ -390,47 +392,26 @@ void combinatorial_kalman_filter_algorithm::propagate_to_next_surface_kernel(
     // Launch the kernel for the appropriate detector and magnetic field type.
     detector_buffer_magnetic_field_visitor<detector_type_list,
                                            alpaka::bfield_type_list<scalar>>(
-        payload.det, payload.field,
+        detector, field,
         [&]<typename detector_traits_t, typename bfield_view_t>(
-            const typename detector_traits_t::view& detector,
+            const typename detector_traits_t::view& det,
             const bfield_view_t& bfield) {
-            // Propagator type to use.
-            using propagator_t = traccc::details::ckf_propagator_t<
-                typename detector_traits_t::device, bfield_view_t>;
-            // Allocate the kernel's payload in host memory.
-            using payload_t =
-                device::propagate_to_next_surface_payload<propagator_t,
-                                                          bfield_view_t>;
-            const payload_t host_payload{
-                .det_data = detector,
-                .field_data = bfield,
-                .params_view = payload.params,
-                .params_liveness_view = payload.params_liveness,
-                .param_ids_view = payload.param_ids,
-                .links_view = payload.links,
-                .prev_links_idx = payload.prev_links_idx,
-                .step = payload.step,
-                .n_in_params = n_threads,
-                .tips_view = payload.tips,
-                .tip_lengths_view = payload.tip_lengths,
-                .tmp_jacobian_ptr = payload.tmp_jacobian.ptr()};
-            // Now copy it to device memory.
-            vecmem::data::vector_buffer<payload_t> device_payload(1u,
-                                                                  mr().main);
-            copy().setup(device_payload)->ignore();
-            copy()(
-                vecmem::data::vector_view<const payload_t>(1u, &host_payload),
-                device_payload)
-                ->ignore();
+            // Copy the detector data to device memory.
+            vecmem::data::vector_buffer<typename detector_traits_t::view>
+                device_det(1u, mr().main);
+            copy().setup(device_det)->ignore();
+            copy()({1u, &det}, device_det)->ignore();
 
             // Launch the kernel to propagate all active tracks to the next
             // surface.
             ::alpaka::exec<Acc>(
                 details::get_queue(queue()),
                 makeWorkDiv<Acc>(deviceBlocks, deviceThreads),
-                kernels::propagate_to_next_surface<propagator_t,
-                                                   bfield_view_t>{},
-                payload.config, device_payload.ptr());
+                kernels::propagate_to_next_surface<
+                    traccc::details::ckf_propagator_t<
+                        typename detector_traits_t::device, bfield_view_t>,
+                    bfield_view_t>{},
+                config, device_det.ptr(), bfield, payload);
         });
 }
 
diff --git a/device/common/include/traccc/finding/device/combinatorial_kalman_filter_algorithm.hpp b/device/common/include/traccc/finding/device/combinatorial_kalman_filter_algorithm.hpp
@@ -17,6 +17,7 @@
 #include "traccc/finding/device/find_tracks_payload.hpp"
 #include "traccc/finding/device/gather_best_tips_per_measurement.hpp"
 #include "traccc/finding/device/gather_measurement_votes.hpp"
+#include "traccc/finding/device/propagate_to_next_surface.hpp"
 #include "traccc/finding/device/remove_duplicates.hpp"
 #include "traccc/finding/device/update_tip_length_buffer.hpp"
 
@@ -185,42 +186,18 @@ class combinatorial_kalman_filter_algorithm
         vecmem::data::vector_view<device::sort_key>& keys,
         vecmem::data::vector_view<unsigned int>& param_ids) const = 0;
 
-    /// Payload for the @c propagate_to_next_surface_kernel function
-    struct propagate_to_next_surface_kernel_payload {
-        /// The track finding configuration
-        const finding_config& config;
-        /// The detector object
-        const detector_buffer& det;
-        /// The magnetic field object
-        const magnetic_field& field;
-        /// The vector of track parameters
-        bound_track_parameters_collection_types::view& params;
-        /// The vector of track parameter liveness values
-        vecmem::data::vector_view<unsigned int>& params_liveness;
-        /// Sorted parameter identifiers
-        const vecmem::data::vector_view<const unsigned int>& param_ids;
-        /// The vector of candidate links
-        const vecmem::data::vector_view<const candidate_link>& links;
-        /// Index in the link vector at which the current step starts
-        unsigned int prev_links_idx;
-        /// Current CKF step number
-        unsigned int step;
-        /// The vector of tips
-        vecmem::data::vector_view<unsigned int>& tips;
-        /// The number of track states per tip
-        vecmem::data::vector_view<unsigned int>& tip_lengths;
-        /// The temporary Jacobian buffer
-        vecmem::data::vector_view<bound_matrix<default_algebra>>& tmp_jacobian;
-    };
-
     /// Launch the @c propagate_to_next_surface kernel
     ///
     /// @param n_threads The number of threads to launch the kernel with
+    /// @param config The track finding configuration
+    /// @param det The detector object
+    /// @param bfield The magnetic field object
     /// @param payload The payload for the kernel
     ///
     virtual void propagate_to_next_surface_kernel(
-        unsigned int n_threads,
-        const propagate_to_next_surface_kernel_payload& payload) const = 0;
+        unsigned int n_threads, const finding_config& config,
+        const detector_buffer& det, const magnetic_field& bfield,
+        const device::propagate_to_next_surface_payload& payload) const = 0;
 
     /// Launch the @c gather_best_tips_per_measurement kernel
     ///
diff --git a/device/common/include/traccc/finding/device/impl/propagate_to_next_surface.ipp b/device/common/include/traccc/finding/device/impl/propagate_to_next_surface.ipp
@@ -1,6 +1,6 @@
 /** TRACCC library, part of the ACTS project (R&D line)
  *
- * (c) 2023-2025 CERN for the benefit of the ACTS project
+ * (c) 2023-2026 CERN for the benefit of the ACTS project
  *
  * Mozilla Public License Version 2.0
  */
@@ -21,7 +21,9 @@ namespace traccc::device {
 template <typename propagator_t, typename bfield_t>
 TRACCC_HOST_DEVICE inline void propagate_to_next_surface(
     const global_index_t globalIndex, const finding_config& cfg,
-    const propagate_to_next_surface_payload<propagator_t, bfield_t>& payload) {
+    const typename propagator_t::detector_type::const_view_type& det_data,
+    const bfield_t& field_data,
+    const propagate_to_next_surface_payload& payload) {
 
     using scalar_t = propagator_t::detector_type::scalar_type;
 
@@ -51,7 +53,7 @@ TRACCC_HOST_DEVICE inline void propagate_to_next_surface(
     vecmem::device_vector<unsigned int> tip_lengths(payload.tip_lengths_view);
 
     // Detector
-    typename propagator_t::detector_type det(payload.det_data);
+    typename propagator_t::detector_type det(det_data);
 
     // Parameters
     bound_track_parameters_collection_types::device params(payload.params_view);
@@ -69,7 +71,7 @@ TRACCC_HOST_DEVICE inline void propagate_to_next_surface(
     propagator_t propagator(prop_cfg);
 
     // Create propagator state
-    typename propagator_t::state propagation(in_par, payload.field_data, det);
+    typename propagator_t::state propagation(in_par, field_data, det);
     propagation.set_particle(
         detail::correct_particle_hypothesis(cfg.ptc_hypothesis, in_par));
     propagation._stepping
@@ -107,11 +109,13 @@ TRACCC_HOST_DEVICE inline void propagate_to_next_surface(
      * is set to the multiplicative identity.
      */
     if (cfg.run_mbf_smoother) {
-        assert(payload.tmp_jacobian_ptr != nullptr);
+        assert(payload.tmp_jacobian_view.ptr() != nullptr);
 
-        payload.tmp_jacobian_ptr[param_id] = matrix::identity<
-            bound_matrix<typename propagator_t::detector_type::algebra_type>>();
-        s1._full_jacobian_ptr = &payload.tmp_jacobian_ptr[param_id];
+        vecmem::device_vector<bound_matrix<default_algebra>> tmp_jacobian(
+            payload.tmp_jacobian_view);
+        tmp_jacobian.at(param_id) =
+            matrix::identity<bound_matrix<default_algebra>>();
+        s1._full_jacobian_ptr = &(tmp_jacobian.at(param_id));
     }
 
     s5.min_pT(static_cast<scalar_t>(cfg.min_pT));
diff --git a/device/common/include/traccc/finding/device/propagate_to_next_surface.hpp b/device/common/include/traccc/finding/device/propagate_to_next_surface.hpp
@@ -1,6 +1,6 @@
 /** TRACCC library, part of the ACTS project (R&D line)
  *
- * (c) 2023-2025 CERN for the benefit of the ACTS project
+ * (c) 2023-2026 CERN for the benefit of the ACTS project
  *
  * Mozilla Public License Version 2.0
  */
@@ -23,18 +23,7 @@ namespace traccc::device {
 
 /// (Event Data) Payload for the @c traccc::device::propagate_to_next_surface
 /// function
-template <typename propagator_t, typename bfield_t>
 struct propagate_to_next_surface_payload {
-    /**
-     * @brief View object to the tracking detector description
-     */
-    typename propagator_t::detector_type::const_view_type det_data;
-
-    /**
-     * @brief View object to the magnetic field
-     */
-    bfield_t field_data;
-
     /**
      * @brief View object to the vector of track parameters
      */
@@ -80,8 +69,7 @@ struct propagate_to_next_surface_payload {
      */
     vecmem::data::vector_view<unsigned int> tip_lengths_view;
 
-    bound_matrix<typename propagator_t::detector_type::algebra_type>*
-        tmp_jacobian_ptr;
+    vecmem::data::vector_view<bound_matrix<default_algebra> > tmp_jacobian_view;
 };
 
 /// Function for propagating the kalman-updated tracks to the next surface
@@ -93,12 +81,17 @@ struct propagate_to_next_surface_payload {
 ///
 /// @param[in] globalIndex        The index of the current thread
 /// @param[in] cfg                Track finding config object
+/// @param[in] det_data           View object to the tracking detector
+///                               description
+/// @param[in] field_data         View object to the magnetic field
 /// @param[inout] payload      The function call payload
 ///
 template <typename propagator_t, typename bfield_t>
 TRACCC_HOST_DEVICE inline void propagate_to_next_surface(
     global_index_t globalIndex, const finding_config& cfg,
-    const propagate_to_next_surface_payload<propagator_t, bfield_t>& payload);
+    const typename propagator_t::detector_type::const_view_type& det_data,
+    const bfield_t& field_data,
+    const propagate_to_next_surface_payload& payload);
 
 }  // namespace traccc::device
 
diff --git a/device/common/src/finding/combinatorial_kalman_filter_algorithm.cpp b/device/common/src/finding/combinatorial_kalman_filter_algorithm.cpp
@@ -379,18 +379,17 @@ auto combinatorial_kalman_filter_algorithm::operator()(
             }
 
             propagate_to_next_surface_kernel(
-                n_candidates, {.config = m_data->m_config,
-                               .det = det,
-                               .field = bfield,
-                               .params = in_params_buffer,
-                               .params_liveness = param_liveness_buffer,
-                               .param_ids = param_ids_buffer,
-                               .links = links_buffer,
-                               .prev_links_idx = step_to_link_idx_map[step],
-                               .step = step,
-                               .tips = tips_buffer,
-                               .tip_lengths = tip_length_buffer,
-                               .tmp_jacobian = tmp_jacobian_buffer});
+                n_candidates, m_data->m_config, det, bfield,
+                {.params_view = in_params_buffer,
+                 .params_liveness_view = param_liveness_buffer,
+                 .param_ids_view = param_ids_buffer,
+                 .links_view = links_buffer,
+                 .prev_links_idx = step_to_link_idx_map[step],
+                 .step = step,
+                 .n_in_params = n_candidates,
+                 .tips_view = tips_buffer,
+                 .tip_lengths_view = tip_length_buffer,
+                 .tmp_jacobian_view = tmp_jacobian_buffer});
         }
 
         n_in_params = n_candidates;
diff --git a/device/cuda/include/traccc/cuda/finding/combinatorial_kalman_filter_algorithm.hpp b/device/cuda/include/traccc/cuda/finding/combinatorial_kalman_filter_algorithm.hpp
@@ -132,11 +132,16 @@ class combinatorial_kalman_filter_algorithm
     /// Launch the @c propagate_to_next_surface kernel
     ///
     /// @param n_threads The number of threads to launch the kernel with
+    /// @param config The track finding configuration
+    /// @param det The detector object
+    /// @param bfield The magnetic field object
     /// @param payload The payload for the kernel
     ///
     void propagate_to_next_surface_kernel(
-        unsigned int n_threads,
-        const propagate_to_next_surface_kernel_payload& payload) const override;
+        unsigned int n_threads, const finding_config& config,
+        const detector_buffer& det, const magnetic_field& bfield,
+        const device::propagate_to_next_surface_payload& payload)
+        const override;
 
     /// Launch the @c gather_best_tips_per_measurement kernel
     ///
diff --git a/device/cuda/src/finding/combinatorial_kalman_filter_algorithm.cu b/device/cuda/src/finding/combinatorial_kalman_filter_algorithm.cu
@@ -214,8 +214,9 @@ void combinatorial_kalman_filter_algorithm::sort_param_ids_by_keys(
 }
 
 void combinatorial_kalman_filter_algorithm::propagate_to_next_surface_kernel(
-    unsigned int n_threads,
-    const propagate_to_next_surface_kernel_payload& payload) const {
+    unsigned int n_threads, const finding_config& config,
+    const detector_buffer& detector, const magnetic_field& field,
+    const device::propagate_to_next_surface_payload& payload) const {
 
     // Establish the kernel launch parameters.
     const unsigned int deviceThreads = warp_size() * 2;
@@ -225,32 +226,16 @@ void combinatorial_kalman_filter_algorithm::propagate_to_next_surface_kernel(
     // Launch the kernel for the appropriate detector and magnetic field type.
     detector_buffer_magnetic_field_visitor<detector_type_list,
                                            cuda::bfield_type_list<scalar>>(
-        payload.det, payload.field,
+        detector, field,
         [&]<typename detector_traits_t, typename bfield_view_t>(
-            const typename detector_traits_t::view& detector,
+            const typename detector_traits_t::view& det,
             const bfield_view_t& bfield) {
             propagate_to_next_surface<
                 traccc::details::ckf_propagator_t<
                     typename detector_traits_t::device, bfield_view_t>,
-                bfield_view_t>(
-                deviceBlocks, deviceThreads, 0u, details::get_stream(stream()),
-                payload.config,
-                device::propagate_to_next_surface_payload<
-                    traccc::details::ckf_propagator_t<
-                        typename detector_traits_t::device, bfield_view_t>,
-                    bfield_view_t>{
-                    .det_data = detector,
-                    .field_data = bfield,
-                    .params_view = payload.params,
-                    .params_liveness_view = payload.params_liveness,
-                    .param_ids_view = payload.param_ids,
-                    .links_view = payload.links,
-                    .prev_links_idx = payload.prev_links_idx,
-                    .step = payload.step,
-                    .n_in_params = n_threads,
-                    .tips_view = payload.tips,
-                    .tip_lengths_view = payload.tip_lengths,
-                    .tmp_jacobian_ptr = payload.tmp_jacobian.ptr()});
+                bfield_view_t>(deviceBlocks, deviceThreads, 0u,
+                               details::get_stream(stream()), config, det,
+                               bfield, payload);
         });
     TRACCC_CUDA_ERROR_CHECK(cudaGetLastError());
 }
diff --git a/device/cuda/src/finding/kernels/propagate_to_next_surface.hpp b/device/cuda/src/finding/kernels/propagate_to_next_surface.hpp
@@ -1,6 +1,6 @@
 /** TRACCC library, part of the ACTS project (R&D line)
  *
- * (c) 2023-2025 CERN for the benefit of the ACTS project
+ * (c) 2023-2026 CERN for the benefit of the ACTS project
  *
  * Mozilla Public License Version 2.0
  */
@@ -19,7 +19,9 @@ namespace traccc::cuda {
 template <typename propagator_t, typename bfield_t>
 void propagate_to_next_surface(
     const dim3& grid_size, const dim3& block_size, std::size_t shared_mem_size,
-    const cudaStream_t& stream, const finding_config cfg,
-    device::propagate_to_next_surface_payload<propagator_t, bfield_t> payload);
+    const cudaStream_t& stream, const finding_config& cfg,
+    const typename propagator_t::detector_type::const_view_type& det_data,
+    const bfield_t& field_data,
+    const device::propagate_to_next_surface_payload& payload);
 
 }  // namespace traccc::cuda
diff --git a/device/cuda/src/finding/kernels/specializations/propagate_to_next_surface.cu.template b/device/cuda/src/finding/kernels/specializations/propagate_to_next_surface.cu.template
diff --git a/device/cuda/src/finding/kernels/specializations/propagate_to_next_surface_src.cuh b/device/cuda/src/finding/kernels/specializations/propagate_to_next_surface_src.cuh
diff --git a/device/sycl/include/traccc/sycl/finding/combinatorial_kalman_filter_algorithm.hpp b/device/sycl/include/traccc/sycl/finding/combinatorial_kalman_filter_algorithm.hpp
diff --git a/device/sycl/src/finding/combinatorial_kalman_filter_algorithm.sycl b/device/sycl/src/finding/combinatorial_kalman_filter_algorithm.sycl
