Adapt Timer

FEniCS · Jul 31, 2024 · acc314a · acc314a
1 parent 5d15d26
commit acc314a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 20 deletions.
diff --git a/cpp/dolfinx/common/Timer.cpp b/cpp/dolfinx/common/Timer.cpp
@@ -4,23 +4,23 @@
 //
 // SPDX-License-Identifier:    LGPL-3.0-or-later
 
-#include "Timer.h"
+#include <optional>
+#include <stdexcept>
+
 #include "TimeLogManager.h"
 #include "TimeLogger.h"
-#include <stdexcept>
+#include "Timer.h"
 
 using namespace dolfinx;
 using namespace dolfinx::common;
 
 //-----------------------------------------------------------------------------
-Timer::Timer() : Timer::Timer("")
+Timer::Timer(std::optional<std::string> task) : _task("")
 {
-  // Do nothing
-}
-//-----------------------------------------------------------------------------
-Timer::Timer(const std::string& task) : _task(task)
-{
-  // Do nothing
+  if (task)
+  {
+    _task = std::move(task.value());
+  }
 }
 //-----------------------------------------------------------------------------
 Timer::~Timer()

diff --git a/cpp/dolfinx/common/Timer.h b/cpp/dolfinx/common/Timer.h
@@ -8,6 +8,7 @@
 
 #include <array>
 #include <boost/timer/timer.hpp>
+#include <optional>
 #include <string>
 
 namespace dolfinx::common
@@ -30,11 +31,9 @@ namespace dolfinx::common
 class Timer
 {
 public:
-  /// Create timer without logging
-  Timer();
-
-  /// Create timer with logging
-  Timer(const std::string& task);
+  /// Create timer
+  /// if a task name is provided this enables logging, otherwise without logging
+  Timer(std::optional<std::string> task = std::nullopt);
 
   /// Destructor
   ~Timer();

diff --git a/python/dolfinx/common.py b/python/dolfinx/common.py
@@ -84,10 +84,7 @@ class Timer:
     _cpp_object: _cpp.common.Timer
 
     def __init__(self, name: typing.Optional[str] = None):
-        if name is None:
-            self._cpp_object = _cpp.common.Timer()
-        else:
-            self._cpp_object = _cpp.common.Timer(name)
+        self._cpp_object = _cpp.common.Timer(name)
 
     def __enter__(self):
         self._cpp_object.start()

diff --git a/python/dolfinx/wrappers/common.cpp b/python/dolfinx/wrappers/common.cpp
@@ -152,8 +152,7 @@ void common(nb::module_& m)
           nb::arg("global"));
   // dolfinx::common::Timer
   nb::class_<dolfinx::common::Timer>(m, "Timer", "Timer class")
-      .def(nb::init<>())
-      .def(nb::init<std::string>(), nb::arg("task"))
+      .def(nb::init<std::string>(), nb::arg("task") = nb::none())
       .def("start", &dolfinx::common::Timer::start, "Start timer")
       .def("stop", &dolfinx::common::Timer::stop, "Stop timer")
       .def("resume", &dolfinx::common::Timer::resume)