update docs

docs/conf.py

@@ -34,11 +34,22 @@ import mock
                 #', '.join(map(str, args)) + ', ' \
                 #+ ', '.join(["{}={}".format(k,v) for k,v in kwargs.items()]) + ')'
 
-MOCK_MODULES = ['scipy', 'tensorflow', 'scipy.misc', 'h5py', 'nltk',
+MOCK_MODULES = ['scipy',
+                'tensorflow', 'tensorflow.contrib',
+                'tensorflow.contrib.framework',
+                'tensorflow.models',
+                'tensorflow.models.rnn',
+                'tensorflow.models.rnn.ptb',
+                'tensorflow.python',
+                'tensorflow.python.training',
+                'sklearn.datasets',
+                'scipy.misc', 'h5py', 'nltk',
                 'cv2', 'scipy.io', 'dill', 'zmq', 'subprocess32', 'lmdb', 'tornado.concurrent',
-                'tornado', 'msgpack', 'msgpack_numpy', 'ale_python_interface']
+                'tornado', 'msgpack', 'msgpack_numpy', 'ale_python_interface',
+                'sklearn']
 for mod_name in MOCK_MODULES:
     sys.modules[mod_name] = mock.Mock(name=mod_name)
+sys.modules['tensorflow'].__version__ = '0.12.0'
 
 import tensorpack
 from tensorpack.models import *

docs/modules/tensorpack.RL.rst

@@ -4,14 +4,6 @@ tensorpack.RL package
 Submodules
 ----------
 
-tensorpack.RL.atari module
---------------------------
-
-.. automodule:: tensorpack.RL.atari
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 tensorpack.RL.common module
 ---------------------------
 
@@ -36,6 +28,14 @@ tensorpack.RL.expreplay module
     :undoc-members:
     :show-inheritance:
 
+tensorpack.RL.gymenv module
+---------------------------
+
+.. automodule:: tensorpack.RL.gymenv
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 tensorpack.RL.history module
 ----------------------------
 

docs/modules/tensorpack.callbacks.rst

@@ -12,10 +12,18 @@ tensorpack.callbacks.base module
     :undoc-members:
     :show-inheritance:
 
-tensorpack.callbacks.common module
-----------------------------------
+tensorpack.callbacks.concurrency module
+---------------------------------------
 
-.. automodule:: tensorpack.callbacks.common
+.. automodule:: tensorpack.callbacks.concurrency
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+tensorpack.callbacks.dispatcher module
+--------------------------------------
+
+.. automodule:: tensorpack.callbacks.dispatcher
     :members:
     :undoc-members:
     :show-inheritance:
@@ -60,10 +68,18 @@ tensorpack.callbacks.param module
     :undoc-members:
     :show-inheritance:
 
-tensorpack.callbacks.summary module
------------------------------------
+tensorpack.callbacks.saver module
+---------------------------------
+
+.. automodule:: tensorpack.callbacks.saver
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+tensorpack.callbacks.stats module
+---------------------------------
 
-.. automodule:: tensorpack.callbacks.summary
+.. automodule:: tensorpack.callbacks.stats
     :members:
     :undoc-members:
     :show-inheritance:

docs/modules/tensorpack.dataflow.dataset.rst

@@ -36,6 +36,14 @@ tensorpack.dataflow.dataset.mnist module
     :undoc-members:
     :show-inheritance:
 
+tensorpack.dataflow.dataset.ptb module
+--------------------------------------
+
+.. automodule:: tensorpack.dataflow.dataset.ptb
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 tensorpack.dataflow.dataset.svhn module
 ---------------------------------------
 

docs/modules/tensorpack.dataflow.rst

@@ -68,6 +68,22 @@ tensorpack.dataflow.raw module
     :undoc-members:
     :show-inheritance:
 
+tensorpack.dataflow.remote module
+---------------------------------
+
+.. automodule:: tensorpack.dataflow.remote
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+tensorpack.dataflow.tf_func module
+----------------------------------
+
+.. automodule:: tensorpack.dataflow.tf_func
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 
 Module contents
 ---------------

docs/modules/tensorpack.models.rst

@@ -68,6 +68,14 @@ tensorpack.models.regularize module
     :undoc-members:
     :show-inheritance:
 
+tensorpack.models.shapes module
+-------------------------------
+
+.. automodule:: tensorpack.models.shapes
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 tensorpack.models.softmax module
 --------------------------------
 

docs/modules/tensorpack.predict.rst

@@ -4,6 +4,14 @@ tensorpack.predict package
 Submodules
 ----------
 
+tensorpack.predict.base module
+------------------------------
+
+.. automodule:: tensorpack.predict.base
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 tensorpack.predict.common module
 --------------------------------
 

docs/modules/tensorpack.tfutils.rst

@@ -60,6 +60,30 @@ tensorpack.tfutils.symbolic_functions module
     :undoc-members:
     :show-inheritance:
 
