PyPi v2.2.2 : Minor fix to avoid very rare FPE when serializing

- Updated CHANGES.{md,rst}
NERSC · Jun 6, 2018 · 35e52cb · 35e52cb
1 parent 9dfc040
commit 35e52cb
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 5 deletions.
diff --git a/.version.txt b/.version.txt
@@ -1 +1 @@
-2.2.1
+2.2.2
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,30 @@
 TiMemory
 ========
 
+Release: TiMemory 2.2.2
+-----------------------
+
+Author: Jonathan R. Madsen Date: Wed Jun 6 03:19:39 2018 -0700
+
+- Minor fix to avoid very rare FPE when serializing
+
+Release: TiMemory 2.2.1
+-----------------------
+
+Author: Jonathan R. Madsen Date: Tue Jun 6 01:32:45 2018 -0700
+
+- fix to TiMemoryConfig.cmake when installed via sudo
+
+Release: TiMemory 2.2.0
+-----------------------
+
+Author: Jonathan R. Madsen Date: Tue Jun 5 00:28:10 2018 -0700
+
+- self-cost available in manager + plotting safeguards
+- Improved singleton deletion
+- alternative colors for when len(_types) == 1 in plotting
+- plotting label fix
+
 Release: TiMemory 2.1.0
 -----------------------
 

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,30 @@
 TiMemory
 ========
 
+Release: TiMemory 2.2.2
+-----------------------
+
+Author: Jonathan R. Madsen Date: Wed Jun 6 03:19:39 2018 -0700
+
+-  Minor fix to avoid very rare FPE when serializing
+
+Release: TiMemory 2.2.1
+-----------------------
+
+Author: Jonathan R. Madsen Date: Tue Jun 6 01:32:45 2018 -0700
+
+-  fix to TiMemoryConfig.cmake when installed via sudo
+
+Release: TiMemory 2.2.0
+-----------------------
+
+Author: Jonathan R. Madsen Date: Tue Jun 5 00:28:10 2018 -0700
+
+-  self-cost available in manager + plotting safeguards
+-  Improved singleton deletion
+-  alternative colors for when len(\_types) == 1 in plotting
+-  plotting label fix
+
 Release: TiMemory 2.1.0
 -----------------------
 

diff --git a/source/auto_timer.cpp b/source/auto_timer.cpp
@@ -96,9 +96,8 @@ auto_timer::~auto_timer()
 {
     if(m_enabled)
     {
-        // will add itself to global when destroying m_temp_timer
+        // stop the timer
         m_temp_timer.stop();
-
         assert(m_temp_timer.summation_timer() != nullptr);
         *m_temp_timer.summation_timer() += m_temp_timer;
 

diff --git a/source/timemory/base_timer.hpp b/source/timemory/base_timer.hpp
@@ -497,8 +497,12 @@ class tim_api base_timer
     template <typename Archive> void
     serialize(Archive& ar, const unsigned int /*version*/)
     {
-        auto _cpu_util = (m_accum.get_sum<0>() + m_accum.get_sum<1>())
-                         / m_accum.get_sum<2>();
+        auto _cpu_util = (m_accum.get_sum<0>() + m_accum.get_sum<1>());
+        if(m_accum.get_sum<2>() > 0)
+            _cpu_util /= m_accum.get_sum<2>();
+        else
+            _cpu_util = 0.0;
+
         if(!tim::isfinite(_cpu_util))
             _cpu_util = 0.0;