Backup

beomki-yeo · Oct 18, 2023 · b4dd7ec · b4dd7ec
1 parent 67c1498
commit b4dd7ec
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 22 deletions.
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
@@ -12,7 +12,7 @@ namespace traccc::device {
 template <typename propagator_t, typename config_t>
 TRACCC_DEVICE inline void propagate_to_next_surface(
     std::size_t globalIndex, const config_t cfg,
-    typename propagator_t::detector_type::detector_view_type det_data,
+    typename propagator_t::detector_type::view_type det_data,
     vecmem::data::jagged_vector_view<typename propagator_t::intersection_type>
         nav_candidates_buffer,
     bound_track_parameters_collection_types::const_view in_params_view,

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
@@ -38,7 +38,7 @@ namespace traccc::device {
 template <typename propagator_t, typename config_t>
 TRACCC_DEVICE inline void propagate_to_next_surface(
     std::size_t globalIndex, const config_t cfg,
-    typename propagator_t::detector_type::detector_view_type det_data,
+    typename propagator_t::detector_type::view_type det_data,
     vecmem::data::jagged_vector_view<typename propagator_t::intersection_type>
         nav_candidates_buffer,
     bound_track_parameters_collection_types::const_view in_params_view,

diff --git a/device/cuda/include/traccc/cuda/finding/finding_algorithm.hpp b/device/cuda/include/traccc/cuda/finding/finding_algorithm.hpp
@@ -37,7 +37,7 @@ namespace traccc::cuda {
 template <typename stepper_t, typename navigator_t>
 class finding_algorithm
     : public algorithm<track_candidate_container_types::buffer(
-          const typename navigator_t::detector_type::detector_view_type&,
+          const typename navigator_t::detector_type::view_type&,
           const vecmem::data::jagged_vector_view<
               typename navigator_t::intersection_type>&,
           const typename measurement_collection_types::view&,
@@ -85,7 +85,7 @@ class finding_algorithm
     /// @param navigation_buffer  Buffer for navigation candidates
     /// @param seeds     Input seeds
     track_candidate_container_types::buffer operator()(
-        const typename detector_type::detector_view_type& det_view,
+        const typename detector_type::view_type& det_view,
         const vecmem::data::jagged_vector_view<
             typename navigator_t::intersection_type>& navigation_buffer,
         const typename measurement_collection_types::view& measurements,

diff --git a/device/cuda/include/traccc/cuda/fitting/fitting_algorithm.hpp b/device/cuda/include/traccc/cuda/fitting/fitting_algorithm.hpp
@@ -27,7 +27,7 @@ namespace traccc::cuda {
 template <typename fitter_t>
 class fitting_algorithm
     : public algorithm<track_state_container_types::buffer(
-          const typename fitter_t::detector_type::detector_view_type&,
+          const typename fitter_t::detector_type::view_type&,
           const vecmem::data::jagged_vector_view<
               typename fitter_t::intersection_type>&,
           const typename track_candidate_container_types::const_view&)> {
@@ -45,7 +45,7 @@ class fitting_algorithm
 
     /// Run the algorithm
     track_state_container_types::buffer operator()(
-        const typename fitter_t::detector_type::detector_view_type& det_view,
+        const typename fitter_t::detector_type::view_type& det_view,
         const vecmem::data::jagged_vector_view<
             typename fitter_t::intersection_type>& navigation_buffer,
         const typename track_candidate_container_types::const_view&

diff --git a/device/cuda/src/finding/finding_algorithm.cu b/device/cuda/src/finding/finding_algorithm.cu
@@ -118,7 +118,7 @@ __global__ void find_tracks(
 template <typename propagator_t, typename config_t>
 __global__ void propagate_to_next_surface(
     const config_t cfg,
-    typename propagator_t::detector_type::detector_view_type det_data,
+    typename propagator_t::detector_type::view_type det_data,
     vecmem::data::jagged_vector_view<typename propagator_t::intersection_type>
         nav_candidates_buffer,
     bound_track_parameters_collection_types::const_view in_params_view,
@@ -172,7 +172,7 @@ finding_algorithm<stepper_t, navigator_t>::finding_algorithm(
 template <typename stepper_t, typename navigator_t>
 track_candidate_container_types::buffer
 finding_algorithm<stepper_t, navigator_t>::operator()(
-    const typename detector_type::detector_view_type& det_view,
+    const typename detector_type::view_type& det_view,
     const vecmem::data::jagged_vector_view<
         typename navigator_t::intersection_type>& navigation_buffer,
     const typename measurement_collection_types::view& measurements,

diff --git a/device/cuda/src/fitting/fitting_algorithm.cu b/device/cuda/src/fitting/fitting_algorithm.cu
@@ -55,7 +55,7 @@ fitting_algorithm<fitter_t>::fitting_algorithm(
 
 template <typename fitter_t>
 track_state_container_types::buffer fitting_algorithm<fitter_t>::operator()(
-    const typename fitter_t::detector_type::detector_view_type& det_view,
+    const typename fitter_t::detector_type::view_type& det_view,
     const vecmem::data::jagged_vector_view<
         typename fitter_t::intersection_type>& navigation_buffer,
     const typename track_candidate_container_types::const_view&

diff --git a/device/cuda/src/seeding/experimental/spacepoint_formation.cu b/device/cuda/src/seeding/experimental/spacepoint_formation.cu
@@ -66,7 +66,7 @@ spacepoint_formation<detector_t>::operator()(
 
 using telescope_detector_type =
     detray::detector<detray::telescope_metadata<detray::rectangle2D<>>,
-                     covfie::field_view, detray::device_container_types>;
+                     detray::device_container_types>;
 template class spacepoint_formation<telescope_detector_type>;
 
 }  // namespace traccc::cuda::experimental
diff --git a/device/sycl/include/traccc/sycl/fitting/fitting_algorithm.hpp b/device/sycl/include/traccc/sycl/fitting/fitting_algorithm.hpp
@@ -29,7 +29,7 @@ namespace traccc::sycl {
 template <typename fitter_t>
 class fitting_algorithm
     : public algorithm<track_state_container_types::buffer(
-          const typename fitter_t::detector_type::detector_view_type&,
+          const typename fitter_t::detector_type::view_type&,
           const vecmem::data::jagged_vector_view<
               typename fitter_t::intersection_type>&,
           const typename track_candidate_container_types::const_view&)> {
@@ -48,7 +48,7 @@ class fitting_algorithm
 
     /// Run the algorithm
     track_state_container_types::buffer operator()(
-        const typename fitter_t::detector_type::detector_view_type& det_view,
+        const typename fitter_t::detector_type::view_type& det_view,
         const vecmem::data::jagged_vector_view<
             typename fitter_t::intersection_type>& navigation_buffer,
         const typename track_candidate_container_types::const_view&

diff --git a/device/sycl/src/fitting/fitting_algorithm.sycl b/device/sycl/src/fitting/fitting_algorithm.sycl
@@ -45,7 +45,7 @@ fitting_algorithm<fitter_t>::fitting_algorithm(
 
 template <typename fitter_t>
 track_state_container_types::buffer fitting_algorithm<fitter_t>::operator()(
-    const typename fitter_t::detector_type::detector_view_type& det_view,
+    const typename fitter_t::detector_type::view_type& det_view,
     const vecmem::data::jagged_vector_view<
         typename fitter_t::intersection_type>& navigation_buffer,
     const typename track_candidate_container_types::const_view&

diff --git a/examples/run/cpu/seeding_example.cpp b/examples/run/cpu/seeding_example.cpp
@@ -35,6 +35,7 @@
 
 // Detray include(s).
 #include "detray/core/detector.hpp"
+#include "detray/detectors/bfield.hpp"
 #include "detray/detectors/toy_metadata.hpp"
 #include "detray/io/common/detector_reader.hpp"
 #include "detray/propagator/navigator.hpp"
@@ -55,9 +56,9 @@ int seq_run(const traccc::seeding_input_config& /*i_cfg*/,
             const traccc::common_options& common_opts) {
 
     /// Type declarations
-    using host_detector_type = detray::detector<detray::toy_metadata<>>;
+    using host_detector_type = detray::detector<detray::toy_metadata>;
 
-    using b_field_t = typename host_detector_type::bfield_type;
+    using b_field_t = covfie::field<detray::bfield::const_bknd_t>;
     using rk_stepper_type =
         detray::rk_stepper<b_field_t::view_t,
                            typename host_detector_type::transform3,

diff --git a/extern/covfie/CMakeLists.txt b/extern/covfie/CMakeLists.txt
@@ -18,7 +18,7 @@ message( STATUS "Fetching covfie as part of the traccc project" )
 
 # Declare where to get covfie from.
 set( TRACCC_COVFIE_SOURCE
-   "URL;https://github.com/acts-project/covfie/archive/refs/tags/v0.5.0.tar.gz;URL_MD5;e6683f6eb34b6156f8ac90facc7e538e"
+   "URL;https://github.com/acts-project/covfie/archive/refs/tags/v0.8.1.tar.gz;URL_MD5;0b4dc9624533d1ed4ea7a763da47f07e"
    CACHE STRING "Source for covfie, when built as part of this project" )
 mark_as_advanced( TRACCC_COVFIE_SOURCE )
 FetchContent_Declare( covfie ${TRACCC_COVFIE_SOURCE} )

diff --git a/extern/detray/CMakeLists.txt b/extern/detray/CMakeLists.txt
@@ -18,7 +18,7 @@ message( STATUS "Building Detray as part of the TRACCC project" )
 
 # Declare where to get Detray from.
 set( TRACCC_DETRAY_SOURCE
-   "URL;https://github.com/acts-project/detray/archive/refs/tags/v0.42.0.tar.gz;URL_MD5;0c14f7081b22e068bd41b6e28235f393"
+   "URL;https://github.com/acts-project/detray/archive/refs/tags/v0.44.0.tar.gz;URL_MD5;d45877ceca4f61d1f9783f09777fcad0"
    CACHE STRING "Source for Detray, when built as part of this project" )
 
 mark_as_advanced( TRACCC_DETRAY_SOURCE )

diff --git a/tests/common/tests/kalman_fitting_test.hpp b/tests/common/tests/kalman_fitting_test.hpp
@@ -13,6 +13,7 @@
 
 // detray include(s).
 #include "detray/core/detector.hpp"
+#include "detray/detectors/bfield.hpp"
 #include "detray/detectors/telescope_metadata.hpp"
 #include "detray/masks/masks.hpp"
 #include "detray/propagator/navigator.hpp"
@@ -48,14 +49,13 @@ class KalmanFittingTests
 
     public:
     /// Type declarations
-    using host_detector_type =
-        detray::detector<detray::telescope_metadata<>, covfie::field,
-                         detray::host_container_types>;
+    using host_detector_type = detray::detector<detray::telescope_metadata<>,
+                                                detray::host_container_types>;
     using device_detector_type =
-        detray::detector<detray::telescope_metadata<>, covfie::field_view,
+        detray::detector<detray::telescope_metadata<>,
                          detray::device_container_types>;
 
-    using b_field_t = typename host_detector_type::bfield_type;
+    using b_field_t = covfie::field<detray::bfield::const_bknd_t>;
     using rk_stepper_type = detray::rk_stepper<b_field_t::view_t, transform3,
                                                detray::constrained_step<>>;
     using host_navigator_type = detray::navigator<const host_detector_type>;