+tensorpack.tfutils.tower module
+-------------------------------
+
+.. automodule:: tensorpack.tfutils.tower
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+tensorpack.tfutils.varmanip module
+----------------------------------
+
+.. automodule:: tensorpack.tfutils.varmanip
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+tensorpack.tfutils.varreplace module
+------------------------------------
+
+.. automodule:: tensorpack.tfutils.varreplace
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 
 Module contents
 ---------------

docs/modules/tensorpack.train.rst

@@ -20,6 +20,14 @@ tensorpack.train.config module
     :undoc-members:
     :show-inheritance:
 
+tensorpack.train.input_data module
+----------------------------------
+
+.. automodule:: tensorpack.train.input_data
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 tensorpack.train.multigpu module
 --------------------------------
 
@@ -28,6 +36,14 @@ tensorpack.train.multigpu module
     :undoc-members:
     :show-inheritance:
 
+tensorpack.train.queue module
+-----------------------------
+
+.. automodule:: tensorpack.train.queue
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 tensorpack.train.trainer module
 -------------------------------
 

docs/modules/tensorpack.utils.rst

@@ -4,6 +4,14 @@ tensorpack.utils package
 Submodules
 ----------
 
+tensorpack.utils.argtools module
+--------------------------------
+
+.. automodule:: tensorpack.utils.argtools
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 tensorpack.utils.concurrency module
 -----------------------------------
 
@@ -12,6 +20,14 @@ tensorpack.utils.concurrency module
     :undoc-members:
     :show-inheritance:
 
+tensorpack.utils.debug module
+-----------------------------
+
+.. automodule:: tensorpack.utils.debug
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 tensorpack.utils.discretize module
 ----------------------------------
 
@@ -28,6 +44,22 @@ tensorpack.utils.fs module
     :undoc-members:
     :show-inheritance:
 
+tensorpack.utils.globvars module
+--------------------------------
+
+.. automodule:: tensorpack.utils.globvars
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+tensorpack.utils.gpu module
+---------------------------
+
+.. automodule:: tensorpack.utils.gpu
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 tensorpack.utils.loadcaffe module
 ---------------------------------
 
@@ -76,10 +108,10 @@ tensorpack.utils.serialize module
     :undoc-members:
     :show-inheritance:
 
-tensorpack.utils.stat module
-----------------------------
+tensorpack.utils.stats module
+-----------------------------
 
-.. automodule:: tensorpack.utils.stat
+.. automodule:: tensorpack.utils.stats
     :members:
     :undoc-members:
     :show-inheritance:
@@ -100,6 +132,14 @@ tensorpack.utils.utils module
     :undoc-members:
     :show-inheritance:
 
+tensorpack.utils.viz module
+---------------------------
+
+.. automodule:: tensorpack.utils.viz
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 
 Module contents
 ---------------

examples/GAN/DCGAN-CelebA.py

@@ -41,7 +41,7 @@ class Model(ModelDesc):
         l = FullyConnected('fc0', z, 64 * 8 * 4 * 4, nl=tf.identity)
         l = tf.reshape(l, [-1, 4, 4, 64*8])
         l = BNReLU(l)
-        with argscope(Deconv2D, nl=BNReLU, kernel_shape=5, stride=2):
+        with argscope(Deconv2D, nl=BNReLU, kernel_shape=4, stride=2):
             l = Deconv2D('deconv1', l, [8, 8, 64 * 4])
             l = Deconv2D('deconv2', l, [16, 16, 64 * 2])
             l = Deconv2D('deconv3', l, [32, 32, 64])
@@ -51,7 +51,7 @@ class Model(ModelDesc):
 
     def discriminator(self, imgs):
         """ return a (b, 1) logits"""
-        with argscope(Conv2D, nl=tf.identity, kernel_shape=5, stride=2), \
+        with argscope(Conv2D, nl=tf.identity, kernel_shape=4, stride=2), \
                 argscope(LeakyReLU, alpha=0.2):
             l = (LinearWrap(imgs)
                 .Conv2D('conv0', 64, nl=LeakyReLU)

tensorpack/RL/gymenv.py

@@ -24,14 +24,15 @@ from ..utils.stats import StatCounter
 from .envbase import RLEnvironment, DiscreteActionSpace
 
 
-_ALE_LOCK = threading.Lock()
+_ENV_LOCK = threading.Lock()
 
 class GymEnv(RLEnvironment):
     """
     An OpenAI/gym wrapper. Can optionally auto restart.
+    Only support discrete action space now
     """
     def __init__(self, name, dumpdir=None, viz=False, auto_restart=True):
-        with _ALE_LOCK:
+        with _ENV_LOCK:
             self.gymenv = gym.make(name)
         if dumpdir:
             mkdir_p(dumpdir)

tensorpack/dataflow/prefetch.py

@@ -106,7 +106,7 @@ class PrefetchProcessZMQ(mp.Process):
         self.ds.reset_state()
         self.context = zmq.Context()
         self.socket = self.context.socket(zmq.PUSH)
-        self.socket.set_hwm(1)
+        self.socket.set_hwm(5)
         self.socket.connect(self.conn_name)
         while True:
             for dp in self.ds.get_data():