fix doc build. make MergeAllSummaries a Triggerable

docs/conf.py

@@ -22,12 +22,7 @@ sys.path.insert(0, os.path.abspath('../'))
 os.environ['TENSORPACK_DOC_BUILDING'] = '1'
 
 
-MOCK_MODULES = ['scipy',
-                #'tensorflow', 'tensorflow.contrib',
-                #'tensorflow.python.ops',
-                #'tensorflow.contrib.framework',
-                #'tensorflow.python',
-                #'tensorflow.python.training',
+MOCK_MODULES = ['scipy', 'tabulate',
                 'sklearn.datasets', 'sklearn',
                 'scipy.misc', 'h5py', 'nltk',
                 'cv2', 'scipy.io', 'dill', 'zmq', 'subprocess32', 'lmdb',

setup.py

@@ -20,7 +20,6 @@ except ImportError:
 # configure requirements
 reqfile = os.path.join(CURRENT_DIR, 'requirements.txt')
 req = [x.strip() for x in open(reqfile).readlines()]
-
 reqfile = os.path.join(CURRENT_DIR, 'opt-requirements.txt')
 extra_req = [x.strip() for x in open(reqfile).readlines()]
 
@@ -43,7 +42,6 @@ setup(
     version=__version__,
     description='Neural Network Toolbox on TensorFlow',
     long_description=long_description,
-
     install_requires=req,
     tests_require=['flake8'],
     extras_require={

tensorpack/callbacks/summary.py

@@ -6,7 +6,7 @@
 import tensorflow as tf
 
 from ..utils.naming import MOVING_SUMMARY_OPS_KEY
-from .base import Callback
+from .base import Callback, Triggerable
 
 __all__ = ['MovingAverageSummary', 'MergeAllSummaries']
 
@@ -32,7 +32,7 @@ class MovingAverageSummary(Callback):
         return [self.ema_op]
 
 
-class MergeAllSummaries(Callback):
+class MergeAllSummaries(Triggerable):
     """
     Evaluate all summaries by `tf.summary.merge_all`, and write to logs.
     """
@@ -70,7 +70,15 @@ class MergeAllSummaries(Callback):
             return
         self.trainer.monitors.put_summary(summary)
 
+    def _summary_run_alone(self):
+        summary = self.summary_op.eval()
+        self.trainer.monitors.put_summary(summary)
+
     def _trigger_epoch(self):
         if self._run_alone:
-            summary = self.summary_op.eval()
-            self.trainer.monitors.put_summary(summary)
+            self._summary_run_alone()
+
+    def _trigger(self):
+        assert self._run_alone, \
+            "MergeAllSummaries can be used as a trigger only if run_alone=True."
+        self._summary_run_alone()