From 010a7e4e1f5a9549f4ff54a0465d6921a2718839 Mon Sep 17 00:00:00 2001
From: evonneng <evonne_ng@berkeley.edu>
Date: Tue, 10 May 2022 22:59:41 +0000
Subject: [PATCH 1/2] cap history in calc avg of stats

---
 configs/tests/test_dryrun.yaml  |  5 +++++
 mattport/utils/stats_tracker.py | 18 ++++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/configs/tests/test_dryrun.yaml b/configs/tests/test_dryrun.yaml
index bd649ceaa..92266ec31 100644
--- a/configs/tests/test_dryrun.yaml
+++ b/configs/tests/test_dryrun.yaml
@@ -19,6 +19,11 @@ data:
 graph:
   max_num_iterations: 5
 
+logging:
+  writer: 
+    TensorboardWriter:
+      save_dir: '/tmp/'
+
 hydra:
   searchpath:
     - file://configs
diff --git a/mattport/utils/stats_tracker.py b/mattport/utils/stats_tracker.py
index c4206e228..f3f4c4fa5 100644
--- a/mattport/utils/stats_tracker.py
+++ b/mattport/utils/stats_tracker.py
@@ -106,9 +106,16 @@ class StatsTracker:
                 # calculate the batch per second stat
                 val = batch_size / val
 
-            if step:
-                # calculate updated average
-                self.stats_dict[name] = (self.stats_dict.get(name, 0) * step + val) / (step + 1)
+            if step is not None:
+                # calculate updated average over the buffered max history
+                curr_history = self.stats_dict.get(name, {"buffer": [], "avg": 0})
+                curr_buffer = curr_history["buffer"]
+                curr_avg = curr_history["avg"]
+                if len(curr_buffer) >= self.max_history:
+                    curr_buffer.pop(0)
+                curr_buffer.append(val)
+                curr_avg = sum(curr_buffer) / len(curr_buffer)
+                self.stats_dict[name] = {"buffer": curr_buffer, "avg": curr_avg}
             else:
                 # logging total time instead of average
                 self.stats_dict[name] = val
@@ -116,7 +123,7 @@ class StatsTracker:
             if name == Stats.ITER_TRAIN_TIME and Stats.ETA in self.stats_to_track:
                 # update ETA if logging iteration train time
                 remain_iter = self.config.graph.max_num_iterations - step
-                self.stats_dict[Stats.ETA] = remain_iter * self.stats_dict[name]
+                self.stats_dict[Stats.ETA] = remain_iter * self.stats_dict[name]["avg"]
 
     @check_print_stats_step
     def print_stats(self, fraction_done: float):
@@ -143,6 +150,9 @@ class StatsTracker:
             curr_mssg = f"{self.step} ({fraction_done*100:.02f}%)"
             curr_mssg = f"{curr_mssg:<20}"
             for k, v in self.stats_dict.items():
+                if isinstance(v, dict):
+                    v = v["avg"]
+
                 if "(time)" in k.value:
                     v = str(datetime.timedelta(seconds=v))
                 elif "(ms)" in k.value:

From 71b8f9fc80ba8f30b1a6387f3e35685728c746f2 Mon Sep 17 00:00:00 2001
From: evonneng <evonne_ng@berkeley.edu>
Date: Tue, 10 May 2022 23:52:06 +0000
Subject: [PATCH 2/2] fixed too many nested ifs

---
 mattport/utils/stats_tracker.py | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/mattport/utils/stats_tracker.py b/mattport/utils/stats_tracker.py
index f3f4c4fa5..066a9baa9 100644
--- a/mattport/utils/stats_tracker.py
+++ b/mattport/utils/stats_tracker.py
@@ -125,14 +125,8 @@ class StatsTracker:
                 remain_iter = self.config.graph.max_num_iterations - step
                 self.stats_dict[Stats.ETA] = remain_iter * self.stats_dict[name]["avg"]
 
-    @check_print_stats_step
-    def print_stats(self, fraction_done: float):
-        """helper to print out the stats dictionary.
-
-        Args:
-            fraction_done (float): fraction of steps executed in training iterations
-        """
-        # print a new header line if there is a new key added
+    def handle_header(self):
+        """helper to handle the printing of the header labels"""
         if self.step == 0 or self.new_key:
             mssg = f"{'Step (% Done)':<20}"
             for k in self.stats_dict:
@@ -145,7 +139,8 @@ class StatsTracker:
                 for mssg in self.past_stats:
                     print(mssg)
 
-        # generate a new stats reporting message
+    def handle_stats(self, fraction_done):
+        """helper to print out the stats in a readable format"""
         if self.step > 0:
             curr_mssg = f"{self.step} ({fraction_done*100:.02f}%)"
             curr_mssg = f"{curr_mssg:<20}"
@@ -170,6 +165,19 @@ class StatsTracker:
             print(curr_mssg)
             self.past_stats.append(curr_mssg)
 
+    @check_print_stats_step
+    def print_stats(self, fraction_done: float):
+        """helper to print out the stats dictionary.
+
+        Args:
+            fraction_done (float): fraction of steps executed in training iterations
+        """
+        # print a new header line if there is a new key added
+        self.handle_header()
+
+        # generate a new stats reporting message
+        self.handle_stats(fraction_done)
+
     def dump_stats(self):
         """Dump stats locally to a json file"""
         raise NotImplementedError