From d5fa9f1062652895f81019633c3dc44eeb2cbede Mon Sep 17 00:00:00 2001
From: Ryan Curtin <ryan@ratml.org>
Date: Fri, 8 Sep 2017 10:05:21 -0400
Subject: [PATCH] Reset timers every time a binding is started.

---
 src/mlpack/bindings/python/mlpack/cli_util.hpp | 9 +++++++++
 src/mlpack/bindings/python/print_pyx.cpp       | 5 +++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/mlpack/bindings/python/mlpack/cli_util.hpp b/src/mlpack/bindings/python/mlpack/cli_util.hpp
index cc4aecee81..5a3ab74e4b 100644
--- a/src/mlpack/bindings/python/mlpack/cli_util.hpp
+++ b/src/mlpack/bindings/python/mlpack/cli_util.hpp
@@ -108,6 +108,15 @@ inline void DisableBacktrace()
   Log::Fatal.backtrace = false;
 }
 
+/**
+ * Reset the status of all timers.
+ */
+inline void ResetTimers()
+{
+  // Just get a new object---removes all old timers.
+  CLI::GetSingleton().timer = Timers();
+}
+
 } // namespace util
 } // namespace mlpack
 
diff --git a/src/mlpack/bindings/python/print_pyx.cpp b/src/mlpack/bindings/python/print_pyx.cpp
index 2a0b80be08..8c56f05888 100644
--- a/src/mlpack/bindings/python/print_pyx.cpp
+++ b/src/mlpack/bindings/python/print_pyx.cpp
@@ -72,7 +72,7 @@ void PrintPYX(const ProgramDoc& programInfo,
   cout << "cimport arma_numpy" << endl;
   cout << "from cli cimport CLI" << endl;
   cout << "from cli cimport SetParam, SetParamWithInfo" << endl;
-  cout << "from cli cimport EnableVerbose, DisableBacktrace"
+  cout << "from cli cimport EnableVerbose, DisableBacktrace, ResetTimers"
       << endl;
   cout << "from cli cimport MoveFromPtr, MoveToPtr" << endl;
   cout << "from matrix_utils import to_matrix, to_matrix_with_info" << endl;
@@ -169,7 +169,8 @@ void PrintPYX(const ProgramDoc& programInfo,
       << "returned." << endl;
   cout << "  \"\"\"" << endl;
 
-  // Disable backtraces.
+  // Reset any timers and disable backtraces.
+  cout << "  ResetTimers()" << endl;
   cout << "  DisableBacktrace()" << endl;
 
   // Restore the parameters.