Remove step size constraints from performance measurement

acts-project · Sep 24, 2024 · 188f804 · 188f804
1 parent 14bf98e
commit 188f804
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/benchmarks/cpu/toy_detector_cpu.cpp b/benchmarks/cpu/toy_detector_cpu.cpp
@@ -43,8 +43,7 @@ BENCHMARK_F(ToyDetectorBenchmark, CPU)(benchmark::State& state) {
     // Type declarations
     using rk_stepper_type =
         detray::rk_stepper<b_field_t::view_t,
-                           typename detector_type::algebra_type,
-                           detray::constrained_step<>>;
+                           typename detector_type::algebra_type>;
     using host_detector_type = traccc::default_detector::host;
     using host_navigator_type = detray::navigator<const host_detector_type>;
     using host_fitter_type =

diff --git a/benchmarks/cuda/toy_detector_cuda.cpp b/benchmarks/cuda/toy_detector_cuda.cpp
@@ -45,8 +45,7 @@ BENCHMARK_F(ToyDetectorBenchmark, CUDA)(benchmark::State& state) {
     // Type declarations
     using rk_stepper_type =
         detray::rk_stepper<b_field_t::view_t,
-                           typename detector_type::algebra_type,
-                           detray::constrained_step<>>;
+                           typename detector_type::algebra_type>;
     using host_detector_type = traccc::default_detector::host;
     using device_detector_type = traccc::default_detector::device;
     using device_navigator_type = detray::navigator<const device_detector_type>;

diff --git a/device/cuda/src/finding/finding_algorithm.cu b/device/cuda/src/finding/finding_algorithm.cu
@@ -544,7 +544,13 @@ using default_detector_type =
 using default_stepper_type =
     detray::rk_stepper<covfie::field<detray::bfield::const_bknd_t>::view_t,
                        traccc::default_algebra, detray::constrained_step<>>;
+using benchmark_stepper_type =
+    detray::rk_stepper<covfie::field<detray::bfield::const_bknd_t>::view_t,
+                       traccc::default_algebra>;
 using default_navigator_type = detray::navigator<const default_detector_type>;
+
 template class finding_algorithm<default_stepper_type, default_navigator_type>;
+template class finding_algorithm<benchmark_stepper_type,
+                                 default_navigator_type>;
 
 }  // namespace traccc::cuda
diff --git a/device/cuda/src/fitting/fitting_algorithm.cu b/device/cuda/src/fitting/fitting_algorithm.cu
@@ -100,9 +100,16 @@ using default_detector_type =
 using default_stepper_type =
     detray::rk_stepper<covfie::field<detray::bfield::const_bknd_t>::view_t,
                        default_algebra, detray::constrained_step<>>;
+using benchmark_stepper_type =
+    detray::rk_stepper<covfie::field<detray::bfield::const_bknd_t>::view_t,
+                       traccc::default_algebra>;
 using default_navigator_type = detray::navigator<const default_detector_type>;
 using default_fitter_type =
     kalman_fitter<default_stepper_type, default_navigator_type>;
+using benchmark_fitter_type =
+    kalman_fitter<benchmark_stepper_type, default_navigator_type>;
+
 template class fitting_algorithm<default_fitter_type>;
+template class fitting_algorithm<benchmark_fitter_type>;
 
 }  // namespace traccc::cuda