Make the progressbar's prefix string a parameter.

This doesn't really make it any more difficult to use, but allows me to
have a different progressbar in the upcoming optimizers examples.

Author: lucasb-eyer

examples/Kaggle-Otto/test.py

@@ -6,7 +6,7 @@
 from examples.utils import make_progressbar
 
 def validate(dataset_x, dataset_y, model, epoch, batch_size):
-    progress = make_progressbar('Testing', epoch, len(dataset_x))
+    progress = make_progressbar('Testing epoch #{}'.format(epoch), len(dataset_x))
     progress.start()
 
     mini_batch_input = np.empty(shape=(batch_size, 93), dtype=_th.config.floatX)

examples/Kaggle-Otto/train.py

@@ -4,7 +4,7 @@
 from examples.utils import make_progressbar
 
 def train(dataset_x, dataset_y, model, optimiser, criterion, epoch, batch_size, mode=None):
-    progress = make_progressbar('Training', epoch, len(dataset_x))
+    progress = make_progressbar('Training epoch #{}'.format(epoch), len(dataset_x))
     progress.start()
 
     shuffle = np.random.permutation(len(dataset_x))

examples/MNIST/test.py

@@ -4,7 +4,7 @@
 from examples.utils import make_progressbar
 
 def validate(dataset_x, dataset_y, model, epoch, batch_size):
-    progress = make_progressbar('Testing', epoch, len(dataset_x))
+    progress = make_progressbar('Testing epoch #{}'.format(epoch), len(dataset_x))
     progress.start()
 
     mini_batch_input = np.empty(shape=(batch_size, 28*28), dtype=_th.config.floatX)

examples/MNIST/train.py

@@ -5,7 +5,7 @@
 
 
 def train(dataset_x, dataset_y, model, optimiser, criterion, epoch, batch_size, mode='train'):
-    progress = make_progressbar('Training ({})'.format(mode), epoch, len(dataset_x))
+    progress = make_progressbar('Training ({}) epoch #{}'.format(mode, epoch), len(dataset_x))
     progress.start()
 
     shuffle = np.random.permutation(len(dataset_x))

examples/utils.py

@@ -8,8 +8,8 @@
 try:
     import progressbar as _pb
 
-    def make_progressbar(mode, epoch, data_size):
-        widgets = [mode + ' epoch #', str(epoch), ', processed ', _pb.Counter(), ' of ', str(data_size),
+    def make_progressbar(prefix, data_size):
+        widgets = [prefix, ', processed ', _pb.Counter(), ' of ', str(data_size),
                    ' (', _pb.Percentage(), ')', ' ', _pb.Bar(), ' ', _pb.ETA()]
         return _pb.ProgressBar(maxval=data_size, widgets=widgets)
 
@@ -32,7 +32,5 @@ def finish(self):
             _sys.stdout.write("\r" + self.fmt.format(i=self.lasti, tot=self.tot, pct=1.0) + "\n")
             _sys.stdout.flush()
 
-    def make_progressbar(mode, epoch, data_size):
-        return SimpleProgressBar(data_size,
-            "{} epoch #{}, processed {{i}} of {{tot}} ({{pct:.2%}})".format(mode, epoch)
-        )
+    def make_progressbar(prefix, data_size):
+        return SimpleProgressBar(data_size, prefix + ", processed {i} of {tot} ({pct:.2%})")