Fix conflict

Author: beomki-yeo

.github/check_duplicate_cu_files.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+! [[ $(find device tests -name "*\.cu" | xargs -I {} basename {} | sort | uniq -d) ]]
+exit $?

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v10.0.1
+    rev: v18.1.8
     hooks:
       - id: clang-format
         types_or: [file]
@@ -29,3 +29,11 @@ repos:
         name: Check taboo code patterns
         language: system
         entry: .github/check_taboos.sh
+
+  - repo: local
+    hooks:
+      - id: check_duplicate_cu_files
+        name: Check duplicate .cu file names
+        language: system
+        entry: .github/check_duplicate_cu_files.sh
+        pass_filenames: false

CMakeLists.txt

@@ -6,7 +6,7 @@
 
 # Set up the project.
 cmake_minimum_required( VERSION 3.25 )
-project( traccc VERSION 0.22.0 LANGUAGES CXX )
+project( traccc VERSION 0.24.0 LANGUAGES CXX )
 
 # Set up the used C++ standard(s).
 set( CMAKE_CXX_STANDARD 20 CACHE STRING "The (host) C++ standard to use" )

CMakePresets.json

@@ -89,6 +89,42 @@
             "TRACCC_BUILD_ALPAKA" : "TRUE"
          }
       },
+      {
+         "name" : "alpaka-fp32-cuda",
+         "displayName" : "Alpaka CUDA FP32 Code Development",
+         "inherits": ["alpaka-fp32", "cuda-fp32"],
+         "cacheVariables": {
+            "alpaka_ACC_GPU_CUDA_ENABLE" : "TRUE"
+         }
+      },
+      {
+         "name" : "alpaka-fp64-cuda",
+         "displayName" : "Alpaka CUDA FP64 Code Development",
+         "inherits": ["alpaka-fp64", "cuda-fp64"],
+         "cacheVariables": {
+            "alpaka_ACC_GPU_CUDA_ENABLE" : "TRUE"
+         }
+      },
+      {
+         "name": "alpaka-fp32-hip",
+         "displayName": "Alpaka HIP FP32 Code Development",
+         "inherits": ["alpaka-fp32"],
+         "cacheVariables": {
+            "alpaka_ACC_GPU_HIP_ENABLE" : "TRUE",
+            "TRACCC_BUILD_HIP": "ON",
+            "TRACCC_SETUP_ROCTHRUST": "ON"
+         }
+      },
+      {
+         "name": "alpaka-fp64-hip",
+         "displayName": "Alpaka HIP FP64 Code Development",
+         "inherits": ["alpaka-fp64"],
+         "cacheVariables": {
+            "alpaka_ACC_GPU_HIP_ENABLE" : "TRUE",
+            "TRACCC_BUILD_HIP": "ON",
+            "TRACCC_SETUP_ROCTHRUST": "ON"
+         }
+      },
       {
          "name" : "kokkos-fp32",
          "displayName" : "Kokkos FP32 Code Development",

README.md

@@ -4,17 +4,17 @@ Demonstrator tracking chain for accelerators.
 
 ## Features
 
-| Category           | Algorithms             | CPU | CUDA | SYCL | Alpaka | Kokkos | Futhark |
-| ------------------ | ---------------------- | --- | ---- | ---- | ------ | ------ | ------- |
-| **Clusterization** | CCL / FastSv / etc.    | ✅  | ✅   | ✅   | 🟡     | ⚪     | ✅      |
-|                    | Measurement creation   | ✅  | ✅   | ✅   | 🟡     | ⚪     | ✅      |
-| **Seeding**        | Spacepoint formation   | ✅  | ✅   | ✅   | 🟡     | ⚪     | ⚪      |
-|                    | Spacepoint binning     | ✅  | ✅   | ✅   | ✅     | ✅     | ⚪      |
-|                    | Seed finding           | ✅  | ✅   | ✅   | ✅     | ⚪     | ⚪      |
-|                    | Track param estimation | ✅  | ✅   | ✅   | ✅     | ⚪     | ⚪      |
-| **Track finding**  | Combinatorial KF       | ✅  | ✅   | ✅   | 🟡     | ⚪     | ⚪      |
-| **Ambiguity resolution**  | Greedy resolver   | ✅  | 🟡   |  ⚪  | ⚪     | ⚪     | ⚪      |
-| **Track fitting**  | KF                     | ✅  | ✅   | 🟡   | ⚪     | ⚪     | ⚪      |
+| Category                  | Algorithms             | CPU | CUDA | SYCL | Alpaka | Kokkos | Futhark |
+| ------------------------- | ---------------------- | --- | ---- | ---- | ------ | ------ | ------- |
+| **Clusterization**        | CCL / FastSv / etc.    | ✅  | ✅   | ✅   | ✅     | ⚪     | ✅      |
+|                           | Measurement creation   | ✅  | ✅   | ✅   | ✅     | ⚪     | ✅      |
+| **Seeding**               | Spacepoint formation   | ✅  | ✅   | ✅   | ✅     | ⚪     | ⚪      |
+|                           | Spacepoint binning     | ✅  | ✅   | ✅   | ✅     | ✅     | ⚪      |
+|                           | Seed finding           | ✅  | ✅   | ✅   | ✅     | ⚪     | ⚪      |
+|                           | Track param estimation | ✅  | ✅   | ✅   | ✅     | ⚪     | ⚪      |
+| **Track finding**         | Combinatorial KF       | ✅  | ✅   | ✅   | ✅     | ⚪     | ⚪      |
+| **Ambiguity resolution**  | Greedy resolver        | ✅  | 🟡   | ⚪   | ⚪     | ⚪     | ⚪      |
+| **Track fitting**         | KF                     | ✅  | ✅   | 🟡   | ✅     | ⚪     | ⚪      |
 
 ✅: exists, 🟡: work started, ⚪: work not started yet
 
@@ -272,7 +272,6 @@ cmake --build build/
    --detector-file=geometries/odd/odd-detray_geometry_detray.json \
    --material-file=geometries/odd/odd-detray_material_detray.json \
    --grid-file=geometries/odd/odd-detray_surface_grids_detray.json \
-   --use-detray-detector \
    --digitization-file=geometries/odd/odd-digi-geometric-config.json \
    --use-acts-geom-source --input-directory=odd/geant4_10muon_10GeV/ \
    --input-events=10
@@ -281,7 +280,6 @@ cmake --build build/
    --detector-file=geometries/odd/odd-detray_geometry_detray.json \
    --material-file=geometries/odd/odd-detray_material_detray.json \
    --grid-file=geometries/odd/odd-detray_surface_grids_detray.json \
-   --use-detray-detector \
    --digitization-file=geometries/odd/odd-digi-geometric-config.json \
    --use-acts-geom-source --input-directory=odd/geant4_10muon_10GeV/ \
    --input-events=10 --processed-events=1000 --threads=1

benchmarks/cpu/toy_detector_cpu.cpp

@@ -17,7 +17,6 @@
 
 // Traccc IO include(s).
 #include "traccc/io/read_detector.hpp"
-#include "traccc/io/read_geometry.hpp"
 #include "traccc/io/read_measurements.hpp"
 #include "traccc/io/read_spacepoints.hpp"
 

benchmarks/cuda/toy_detector_cuda.cpp

@@ -15,7 +15,6 @@
 #include "traccc/fitting/kalman_filter/kalman_fitter.hpp"
 #include "traccc/geometry/detector.hpp"
 #include "traccc/io/read_detector.hpp"
-#include "traccc/io/read_geometry.hpp"
 #include "traccc/io/read_measurements.hpp"
 #include "traccc/io/read_spacepoints.hpp"
 #include "traccc/utils/propagation.hpp"
@@ -69,14 +68,10 @@ BENCHMARK_DEFINE_F(ToyDetectorBenchmark, CUDA)(benchmark::State& state) {
                                                           async_copy, stream);
 
     // Copy detector to device
-    auto det_buffer = detray::get_buffer(det, device_mr, copy);
+    const auto det_buffer = detray::get_buffer(det, device_mr, copy);
     // Detector view object
     auto det_view = detray::get_data(det_buffer);
 
-    // D2H copy object
-    traccc::device::container_d2h_copy_alg<traccc::track_state_container_types>
-        track_state_d2h{{device_mr, &host_mr}, copy};
-
     for (auto _ : state) {
 
         state.PauseTiming();
@@ -129,7 +124,7 @@ BENCHMARK_DEFINE_F(ToyDetectorBenchmark, CUDA)(benchmark::State& state) {
                                params_cuda_buffer);
 
             // Run track fitting
-            traccc::track_state_container_types::buffer
+            traccc::edm::track_fit_container<traccc::default_algebra>::buffer
                 track_states_cuda_buffer = device_fitting(
                     det_view, field,
                     {track_candidates_cuda_buffer, measurements_cuda_buffer});

cmake/traccc-compiler-options-cuda.cmake

@@ -25,7 +25,7 @@ endif()
 
 # Allow to use functions in device code that are constexpr, even if they are
 # not marked with __device__.
-traccc_add_flag( CMAKE_CUDA_FLAGS "--expt-relaxed-constexpr" )
+traccc_add_flag( CMAKE_CUDA_FLAGS "--expt-relaxed-constexpr --use_fast_math" )
 
 # Make CUDA generate debug symbols for the device code as well in a debug
 # build.

core/CMakeLists.txt

@@ -21,10 +21,11 @@ traccc_add_library( traccc_core core TYPE SHARED
   "include/traccc/edm/details/device_container.hpp"
   "include/traccc/edm/details/host_container.hpp"
   "include/traccc/edm/measurement.hpp"
+  "include/traccc/edm/measurement_helpers.hpp"
+  "include/traccc/edm/impl/measurement_helpers.ipp"
   "include/traccc/edm/particle.hpp"
   "include/traccc/edm/track_parameters.hpp"
   "include/traccc/edm/container.hpp"
-  "include/traccc/edm/track_state.hpp"
   "include/traccc/edm/silicon_cell_collection.hpp"
   "include/traccc/edm/impl/silicon_cell_collection.ipp"
   "include/traccc/edm/silicon_cluster_collection.hpp"
@@ -35,6 +36,12 @@ traccc_add_library( traccc_core core TYPE SHARED
   "include/traccc/edm/track_candidate_collection.hpp"
   "include/traccc/edm/impl/track_candidate_collection.ipp"
   "include/traccc/edm/track_candidate_container.hpp"
+  "include/traccc/edm/track_state_collection.hpp"
+  "include/traccc/edm/impl/track_state_collection.ipp"
+  "include/traccc/edm/track_state_helpers.hpp"
+  "include/traccc/edm/impl/track_state_helpers.ipp"
+  "include/traccc/edm/track_fit_outcome.hpp"
+  "include/traccc/edm/track_fit_collection.hpp"
   # Magnetic field description.
   "include/traccc/bfield/magnetic_field_types.hpp"
   "include/traccc/bfield/magnetic_field.hpp"

core/include/traccc/bfield/magnetic_field.hpp

@@ -13,6 +13,7 @@
 
 // System include(s).
 #include <any>
+#include <sstream>
 
 namespace traccc {
 
@@ -64,12 +65,55 @@ class magnetic_field {
     template <covfie::concepts::field_backend bfield_backend_t>
     const covfie::field<bfield_backend_t>& as_field() const;
 
+    /// @brief Return type information about the contained magnetic field.
+    const std::type_info& type() const { return m_field.type(); }
+
     private:
     /// The actualy covfie b-field object
     std::any m_field;
 
 };  // class magnetic_field
 
+/// @brief Helper function for `bfield_visitor`
+template <typename callable_t, typename bfield_t, typename... bfield_ts>
+auto magnetic_field_visitor_helper(const magnetic_field& bfield,
+                                   callable_t&& callable,
+                                   std::tuple<bfield_t, bfield_ts...>*)
+    requires(covfie::concepts::field_backend<bfield_t> &&
+             (covfie::concepts::field_backend<bfield_ts> && ...))
+{
+    if (bfield.is<bfield_t>()) {
+        return callable(bfield.as_view<bfield_t>());
+    } else {
+        if constexpr (sizeof...(bfield_ts) > 0) {
+            return magnetic_field_visitor_helper(
+                bfield, std::forward<callable_t>(callable),
+                static_cast<std::tuple<bfield_ts...>*>(nullptr));
+        } else {
+            std::stringstream exception_message;
+
+            exception_message
+                << "Invalid B-field type (" << bfield.type().name()
+                << ") received, but this type is not supported" << std::endl;
+
+            throw std::invalid_argument(exception_message.str());
+        }
+    }
+}
+
+/// @brief Visitor for polymorphic magnetic field types
+///
+/// This function takes a list of supported magnetic field types and checks
+/// if the provided field is one of them. If it is, it will call the provided
+/// callable on a view of it and otherwise it will throw an exception.
+template <typename bfield_list_t, typename callable_t>
+auto magnetic_field_visitor(const magnetic_field& bfield,
+                            callable_t&& callable) {
+    return magnetic_field_visitor_helper(bfield,
+                                         std::forward<callable_t>(callable),
+                                         static_cast<bfield_list_t*>(nullptr));
+}
+
 }  // namespace traccc
 
 // Include the implementation.