diff options
| author | txh18 <[email protected]> | 2015-10-28 19:13:48 +0800 |
|---|---|---|
| committer | txh18 <[email protected]> | 2015-10-28 19:13:48 +0800 |
| commit | 7e1c4e9f8b39e160814827befe02832737095a7d (patch) | |
| tree | 231900fc18bfd40946e342fa29ecc7b02bc9bb37 | |
| parent | e828c358b2637eac603f519b981737977ef4cb64 (diff) | |
| parent | a59b0b3df1bbd80f7c31e58fc70698f218117e67 (diff) | |
get recent changes
Merge branch 'master' of github.com:Nerv-SJTU/nerv
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | nerv/doc/source/conf.py | 3 | ||||
| -rw-r--r-- | nerv/doc/source/index.rst | 4 |
4 files changed, 6 insertions, 4 deletions
@@ -3,3 +3,4 @@ install/ build/ *.swp *.swo +speech/ @@ -1,5 +1,5 @@ #The Nerv Toolkit User Manual# -NOTE: This readme is obsolete and will be rearranged, for further information, please check http://determinant.github.io/nerv/ +NOTE: This readme is obsolete and will be rearranged, for further information, please check http://nerv-sjtu.github.io/nerv/ This user manual will information about how to use __Nerv__ and __Nerv__'s interface. diff --git a/nerv/doc/source/conf.py b/nerv/doc/source/conf.py index 8426613..4d6119f 100644 --- a/nerv/doc/source/conf.py +++ b/nerv/doc/source/conf.py @@ -15,6 +15,7 @@ import sys import os import shlex +import alabaster # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -119,7 +120,7 @@ html_theme = 'alabaster' #html_theme_options = {} # Add any paths that contain custom themes here, relative to this directory. -#html_theme_path = [] +html_theme_path = [alabaster.get_path()] # The name for this set of Sphinx documents. If None, it defaults to # "<project> v<release> documentation". diff --git a/nerv/doc/source/index.rst b/nerv/doc/source/index.rst index e55892b..21cf309 100644 --- a/nerv/doc/source/index.rst +++ b/nerv/doc/source/index.rst @@ -21,7 +21,7 @@ TODO List | Status/ | Task | Assignee | | Priority | | | +==========+==========================================================================+=============+ -| High | Generalize nerv.Matrix to nerv.Tensor (use the same API as Torch Tensor) | Ted Yin | +| High | Generalize nerv.Matrix to nerv.Tensor (use the same API as Torch Tensor) | Mengxiao Bi | +----------+--------------------------------------------------------------------------+-------------+ | High | Development manual: coding style & contribution rules | Ted Yin | +----------+--------------------------------------------------------------------------+-------------+ @@ -31,7 +31,7 @@ TODO List +----------+--------------------------------------------------------------------------+-------------+ | High | support for RNN/LSTM | Tianxing He | +----------+--------------------------------------------------------------------------+-------------+ -| Mid | support for CNN | ? (Ted Yin) | +| High | support for CNN | Mengxiao Bi | +----------+--------------------------------------------------------------------------+-------------+ | Mid | User manual | ALL | +----------+--------------------------------------------------------------------------+-------------+ |