Make the throughput applications use progress bars.

acts-project · Nov 23, 2024 · 22b0da1 · 22b0da1
1 parent 61bb906
commit 22b0da1
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 13 deletions.
diff --git a/examples/run/common/throughput_mt.ipp b/examples/run/common/throughput_mt.ipp
@@ -50,6 +50,9 @@
 #include <tbb/task_arena.h>
 #include <tbb/task_group.h>
 
+// Indicators include(s).
+#include <indicators/progress_bar.hpp>
+
 // System include(s).
 #include <atomic>
 #include <cstdlib>
@@ -193,6 +196,14 @@ int throughput_mt(std::string_view description, int argc, char* argv[],
     // Cold Run events. To discard any "initialisation issues" in the
     // measurements.
     {
+        // Set up a progress bar for the warm-up processing.
+        indicators::ProgressBar progress_bar{
+            indicators::option::BarWidth{50},
+            indicators::option::PrefixText{"Warm-up processing "},
+            indicators::option::ShowPercentage{true},
+            indicators::option::ShowRemainingTime{true},
+            indicators::option::MaxProgress{throughput_opts.cold_run_events}};
+
         // Measure the time of execution.
         performance::timer t{"Warm-up processing", times};
 
@@ -210,6 +221,7 @@ int throughput_mt(std::string_view description, int argc, char* argv[],
                         tbb::this_task_arena::current_thread_index()))(
                                                        input[event])
                                                    .size());
+                    progress_bar.tick();
                 });
             });
         }
@@ -222,6 +234,14 @@ int throughput_mt(std::string_view description, int argc, char* argv[],
     rec_track_params = 0;
 
     {
+        // Set up a progress bar for the event processing.
+        indicators::ProgressBar progress_bar{
+            indicators::option::BarWidth{50},
+            indicators::option::PrefixText{"Event processing   "},
+            indicators::option::ShowPercentage{true},
+            indicators::option::ShowRemainingTime{true},
+            indicators::option::MaxProgress{throughput_opts.processed_events}};
+
         // Measure the total time of execution.
         performance::timer t{"Event processing", times};
 
@@ -239,6 +259,7 @@ int throughput_mt(std::string_view description, int argc, char* argv[],
                         tbb::this_task_arena::current_thread_index()))(
                                                        input[event])
                                                    .size());
+                    progress_bar.tick();
                 });
             });
         }

diff --git a/examples/run/common/throughput_st.ipp b/examples/run/common/throughput_st.ipp
@@ -31,6 +31,9 @@
 // VecMem include(s).
 #include <vecmem/memory/binary_page_memory_resource.hpp>
 
+// Indicators include(s).
+#include <indicators/progress_bar.hpp>
+
 // System include(s).
 #include <cstdlib>
 #include <ctime>
