Remove material interaction application kernel

core/CMakeLists.txt

@@ -82,7 +82,6 @@ traccc_add_library( traccc_core core TYPE SHARED
   "include/traccc/finding/candidate_link.hpp"
   "include/traccc/finding/finding_config.hpp"
   "include/traccc/finding/actors/ckf_aborter.hpp"
-  "include/traccc/finding/actors/interaction_register.hpp"
   "include/traccc/finding/details/combinatorial_kalman_filter_types.hpp"
   "include/traccc/finding/details/combinatorial_kalman_filter.hpp"
   "include/traccc/finding/combinatorial_kalman_filter_algorithm.hpp"

core/include/traccc/finding/details/combinatorial_kalman_filter_types.hpp

@@ -11,7 +11,6 @@
 #include "traccc/definitions/common.hpp"
 #include "traccc/definitions/primitives.hpp"
 #include "traccc/finding/actors/ckf_aborter.hpp"
-#include "traccc/finding/actors/interaction_register.hpp"
 
 // Detray include(s).
 #include "traccc/utils/propagation.hpp"
@@ -40,7 +39,6 @@ using ckf_interactor_t =
 using ckf_actor_chain_t =
     detray::actor_chain<detray::pathlimit_aborter<traccc::scalar>,
                         detray::parameter_transporter<traccc::default_algebra>,
-                        interaction_register<ckf_interactor_t>,
                         ckf_interactor_t,
                         detray::parameter_resetter<traccc::default_algebra>,
                         detray::momentum_aborter<traccc::scalar>, ckf_aborter>;

device/alpaka/src/finding/combinatorial_kalman_filter.hpp

@@ -17,10 +17,8 @@
 #include "traccc/edm/measurement_collection.hpp"
 #include "traccc/edm/track_container.hpp"
 #include "traccc/finding/actors/ckf_aborter.hpp"
-#include "traccc/finding/actors/interaction_register.hpp"
 #include "traccc/finding/candidate_link.hpp"
 #include "traccc/finding/details/combinatorial_kalman_filter_types.hpp"
-#include "traccc/finding/device/apply_interaction.hpp"
 #include "traccc/finding/device/barcode_surface_comparator.hpp"
 #include "traccc/finding/device/build_tracks.hpp"
 #include "traccc/finding/device/fill_finding_duplicate_removal_sort_keys.hpp"
@@ -39,20 +37,6 @@
 namespace traccc::alpaka::details {
 namespace kernels {
 
-/// Alpaka kernel functor for @c traccc::device::apply_interaction
-template <typename detector_t>
-struct apply_interaction {
-    template <typename TAcc>
-    ALPAKA_FN_ACC void operator()(
-        TAcc const& acc, const finding_config cfg,
-        const device::apply_interaction_payload<detector_t> payload) const {
-
-        const device::global_index_t globalThreadIdx =
-            ::alpaka::getIdx<::alpaka::Grid, ::alpaka::Threads>(acc)[0];
-        device::apply_interaction<detector_t>(globalThreadIdx, cfg, payload);
-    }
-};
-
 /// Alpaka kernel functor for @c traccc::device::find_tracks
 template <typename detector_t>
 struct find_tracks {
@@ -273,23 +257,6 @@ combinatorial_kalman_filter(
          step < config.max_track_candidates_per_track && n_in_params > 0;
          step++) {
 
-        /*****************************************************************
-         * Kernel2: Apply material interaction
-         ****************************************************************/
-
-        {
-            Idx blocksPerGrid =
-                (n_in_params + threadsPerBlock - 1) / threadsPerBlock;
-            auto workDiv = makeWorkDiv<Acc>(blocksPerGrid, threadsPerBlock);
-
-            ::alpaka::exec<Acc>(
-                queue, workDiv, kernels::apply_interaction<detector_t>{},
-                config,
-                device::apply_interaction_payload<detector_t>{
-                    det, n_in_params, in_params_buffer, param_liveness_buffer});
-            ::alpaka::wait(queue);
-        }
-
         /*****************************************************************
          * Kernel3: Find valid tracks
          *****************************************************************/

device/common/CMakeLists.txt

@@ -61,13 +61,11 @@ traccc_add_library( traccc_device_common device_common TYPE INTERFACE
    "include/traccc/seeding/device/estimate_track_params.hpp"
    "include/traccc/seeding/device/impl/estimate_track_params.ipp"
    # Track finding funtions(s).
-   "include/traccc/finding/device/apply_interaction.hpp"
    "include/traccc/finding/device/barcode_surface_comparator.hpp"
    "include/traccc/finding/device/build_tracks.hpp"
    "include/traccc/finding/device/find_tracks.hpp"
    "include/traccc/finding/device/fill_finding_propagation_sort_keys.hpp"
    "include/traccc/finding/device/propagate_to_next_surface.hpp"
-   "include/traccc/finding/device/impl/apply_interaction.ipp"
    "include/traccc/finding/device/impl/build_tracks.ipp"
    "include/traccc/finding/device/impl/find_tracks.ipp"
    "include/traccc/finding/device/impl/fill_finding_propagation_sort_keys.ipp"

device/cuda/CMakeLists.txt

@@ -66,7 +66,6 @@ traccc_add_library( traccc_cuda cuda TYPE SHARED
   "src/finding/combinatorial_kalman_filter_algorithm.cpp"
   "src/finding/combinatorial_kalman_filter_algorithm.cu"
   "src/finding/combinatorial_kalman_filter.cuh"
-  "src/finding/kernels/apply_interaction.hpp"
   "src/finding/kernels/fill_finding_propagation_sort_keys.cu"
   "src/finding/kernels/fill_finding_propagation_sort_keys.cuh"
   "src/finding/kernels/fill_finding_duplicate_removal_sort_keys.cu"
@@ -138,25 +137,6 @@ foreach(DETECTOR_NAME ${TRACCC_SUPPORTED_DETECTORS})
     target_sources(traccc_cuda PRIVATE ${GENERATED_SOURCE})
 endforeach()
 
-# Generate specializations for apply_interaction
-foreach(DETECTOR_NAME ${TRACCC_SUPPORTED_DETECTORS})
-    set(GENERATED_SOURCE "${CMAKE_CURRENT_BINARY_DIR}/src/finding/kernels/specializations/apply_interaction_${DETECTOR_NAME}.cu")
-    set(TEMPLATE_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/src/finding/kernels/specializations/apply_interaction.cu.template")
-    add_custom_command(
-        OUTPUT "${GENERATED_SOURCE}"
-        COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/src/finding/kernels/specializations/"
-        COMMAND
-            Python::Interpreter
-            "${KERNEL_SPECIALIZATION_PY}"
-            "${TEMPLATE_SOURCE}"
-            -o "${GENERATED_SOURCE}"
-            --detector "${DETECTOR_NAME}"
-        DEPENDS "${KERNEL_SPECIALIZATION_PY}" "${TEMPLATE_SOURCE}"
-        COMMENT "Generating kernel specialization of `apply_interaction` for ${DETECTOR_NAME}"
-    )
-    target_sources(traccc_cuda PRIVATE ${GENERATED_SOURCE})
-endforeach()
-
 # Generate specializations for propagate_to_next_surface
 foreach(DETECTOR_NAME ${TRACCC_SUPPORTED_DETECTORS})
     foreach(BFIELD_NAME ${TRACCC_CUDA_SUPPORTED_BFIELDS})

device/cuda/src/finding/combinatorial_kalman_filter.cuh

@@ -14,7 +14,6 @@
 #include "../utils/get_size.hpp"
 #include "../utils/thread_id.hpp"
 #include "../utils/utils.hpp"
-#include "./kernels/apply_interaction.hpp"
 #include "./kernels/build_tracks.cuh"
 #include "./kernels/fill_finding_duplicate_removal_sort_keys.cuh"
 #include "./kernels/fill_finding_propagation_sort_keys.cuh"
@@ -175,25 +174,6 @@ combinatorial_kalman_filter(
          step < config.max_track_candidates_per_track && n_in_params > 0;
          step++) {
 
-        /*****************************************************************
-         * Kernel2: Apply material interaction
-         ****************************************************************/
-
-        {
-            const unsigned int nThreads = warp_size * 2;
-            const unsigned int nBlocks =
-                (n_in_params + nThreads - 1) / nThreads;
-
-            apply_interaction<detector_t>(
-                nBlocks, nThreads, 0, stream, config,
-                device::apply_interaction_payload<detector_t>{
-                    .det_data = det,
-                    .n_params = n_in_params,
-                    .params_view = in_params_buffer,
-                    .params_liveness_view = param_liveness_buffer});
-            TRACCC_CUDA_ERROR_CHECK(cudaGetLastError());
-        }
-
         /*****************************************************************
          * Kernel3: Find valid tracks
          *****************************************************************/