From 679a000375176a7482a7732366f75d3086d4753e Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Sat, 12 Mar 2022 01:37:43 -0600 Subject: [PATCH] rename namespace --- tests/performance/instrumentation_step_22.cc | 21 ++++++++++---------- tests/performance/instrumentation_step_3.cc | 20 +++++++++---------- tests/performance/valgrind_instrumentation.h | 6 +++--- 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/tests/performance/instrumentation_step_22.cc b/tests/performance/instrumentation_step_22.cc index 0d7bfb81d0..3397a1b721 100644 --- a/tests/performance/instrumentation_step_22.cc +++ b/tests/performance/instrumentation_step_22.cc @@ -624,28 +624,27 @@ StokesProblem::run() if (refinement_cycle > 0) { - callgrind_wrapper::start_instrumentation(); + CallgrindWrapper::start_instrumentation(); refine_mesh(); - cycle_count["refinement"] = callgrind_wrapper::stop_instrumentation(); + cycle_count["refinement"] = CallgrindWrapper::stop_instrumentation(); } - callgrind_wrapper::start_instrumentation(); + CallgrindWrapper::start_instrumentation(); setup_dofs(); - cycle_count["setup_system"] = callgrind_wrapper::stop_instrumentation(); + cycle_count["setup_system"] = CallgrindWrapper::stop_instrumentation(); debug_output << " Assembling..." << std::endl << std::flush; - callgrind_wrapper::start_instrumentation(); + CallgrindWrapper::start_instrumentation(); assemble_system(); - cycle_count["assemble_system"] = - callgrind_wrapper::stop_instrumentation(); + cycle_count["assemble_system"] = CallgrindWrapper::stop_instrumentation(); - callgrind_wrapper::start_instrumentation(); + CallgrindWrapper::start_instrumentation(); solve(); - cycle_count["solve"] = callgrind_wrapper::stop_instrumentation(); + cycle_count["solve"] = CallgrindWrapper::stop_instrumentation(); - callgrind_wrapper::start_instrumentation(); + CallgrindWrapper::start_instrumentation(); output_results(refinement_cycle); - cycle_count["output_results"] = callgrind_wrapper::stop_instrumentation(); + cycle_count["output_results"] = CallgrindWrapper::stop_instrumentation(); debug_output << std::endl; } diff --git a/tests/performance/instrumentation_step_3.cc b/tests/performance/instrumentation_step_3.cc index 8914cb0c3b..f7372ff1a8 100644 --- a/tests/performance/instrumentation_step_3.cc +++ b/tests/performance/instrumentation_step_3.cc @@ -219,25 +219,25 @@ Step3::run() { std::map cycle_count; - callgrind_wrapper::start_instrumentation(); + CallgrindWrapper::start_instrumentation(); make_grid(); - cycle_count["make_grid"] = callgrind_wrapper::stop_instrumentation(); + cycle_count["make_grid"] = CallgrindWrapper::stop_instrumentation(); - callgrind_wrapper::start_instrumentation(); + CallgrindWrapper::start_instrumentation(); setup_system(); - cycle_count["setup_system"] = callgrind_wrapper::stop_instrumentation(); + cycle_count["setup_system"] = CallgrindWrapper::stop_instrumentation(); - callgrind_wrapper::start_instrumentation(); + CallgrindWrapper::start_instrumentation(); assemble_system(); - cycle_count["assemble_system"] = callgrind_wrapper::stop_instrumentation(); + cycle_count["assemble_system"] = CallgrindWrapper::stop_instrumentation(); - callgrind_wrapper::start_instrumentation(); + CallgrindWrapper::start_instrumentation(); solve(); - cycle_count["solve"] = callgrind_wrapper::stop_instrumentation(); + cycle_count["solve"] = CallgrindWrapper::stop_instrumentation(); - callgrind_wrapper::start_instrumentation(); + CallgrindWrapper::start_instrumentation(); output_results(); - cycle_count["output_results"] = callgrind_wrapper::stop_instrumentation(); + cycle_count["output_results"] = CallgrindWrapper::stop_instrumentation(); return {cycle_count["make_grid"], cycle_count["setup_system"], diff --git a/tests/performance/valgrind_instrumentation.h b/tests/performance/valgrind_instrumentation.h index c2554f1c5b..c25773ad69 100644 --- a/tests/performance/valgrind_instrumentation.h +++ b/tests/performance/valgrind_instrumentation.h @@ -37,7 +37,7 @@ * --callgrind-out-file=callgrind.out ./executable * @endcode */ -namespace callgrind_wrapper +namespace CallgrindWrapper { /** * Reset the current instruction counter to zero and start callgrind @@ -102,7 +102,7 @@ namespace callgrind_wrapper AssertThrow( is_initialized, dealii::ExcMessage( - "callgrind_wrapper::start_instrumentation() can only be called when " + "CallgrindWrapper::start_instrumentation() can only be called when " "the executable is run via \"valgrind --tool=callgrind -q " "--combine-dumps=yes --instr-atstart=no " "--callgrind-out-file=callgrind.out ./executable\"")); @@ -138,6 +138,6 @@ namespace callgrind_wrapper return cycles; } -} // namespace callgrind_wrapper +} // namespace CallgrindWrapper #endif -- 2.39.5