@@ -132,6 +135,14 @@ int throughput_st(std::string_view description, int argc, char* argv[],
     // Cold Run events. To discard any "initialisation issues" in the
     // measurements.
     {
+        // Set up a progress bar for the warm-up processing.
+        indicators::ProgressBar progress_bar{
+            indicators::option::BarWidth{50},
+            indicators::option::PrefixText{"Warm-up processing "},
+            indicators::option::ShowPercentage{true},
+            indicators::option::ShowRemainingTime{true},
+            indicators::option::MaxProgress{throughput_opts.cold_run_events}};
+
         // Measure the time of execution.
         performance::timer t{"Warm-up processing", times};
 
@@ -144,13 +155,22 @@ int throughput_st(std::string_view description, int argc, char* argv[],
 
             // Process one event.
             rec_track_params += (*alg)(input[event]).size();
+            progress_bar.tick();
         }
     }
 
     // Reset the dummy counter.
     rec_track_params = 0;
 
     {
+        // Set up a progress bar for the event processing.
+        indicators::ProgressBar progress_bar{
+            indicators::option::BarWidth{50},
+            indicators::option::PrefixText{"Event processing   "},
+            indicators::option::ShowPercentage{true},
+            indicators::option::ShowRemainingTime{true},
+            indicators::option::MaxProgress{throughput_opts.processed_events}};
+
         // Measure the total time of execution.
         performance::timer t{"Event processing", times};
 
@@ -163,6 +183,7 @@ int throughput_st(std::string_view description, int argc, char* argv[],
 
             // Process one event.
             rec_track_params += (*alg)(input[event]).size();
+            progress_bar.tick();
         }
     }
 

diff --git a/examples/run/cpu/CMakeLists.txt b/examples/run/cpu/CMakeLists.txt
@@ -36,11 +36,11 @@ target_link_libraries( traccc_examples_cpu
    PUBLIC vecmem::core detray::core detray::detectors traccc::core )
 
 traccc_add_executable( throughput_st "throughput_st.cpp"
-   LINK_LIBRARIES vecmem::core detray::detectors detray::io
-                  traccc::core traccc::io traccc::performance
+   LINK_LIBRARIES indicators::indicators vecmem::core detray::detectors
+                  detray::io traccc::core traccc::io traccc::performance
                   traccc::options traccc_examples_cpu )
 
 traccc_add_executable( throughput_mt "throughput_mt.cpp"
-   LINK_LIBRARIES TBB::tbb vecmem::core detray::detectors detray::io
-                  traccc::core traccc::io traccc::performance
+   LINK_LIBRARIES indicators::indicators TBB::tbb vecmem::core detray::detectors
+                  detray::io traccc::core traccc::io traccc::performance
                   traccc::options traccc_examples_cpu )
diff --git a/examples/run/cuda/CMakeLists.txt b/examples/run/cuda/CMakeLists.txt
@@ -1,6 +1,6 @@
 # TRACCC library, part of the ACTS project (R&D line)
 #
-# (c) 2021-2022 CERN for the benefit of the ACTS project
+# (c) 2021-2024 CERN for the benefit of the ACTS project
 #
 # Mozilla Public License Version 2.0
 
@@ -37,13 +37,13 @@ target_link_libraries( traccc_examples_cuda
           traccc::core traccc::device_common traccc::cuda )
 
 traccc_add_executable( throughput_st_cuda "throughput_st.cpp"
-   LINK_LIBRARIES vecmem::core vecmem::cuda detray::detectors detray::io
-                  traccc::io traccc::performance
+   LINK_LIBRARIES indicators::indicators vecmem::core vecmem::cuda
+                  detray::detectors detray::io traccc::io traccc::performance
                   traccc::core traccc::device_common traccc::cuda
                   traccc::options traccc_examples_cuda )
 
 traccc_add_executable( throughput_mt_cuda "throughput_mt.cpp"
-   LINK_LIBRARIES TBB::tbb vecmem::core vecmem::cuda detray::detectors detray::io
-                  traccc::io traccc::performance
+   LINK_LIBRARIES indicators::indicators TBB::tbb vecmem::core vecmem::cuda
+                  detray::detectors detray::io traccc::io traccc::performance
                   traccc::core traccc::device_common traccc::cuda
                   traccc::options traccc_examples_cuda )
diff --git a/examples/run/sycl/CMakeLists.txt b/examples/run/sycl/CMakeLists.txt
@@ -39,13 +39,13 @@ target_link_libraries( traccc_examples_sycl
           traccc::core traccc::device_common traccc::sycl )
 
 traccc_add_executable( throughput_st_sycl "throughput_st.cpp"
-   LINK_LIBRARIES vecmem::core vecmem::sycl detray::detectors detray::io
-                  traccc::io traccc::performance
+   LINK_LIBRARIES indicators::indicators vecmem::core vecmem::sycl
+                  detray::detectors detray::io traccc::io traccc::performance
                   traccc::core traccc::device_common traccc::sycl
                   traccc::options traccc_examples_sycl )
 
 traccc_add_executable( throughput_mt_sycl "throughput_mt.cpp"
-   LINK_LIBRARIES TBB::tbb vecmem::core vecmem::sycl detray::detectors detray::io
-                  traccc::io traccc::performance
+   LINK_LIBRARIES indicators::indicators TBB::tbb vecmem::core vecmem::sycl
+                  detray::detectors detray::io traccc::io traccc::performance
                   traccc::core traccc::device_common traccc::sycl
                   traccc::options traccc_examples_sycl )