rebase

Makefile

@@ -52,9 +52,11 @@ spelling:
 	$(call check_install_extra, sphinxcontrib.spelling, sphinxcontrib.spelling pyenchant)
 	cd docs && make spelling SPHINXOPTS="-W"
 
-clean:
+doc-clean:
 	cd docs && make clean
 
+clean: doc-clean
+
 commit-checks: format lint mypy check-docstyle spelling
 
 .PHONY: clean spelling doc mypy lint format check-codestyle check-docstyle commit-checks

README.md

@@ -50,7 +50,7 @@ Here is Tianshou's other features:
 
 - Elegant framework, using only ~4000 lines of code
 - State-of-the-art [MuJoCo benchmark](https://github.com/thu-ml/tianshou/tree/master/examples/mujoco) for REINFORCE/A2C/TRPO/PPO/DDPG/TD3/SAC algorithms
-- Support parallel environment simulation (synchronous or asynchronous) for all algorithms [Usage](https://tianshou.readthedocs.io/en/master/tutorials/cheatsheet.html#parallel-sampling)
+- Support vectorized environment (synchronous or asynchronous) for all algorithms [Usage](https://tianshou.readthedocs.io/en/master/tutorials/cheatsheet.html#parallel-sampling)
 - Support recurrent state representation in actor network and critic network (RNN-style training for POMDP) [Usage](https://tianshou.readthedocs.io/en/master/tutorials/cheatsheet.html#rnn-style-training)
 - Support any type of environment state/action (e.g. a dict, a self-defined class, ...) [Usage](https://tianshou.readthedocs.io/en/master/tutorials/cheatsheet.html#user-defined-environment-and-different-state-representation)
 - Support customized training process [Usage](https://tianshou.readthedocs.io/en/master/tutorials/cheatsheet.html#customize-training-process)

docs/index.rst

@@ -41,7 +41,7 @@ Here is Tianshou's other features:
 
 * Elegant framework, using only ~3000 lines of code
 * State-of-the-art `MuJoCo benchmark <https://github.com/thu-ml/tianshou/tree/master/examples/mujoco>`_
-* Support parallel environment simulation (synchronous or asynchronous) for all algorithms: :ref:`parallel_sampling`
+* Support vectorized environment (synchronous or asynchronous) for all algorithms: :ref:`parallel_sampling`
 * Support recurrent state representation in actor network and critic network (RNN-style training for POMDP): :ref:`rnn_training`
 * Support any type of environment state/action (e.g. a dict, a self-defined class, ...): :ref:`self_defined_env`
 * Support :ref:`customize_training`

docs/spelling_wordlist.txt

@@ -11,6 +11,7 @@ timelimit
 TimeLimit
 maxsize
 timestep
+timesteps
 numpy
 ndarray
 stackoverflow

docs/tutorials/dqn.rst

@@ -9,30 +9,69 @@ The full script is at `test/discrete/test_dqn.py <https://github.com/thu-ml/tian
 Contrary to existing Deep RL libraries such as `RLlib <https://github.com/ray-project/ray/tree/master/rllib/>`_, which could only accept a config specification of hyperparameters, network, and others, Tianshou provides an easy way of construction through the code-level.
 
 
+Overview
+--------
+
+In reinforcement learning, the agent interacts with environments to improve itself.
+
+.. image:: /_static/images/rl-loop.jpg
+    :align: center
+    :height: 200
+
+There are three types of data flow in RL training pipeline:
+
+1. Agent to environment: ``action`` will be generated by agent and sent to environment;
+2. Environment to agent: ``env.step`` takes action, and returns a tuple of ``(observation, reward, done, info)``;
+3. Agent-environment interaction to agent training: the data generated by interaction will be stored and sent to the learner of agent.
+
+In the following sections, we will set up (vectorized) environments, policy (with neural network), collector (with buffer), and trainer to successfully run the RL training and evaluation pipeline.
+Here is the overall system:
+
+.. image:: /_static/images/pipeline.png
+    :align: center
+    :height: 300
+
+
 Make an Environment
 -------------------
 
-First of all, you have to make an environment for your agent to interact with. For environment interfaces, we follow the convention of `OpenAI Gym <https://github.com/openai/gym>`_. In your Python code, simply import Tianshou and make the environment:
+First of all, you have to make an environment for your agent to interact with. You can use ``gym.make(environment_name)`` to make an environment for your agent. For environment interfaces, we follow the convention of `OpenAI Gym <https://github.com/openai/gym>`_. In your Python code, simply import Tianshou and make the environment:
 ::
 
     import gym
     import tianshou as ts
 
     env = gym.make('CartPole-v0')
 
-CartPole-v0 is a simple environment with a discrete action space, for which DQN applies. You have to identify whether the action space is continuous or discrete and apply eligible algorithms. DDPG :cite:`DDPG`, for example, could only be applied to continuous action spaces, while almost all other policy gradient methods could be applied to both, depending on the probability distribution on the action.
+CartPole-v0 includes a cart carrying a pole moving on a track. This is a simple environment with a discrete action space, for which DQN applies. You have to identify whether the action space is continuous or discrete and apply eligible algorithms. DDPG :cite:`DDPG`, for example, could only be applied to continuous action spaces, while almost all other policy gradient methods could be applied to both.
+
+Here is the detail of useful fields of CartPole-v0:
+
+- ``state``: the position of the cart, the velocity of the cart, the angle of the pole and the velocity of the tip of the pole;
+- ``action``: can only be one of ``[0, 1, 2]``, for moving the cart left, no move, and right;
+- ``reward``: each timestep you last, you will receive a +1 ``reward``;
+- ``done``: if CartPole is out-of-range or timeout (the pole is more than 15 degrees from vertical, or the cart moves more than 2.4 units from the center, or you last over 200 timesteps);
+- ``info``: extra info from environment simulation.
 
+The goal is to train a good policy that can get the highest reward in this environment.
 
-Setup Multi-environment Wrapper
--------------------------------
+
+Setup Vectorized Environment
+----------------------------
 
 If you want to use the original ``gym.Env``:
 ::
 
     train_envs = gym.make('CartPole-v0')
     test_envs = gym.make('CartPole-v0')
 
-Tianshou supports parallel sampling for all algorithms. It provides four types of vectorized environment wrapper: :class:`~tianshou.env.DummyVectorEnv`, :class:`~tianshou.env.SubprocVectorEnv`, :class:`~tianshou.env.ShmemVectorEnv`, and :class:`~tianshou.env.RayVectorEnv`. It can be used as follows: (more explanation can be found at :ref:`parallel_sampling`)
+Tianshou supports vectorized environment for all algorithms. It provides four types of vectorized environment wrapper:
+
+- :class:`~tianshou.env.DummyVectorEnv`: the sequential version, using a single-thread for-loop;
+- :class:`~tianshou.env.SubprocVectorEnv`: use python multiprocessing and pipe for concurrent execution;
+- :class:`~tianshou.env.ShmemVectorEnv`: use share memory instead of pipe based on SubprocVectorEnv;
+- :class:`~tianshou.env.RayVectorEnv`: use Ray for concurrent activities and is currently the only choice for parallel simulation in a cluster with multiple machines. It can be used as follows: (more explanation can be found at :ref:`parallel_sampling`)
+
 ::
 
     train_envs = ts.env.DummyVectorEnv([lambda: gym.make('CartPole-v0') for _ in range(10)])
@@ -111,11 +150,25 @@ Setup Collector
 
 The collector is a key concept in Tianshou. It allows the policy to interact with different types of environments conveniently.
 In each step, the collector will let the policy perform (at least) a specified number of steps or episodes and store the data in a replay buffer.
+
+The following code shows how to set up a collector in practice. It is worth noticing that VectorReplayBuffer is to be used in vectorized environment scenarios, and the number of buffers, in the following case 10, is preferred to be set as the number of environments.
+
 ::
 
     train_collector = ts.data.Collector(policy, train_envs, ts.data.VectorReplayBuffer(20000, 10), exploration_noise=True)
     test_collector = ts.data.Collector(policy, test_envs, exploration_noise=True)
 
+The main function of collector is the collect function, which can be summarized in the following lines:
+
+::
+
+    result = self.policy(self.data, last_state)                         # the agent predicts the batch action from batch observation
+    act = to_numpy(result.act)
+    self.data.update(act=act)                                           # update the data with new action/policy
+    result = self.env.step(act, ready_env_ids)                          # apply action to environment
+    obs_next, rew, done, info = result
+    self.data.update(obs_next=obs_next, rew=rew, done=done, info=info)  # update the data with new state/reward/done/info
+
 
 Train Policy with a Trainer
 ---------------------------

tianshou/data/buffer/base.py

@@ -46,7 +46,7 @@ def __init__(
             "sample_avail": sample_avail,
         }
         super().__init__()
-        self.maxsize = size
+        self.maxsize = int(size)
         assert stack_num > 0, "stack_num should be greater than 0"
         self.stack_num = stack_num
         self._indices = np.arange(size)