Abstract progress_bar; show totals in evaluate()

conx/network.py

@@ -902,6 +902,7 @@ def evaluate(self, batch_size=None, show=False, show_inputs=True, show_targets=T
                                           sample_weight=sample_weight, steps=steps)
             for i in range(len(self.model.metrics_names)):
                 print("    %15s: %10s" % (self.model.metrics_names[i], self.pf(results[i])))
+            print("    %15s: %10s" % ("Total", num_train))
             print()
             print("Testing Data Results:")
             if show:
@@ -915,6 +916,7 @@ def evaluate(self, batch_size=None, show=False, show_inputs=True, show_targets=T
                                           sample_weight=sample_weight, steps=steps)
             for i in range(len(self.model.metrics_names)):
                 print("    %15s: %10s" % (self.model.metrics_names[i], self.pf(results[i])))
+            print("    %15s: %10s" % ("Total", num_test))
         else: # all (or select data):
             if select is None:
                 print("All Data Results:")
@@ -934,6 +936,7 @@ def evaluate(self, batch_size=None, show=False, show_inputs=True, show_targets=T
                                               sample_weight=sample_weight, steps=steps)
             for i in range(len(self.model.metrics_names)):
                 print("    %15s: %10s" % (self.model.metrics_names[i], self.pf(results[i])))
+            print("    %15s: %10s" % ("Total", len(self.dataset)))
 
     def _evaluate_range(self, slice, show_inputs, show_targets, batch_size,
                         kverbose, sample_weight, steps, force, max_col_width):

conx/utils.py

@@ -44,14 +44,34 @@
     get_ipython = lambda: None
 
 #------------------------------------------------------------------------
-# configuration constants
+# configuration settings
 
 AVAILABLE_COLORMAPS = sorted(list(plt.cm.cmap_d.keys()))
 CURRENT_COLORMAP = "seismic_r"
 ERROR_COLORMAP = "seismic_r"
+_PROGRESS_BAR = 'standard'
 
 array = np.array
 
+def progress_bar(*args, **kwargs):
+    if _PROGRESS_BAR is None:
+        return items
+    elif _PROGRESS_BAR == "notebook":
+        tqdm.tqdm_notebook(*args, **kwargs)
+    elif _PROGRESS_BAR == "standard":
+        tqdm.tqdm(*args, **kwargs)
+    else:
+        return items
+
+def set_progress_bar(mode):
+    if mode in [None, 'notebook', 'standard']:
+        _PROGRESS_BAR = mode
+    else:
+        raise Exception("no such progress mode: use None, 'notebook', or 'standard'")
+
+def get_progress_bar():
+    return _PROGRESS_BAR
+
 def set_colormap(s):
     """
     Set the global colormap for displaying all network activations.
@@ -537,12 +557,13 @@ def download(url, directory="./", force=False, unzip=True, filename=None,
         response = requests.get(url, stream=True)
         total_length = response.headers.get('content-length')
         if total_length:
-            bar = tqdm.tqdm_notebook(total=int(total_length))
+            bar = progress_bar(total=int(total_length))
         with open(file_path, 'wb') as f:
             for data in response.iter_content(chunk_size=4096):
                 f.write(data)
                 if total_length:
-                    bar.update(4096)
+                    if bar:
+                        bar.update(4096)
         print("Done!")
     else:
         print("Using cached %s as '%s'." % (url, file_path))