Allow access to logged timer data

cpp/dolfinx/common/TimeLogger.cpp

@@ -35,7 +35,7 @@ void TimeLogger::register_timing(std::string task, double time)
 void TimeLogger::list_timings(MPI_Comm comm, Table::Reduction reduction) const
 {
   // Format and reduce to rank 0
-  Table timings = this->timings();
+  Table timings = this->timing_table();
   timings = timings.reduce(comm, reduction);
   const std::string str = "\n" + timings.str();
 
@@ -44,7 +44,7 @@ void TimeLogger::list_timings(MPI_Comm comm, Table::Reduction reduction) const
     std::cout << str << std::endl;
 }
 //-----------------------------------------------------------------------------
-Table TimeLogger::timings() const
+Table TimeLogger::timing_table() const
 {
   // Generate log::timing table
   Table table("Summary of timings");
@@ -73,3 +73,8 @@ std::pair<int, double> TimeLogger::timing(std::string task) const
   return it->second;
 }
 //-----------------------------------------------------------------------------
+std::map<std::string, std::pair<int, double>> TimeLogger::timings() const
+{
+  return _timings;
+}
+//-----------------------------------------------------------------------------

cpp/dolfinx/common/TimeLogger.h

@@ -36,7 +36,7 @@ class TimeLogger
   void register_timing(std::string task, double wall);
 
   /// Return a summary of timings and tasks in a Table
-  Table timings() const;
+  Table timing_table() const;
 
   /// List a summary of timings and tasks. Reduction type is
   /// printed.
@@ -46,10 +46,13 @@ class TimeLogger
 
   /// @brief Return timing.
   /// @param[in] task The task name to retrieve the timing for
-  /// @returns Values (count, total wall time, total user time, total
-  /// system time) for given task.
+  /// @return Values (count, total wall time) for given task.
   std::pair<int, double> timing(std::string task) const;
 
+  /// @brief Logged elapsed times.
+  /// @return Elapsed [task id: (count, total wall time)].
+  std::map<std::string, std::pair<int, double>> timings() const;
+
 private:
   // List of timings for tasks, map from string to (num_timings,
   // total_wall_time)

cpp/dolfinx/common/timing.cpp

@@ -11,9 +11,9 @@
 #include "Timer.h"
 
 //-----------------------------------------------------------------------
-dolfinx::Table dolfinx::timings()
+dolfinx::Table dolfinx::timing_table()
 {
-  return dolfinx::common::TimeLogManager::logger().timings();
+  return dolfinx::common::TimeLogManager::logger().timing_table();
 }
 //-----------------------------------------------------------------------------
 void dolfinx::list_timings(MPI_Comm comm, Table::Reduction reduction)
@@ -26,3 +26,8 @@ std::pair<std::size_t, double> dolfinx::timing(std::string task)
   return dolfinx::common::TimeLogManager::logger().timing(task);
 }
 //-----------------------------------------------------------------------------
+std::map<std::string, std::pair<int, double>> dolfinx::timings()
+{
+  return dolfinx::common::TimeLogManager::logger().timings();
+}
+//-----------------------------------------------------------------------------

cpp/dolfinx/common/timing.h

@@ -7,16 +7,16 @@
 #pragma once
 
 #include "Table.h"
+#include <map>
 #include <mpi.h>
 #include <string>
 #include <utility>
 
 namespace dolfinx
 {
-
 /// @brief Return a summary of timings and tasks in a Table.
 /// @return Table with timings.
-Table timings();
+Table timing_table();
 
 /// @brief List a summary of timings and tasks.
 ///
@@ -27,10 +27,13 @@ Table timings();
 void list_timings(MPI_Comm comm,
                   Table::Reduction reduction = Table::Reduction::max);
 
-/// @brief Return timing (count, total wall time, total user time, total
-/// system time) for given task.
+/// @brief Return timing (count, total wall time) for given task.
 /// @param[in] task Name of a task
 /// @return The (count, total wall time) for the task.
 std::pair<std::size_t, double> timing(std::string task);
 
+/// @brief Logged elapsed times.
+/// @return Elapsed [task id: (count, total wall time)].
+std::map<std::string, std::pair<int, double>> timings();
+
 } // namespace dolfinx

python/dolfinx/wrappers/common.cpp

@@ -21,6 +21,7 @@
 #include <nanobind/ndarray.h>
 #include <nanobind/stl/array.h>
 #include <nanobind/stl/chrono.h>
+#include <nanobind/stl/map.h>
 #include <nanobind/stl/optional.h>
 #include <nanobind/stl/pair.h>
 #include <nanobind/stl/string.h>
@@ -161,6 +162,7 @@ void common(nb::module_& m)
             return dolfinx_wrappers::as_nbarray(std::move(local));
           },
           nb::arg("global"));
+
   // dolfinx::common::Timer
   nb::class_<dolfinx::common::Timer<std::chrono::high_resolution_clock>>(
       m, "Timer", "Timer class")
@@ -176,8 +178,8 @@ void common(nb::module_& m)
            &dolfinx::common::Timer<std::chrono::high_resolution_clock>::stop<>,
            "Stop timer");
 
-  // dolfinx::common::Timer enum
   m.def("timing", &dolfinx::timing);
+  m.def("timings", &dolfinx::timings);
 
   m.def(
       "list_timings",