You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@singa.apache.org by wa...@apache.org on 2018/05/04 06:49:33 UTC

[1/2] incubator-singa git commit: SINGA-352 Complete SINGA documentation in Chinese version

Repository: incubator-singa
Updated Branches:
  refs/heads/master 6b1ed7938 -> 3a373987a


SINGA-352 Complete SINGA documentation in Chinese version


Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/362c8736
Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/362c8736
Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/362c8736

Branch: refs/heads/master
Commit: 362c8736dcf3ed9af26e9742c5dd8160a7168aaf
Parents: fb7b0d3
Author: Wentong-DST <li...@gmail.com>
Authored: Thu May 3 15:58:51 2018 +0800
Committer: Wentong-DST <li...@gmail.com>
Committed: Thu May 3 15:58:51 2018 +0800

----------------------------------------------------------------------
 doc/conf.py                           |   8 ++-
 doc/zh/community/issue-tracking.md    |   9 +++
 doc/zh/community/mail-lists.rst       |  28 ++++++++
 doc/zh/community/source-repository.md |  22 ++++++
 doc/zh/community/team-list.rst        |  84 ++++++++++++++++++++++
 doc/zh/develop/contribute-code.md     |  48 +++++++++++++
 doc/zh/develop/how-contribute.md      |   9 +++
 doc/zh/develop/schedule.rst           |  66 +++++++++++++++++
 doc/zh/docs.rst                       |  23 ++++++
 doc/zh/downloads.md                   | 109 +++++++++++++++++++++++++++++
 doc/zh/index.rst                      |  40 +++++++++--
 11 files changed, 439 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/362c8736/doc/conf.py
----------------------------------------------------------------------
diff --git a/doc/conf.py b/doc/conf.py
index ef043d4..617a07e 100755
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -34,8 +34,12 @@
 #
 import os
 import sys
-#sys.path.insert(0, os.path.abspath('.'))
-#sys.path.insert(1, os.path.abspath('../build/python/'))
+
+# If the user has singa codebase
+# will build document from code comments in these loactions
+sys.path.append(os.path.abspath('../python/'))
+sys.path.append(os.path.abspath('../build/python/'))
+
 
 # -- General configuration ------------------------------------------------
 from recommonmark.parser import CommonMarkParser

http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/362c8736/doc/zh/community/issue-tracking.md
----------------------------------------------------------------------
diff --git a/doc/zh/community/issue-tracking.md b/doc/zh/community/issue-tracking.md
new file mode 100644
index 0000000..6104287
--- /dev/null
+++ b/doc/zh/community/issue-tracking.md
@@ -0,0 +1,9 @@
+## 问题追踪
+
+___
+
+SINGA 使用基于 J2EE 的 [JIRA](https://www.atlassian.com/software/jira), 问题跟踪和项目管理应用程序.
+
+问题,错误和功能请求应提交给此项目的以下问题跟踪系统.
+
+* https://issues.apache.org/jira/browse/singa

http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/362c8736/doc/zh/community/mail-lists.rst
----------------------------------------------------------------------
diff --git a/doc/zh/community/mail-lists.rst b/doc/zh/community/mail-lists.rst
new file mode 100644
index 0000000..abe2287
--- /dev/null
+++ b/doc/zh/community/mail-lists.rst
@@ -0,0 +1,28 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+
+
+项目邮件列表
+=====================
+
+这些是为这个项目建立的邮件列表. 对于每个列表,都有一个订阅,取消订阅和一个存档链接.
+
+.. csv-table:: 邮件列表
+	:header: "名称", "岗位", "订阅", "退订", "档案"
+
+        "开发", "dev@singa.incubator.apache.org", "`订阅 <ma...@singa.incubator.apache.org>`_", "`退订 <ma...@singa.incubator.apache.org.>`_", "`mail-archives.apache.org <http://mail-archives.apache.org/mod_mbox/singa-dev/>`_"
+        "提交", "commits@singa.incubator.apache.org", "`订阅 <ma...@singa.incubator.apache.org>`_", "`退订 <ma...@singa.incubator.apache.org>`_", "`mail-archives.apache.org  <http://mail-archives.apache.org/mod_mbox/singa-commits/>`_"

http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/362c8736/doc/zh/community/source-repository.md
----------------------------------------------------------------------
diff --git a/doc/zh/community/source-repository.md b/doc/zh/community/source-repository.md
new file mode 100644
index 0000000..cc4cb9c
--- /dev/null
+++ b/doc/zh/community/source-repository.md
@@ -0,0 +1,22 @@
+# 源代码库
+
+___
+
+该项目使用 [Git](http://git-scm.com/) 来管理其源代码. 有关 Git 的使用说明,请访问 [http://git-scm.com/documentation](http://git-scm.com/documentation).
+
+## Web 访问
+
+以下是指向在线源代码库的链接.
+
+* [https://git-wip-us.apache.org/repos/asf?p=incubator-singa.git;a=summary](https://git-wip-us.apache.org/repos/asf?p=incubator-singa.git;a=summary)
+
+
+## 提交者的上游 Upstream
+
+提交者需要将上游 upstream 端点设置为 Apache git(而不是github)的 repo 地址, 例如,
+
+    $ git remote add asf https://git-wip-us.apache.org/repos/asf/incubator-singa.git
+
+然后你(提交者)可以用这种方式推送你的代码,
+
+    $ git push asf <local-branch>:<remote-branch>

http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/362c8736/doc/zh/community/team-list.rst
----------------------------------------------------------------------
diff --git a/doc/zh/community/team-list.rst b/doc/zh/community/team-list.rst
new file mode 100644
index 0000000..a344bbf
--- /dev/null
+++ b/doc/zh/community/team-list.rst
@@ -0,0 +1,84 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+
+
+SINGA团队
+==============
+
+一个成功的项目需要很多人扮演很多角色. 一些成员编写代码或文档, 而其他成员则作为测试人员提供补丁和建议.
+
+指导
+-------
+
+==================   ============
+姓名                 Email
+==================   ============
+Daniel Dai           daijy@apache.org
+Ted Dunning          tdunning@apache.org
+Alan Gates           gates@apache.org
+Thejas Nair          thejas@apache.org
+==================   ============
+
+
+开发人员
+----------
+
+SINGA社区的开发者主要来自新加坡国立大学,浙江大学,网易,大阪大学,yzBigData等.
+
++--------------------+--------------------------------+-----------------------------------------------+
+| 姓名               | Email                          | 组织		                                  |
++====================+================================+===============================================+
+| Gang Chen          | cg@zju.edu.cn                  | Zhejiang University                           |
++--------------------+--------------------------------+-----------------------------------------------+
+| Haibo Chen         | hzchenhaibo@corp.netease.com   | NetEase                                       |
++--------------------+--------------------------------+-----------------------------------------------+
+| Anh Dinh           | dinhtta@apache.org             | National University of Singapore              |
++--------------------+--------------------------------+-----------------------------------------------+
+| Jinyang Gao        | jinyang@apache.org             | National University of Singapore              |
++--------------------+--------------------------------+-----------------------------------------------+
+| Xing Ji            | jixin@comp.nus.edu.sg          | National University of Singapore              |
++--------------------+--------------------------------+-----------------------------------------------+
+| Chonho Lee         | chonho@gmail.com               | Osaka University                              |
++--------------------+--------------------------------+-----------------------------------------------+
+| Zhaojing Luo       | zhaojing@apache.org            | National University of Singapore              |
++--------------------+--------------------------------+-----------------------------------------------+
+| Beng Chin Ooi      | ooibc@comp.nus.edu.sg          | National University of Singapore              |
++--------------------+--------------------------------+-----------------------------------------------+
+| Kian-Lee Tan       | tankl@apache.org               | National University of Singapore              |
++--------------------+--------------------------------+-----------------------------------------------+
+| Anthony K. H. Tung | atung@comp.nus.edu.sg          | National University of Singapore              |
++--------------------+--------------------------------+-----------------------------------------------+
+| Ji Wang            | wangji@comp.nus.edu.sg         | National University of Singapore              |
++--------------------+--------------------------------+-----------------------------------------------+
+| Sheng Wang         | wangsh@apache.org              | National University of Singapore              |
++--------------------+--------------------------------+-----------------------------------------------+
+| Wei Wang           | wangwei@apache.org             | National University of Singapore              |
++--------------------+--------------------------------+-----------------------------------------------+
+| Yuan Wang          | wangyuan@corp.netease.com      | NetEase                                       |
++--------------------+--------------------------------+-----------------------------------------------+
+| Wenfeng Wu         | wuwf@comp.nus.edu.sg           | National University of Singapore              |
++--------------------+--------------------------------+-----------------------------------------------+
+| Zhongle Xie        | zhongle@apache.org             | National University of Singapore              |
++--------------------+--------------------------------+-----------------------------------------------+
+| Meihui Zhang       | meihui_zhang@sutd.edu.sg       | Singapore University of Technology and Design |
++--------------------+--------------------------------+-----------------------------------------------+
+| Kaiping Zheng      | kaiping@apache.org             | National University of Singapore              |
++--------------------+--------------------------------+-----------------------------------------------+
+| Moaz Reyad         | moazreyad@gmail.com            | National University of Singapore              |
++--------------------+--------------------------------+-----------------------------------------------+
+| Chang Yao          | yaochang2009@gmail.com         | yzBigdata                                     |
++--------------------+--------------------------------+-----------------------------------------------+

http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/362c8736/doc/zh/develop/contribute-code.md
----------------------------------------------------------------------
diff --git a/doc/zh/develop/contribute-code.md b/doc/zh/develop/contribute-code.md
new file mode 100644
index 0000000..3a85bc6
--- /dev/null
+++ b/doc/zh/develop/contribute-code.md
@@ -0,0 +1,48 @@
+## 如何贡献代码
+
+
+### 代码风格
+
+SINGA 代码库遵循 [Google C++ 风格指导](http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml).
+
+如果想检查你的代码是否符合风格, 你可以用如下 cpplint 工具:
+
+    $ ./tool/cpplint.py YOUR_FILE
+
+
+### JIRA 格式
+
+像其他 Apache 项目一样,SINGA 使用 JIRA 来追踪错误,改进和其他高层讨论(例如,系统设计和功能). 
+Github pull requests 用于实施讨论,例如代码审查和代码合并.
+
+* 提供一个描述性标题.
+* 写一个详细的描述. 对于错误报告,这应该最好包括一个问题的短暂再现. 对于新功能,它可能包含一个设计文档.
+* 填写[必填字段](https://cwiki.apache.org/confluence/display/SPARK/Contributing+to+Spark#ContributingtoSpark-JIRA)
+
+### Pull Request
+
+工作流程是
+
+* Fork [SINGA Github repository](https://github.com/apache/incubator-singa) 到你自己的 Github 帐户.
+
+* Clone 你自己的 fork, 创建一个新的 branch (例如, feature-foo or fixbug-foo),
+ 进行这项工作. 完成你的工作后,
+ [rebase](https://git-scm.com/book/en/v2/Git-Branching-Rebasing) 
+它到当前最新的 master 并 push commits 到你自己的 Github 帐户 (新 branch).
+
+* 针对 apache / incubator-singa 的 master branch 打开一个 pull request.
+PR 标题应该是 SINGA-xxxx 的格式,其中 SINGA-xxxx 是相关的JIRA编号,
+标题可以是 JIRA 的标题或描述 PR 本身的更具体的标题, 例如,"SINGA-6 Implement thread-safe singleton". 
+详细描述可以从 JIRA 复制.
+考虑确定提交者或者在被改变的代码工作的其他贡献者. 在 Github 中找到文件并点击 "Blame" 查看最后修改了代码的逐行注释. 您可以在中添加含有 @username 的 pull request 描述并立即 ping 他们.
+请说明你的原创作品和贡献并且您根据项目的开源许可证将工作许可给项目. 
+进一步向你的新分支进行的提交(例如错误修复)会被 Github 自动添加到这个 pull request.
+
+* 等待一个提交者查看该补丁. 如果没有冲突,提交者会将其与 master branch 合并. 
+合并应该 a) 不用 rebase b) 禁用 fast forward merge c) 检查提交消息格式并测试代码/功能.
+
+* 如果有太多的小提交信息,你会被告知将你的提交压缩成更少的有意义的提交. 
+如果您的提交信息不符合格式 (如 SINGA-xxxx), 你会被告知重新提交你的提交信息. 
+这两个更改都可以使用交互式 git rebase. 一旦你得到了更正的提交,
+再次将它们推送到你自己的 github. 你的 pull request 会自动更新. 
+详情请参阅 [Rebase Pull Requests](https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request).

http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/362c8736/doc/zh/develop/how-contribute.md
----------------------------------------------------------------------
diff --git a/doc/zh/develop/how-contribute.md b/doc/zh/develop/how-contribute.md
new file mode 100644
index 0000000..a609eab
--- /dev/null
+++ b/doc/zh/develop/how-contribute.md
@@ -0,0 +1,9 @@
+# 如何贡献给 SINGA
+
+与任何开源项目一样, 你可以以多种方式帮助:
+
+* 加入我们的[邮件列表](http://singa.apache.org/en/community/mail-lists.html) 并且回答其他用户的问题.
+* 自己[编译生成 SINGA](http://singa.apache.org/en/docs/installation.html).
+* 报告错误, 功能请求以及其他问题,在[问题追踪](http://singa.apache.org/en/community/issue-tracking.html)里.
+* 检查SINGA的[开发日程表](http://singa.apache.org/en/develop/schedule.html)以及通过提供补丁[贡献代码](http://singa.apache.org/en/develop/contribute-code.html).
+* 通过更新缺失或不清楚网页[帮助写文档](http://singa.apache.org/en/develop/contribute-docs.html).

http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/362c8736/doc/zh/develop/schedule.rst
----------------------------------------------------------------------
diff --git a/doc/zh/develop/schedule.rst b/doc/zh/develop/schedule.rst
new file mode 100644
index 0000000..bdd821f
--- /dev/null
+++ b/doc/zh/develop/schedule.rst
@@ -0,0 +1,66 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+
+
+开发时间表
+====================
+
+.. csv-table::
+  :header: "版本","模块","特性"
+
+  "v0.1 2015 九月     ","神经网络               ","前向传播神经网络, 包括 CNN, MLP                                                                     "
+  "                   ","                             ","类 RBM 模型, 包括 RBM                                                                                       "
+  "                   ","                             ","循环神经网络, 包括标准 RNN                                                                    "
+  "                   ","架构                 ","在单节点运行一个工作组  (包括划分)                                                               "
+  "                   ","                             ","在单节点运行多个工作组, 用 `Hogwild <http://www.eecs.berkeley.edu/~brecht/papers/hogwildTR.pdf>`_     "
+  "                   ","                             ","分布式 Hogwild"
+  "                   ","                             ","跨多节点运行多个工作组 , 如 `Downpour <http://papers.nips.cc/paper/4687-large-scale-distritbuted-deep-networks>`_"
+  "                   ","                             ","All-Reduce 训练架构如 `DeepImage <http://arxiv.org/abs/1501.02876>`_                                "
+  "                   ","                             ","服务器间负载均衡                                                                                           "
+  "                   ","失败恢复             ","检查点和恢复                                                                                              "
+  "                   ","工具                        ","用 GNU 自动工具安装                                                                                    "
+  "v0.2 2016 一月      ","神经网络               ","前向传播神经网络, 包括 AlexNet, cuDNN 层, 工具                                                  "
+  "                   ","                             ","循环神经网络, 包括 GRU 层和 BPTT                                                               "
+  "                   ","                             ","模型划分和混合划分                                                                                "
+  "                   ","工具                        ","融合 Mesos 资源管理                                                                      "
+  "                   ","                             ","准备部署 Docker images"
+  "                   ","                             ","可视化神经网络和调试信息"
+  "                   ","绑定                      ","主要组件 Python 绑定"
+  "                   ","GPU                          ","单节点多个 GPU "
+  "v0.3 2016 四月    ","GPU                          ","多个节点, 每个包含多个 GPU"
+  "                   ","                             ","用 GPU 和 CPU 混合训练  `CcT <http://arxiv.org/abs/1504.04343>`_"
+  "                   ","                             ","支持 cuDNN v4 "
+  "                   ","安装                 ","删除 ZeroMQ, CZMQ 依赖, 单节点训练 zookeeper"
+  "                   ","优化器                      ","添加新的 SGD 优化器,包括 Adam, AdamMax 和 AdaDelta"
+  "                   ","绑定                      ","增强 Python 绑定训练"
+  "v1.0 2016 九月      ","模型抽象      ","Tensor 基于线性代数, 神经网络和随机运算"
+  "                   ","                             ","分布式参数更新优化器"
+  "                   ","硬件                     ","使用 Cuda 和 Cudnn for Nvidia GPU"
+  "                   ","                             ","使用 OpenCL for AMD GPU 及其他设备"
+  "                   ","跨平台               ","从 Linux 扩展到 MacOS"
+  "                   ","                             ","大型图像模型, 例如, `VGG <https://arxiv.org/pdf/1409.1556.pdf>`_ 和 `Residual Net <http://arxiv.org/abs/1512.03385>`_"
+  "v1.1 2017 一月      ","模型库                    ","GoogleNet; 医疗健康模型"
+  "                   ","Caffe 转换器              ","使用 SINGA 训练模型, 从 caffe proto 文件配置"
+  "                   ","模型组件             ","添加 concat 和 slice 层; 接受多个输入网络"
+  "                   ","编译和安装 ","Windows 支持"
+  "                   ","                             ","通过与 protobuf 和 openblas 一起编译 SINGA 简化安装"
+  "                   ","                             ","用 Jenkins 自动生成 python wheel"
+  "                   ","                             ","从 Debian packages 安装 SINGA"
+  "v1.2 2017 十月      ","Numpy API                    ","依照 numpy API 实现 PySINGA 的 tensor 模块的函数"
+  "                   ","分布式训练         ","从 V0.3 移植分布式训练框架"
+  "                   ","内存优化          ","用新内存池替代 CNMEM 以减少内存消耗"
+  "                   ","执行优化       ","执行调度及运行时优化"

http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/362c8736/doc/zh/docs.rst
----------------------------------------------------------------------
diff --git a/doc/zh/docs.rst b/doc/zh/docs.rst
new file mode 100644
index 0000000..49a0bbd
--- /dev/null
+++ b/doc/zh/docs.rst
@@ -0,0 +1,23 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+
+
+文档
+=============
+
+.. toctree::
+   docs/index

http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/362c8736/doc/zh/downloads.md
----------------------------------------------------------------------
diff --git a/doc/zh/downloads.md b/doc/zh/downloads.md
new file mode 100644
index 0000000..8e174f6
--- /dev/null
+++ b/doc/zh/downloads.md
@@ -0,0 +1,109 @@
+## 下载 SINGA
+
+* 最新的代码: 请从 [Github](https://github.com/apache/incubator-singa) 的 dev branch 进行 clone
+
+* v1.1.0 (2017年2月12日):
+     * [Apache SINGA 1.1.0](http://www.apache.org/dyn/closer.cgi/incubator/singa/1.1.0/apache-singa-incubating-1.1.0.tar.gz)
+      [\[MD5\]](https://dist.apache.org/repos/dist/release/incubator/singa/1.1.0/apache-singa-incubating-1.1.0.tar.gz.md5)
+      [\[KEYS\]](https://dist.apache.org/repos/dist/release/incubator/singa/1.1.0/KEYS)
+    * [发行说明 1.1.0](releases/RELEASE_NOTES_1.1.0.html)
+    * 新功能和主要更新,
+        * 创建 Docker 镜像(CPU和GPU版本)
+        * 为 SINGA 创建 Amazon AMI(CPU版本)
+        * 与 Jenkins 集成以自动生成 Wheel 和 Debian 软件包(用于安装),并更新网站.
+        * 增强 FeedFowardNet, 例如,用于调试的多输入和详细模式
+        * 添加 Concat 和 Slice 层
+        * 扩展 CrossEntropyLoss 以接受具有多个标签的实例
+        * 添加 image_tool.py 与图像增强方法
+        * 通过 Snapshot API 支持模型加载和保存
+        * 在 Windows 上编译 SINGA 源代码
+        * 用 SINGA 代码编译强制依赖库
+        * 启用 S​​INGA 的 Java 绑定(基本)
+        * 在检查点文件中添加版本 ID
+        * 添加 Rafiki 工具包以提供 RESTFul API
+        * 添加 Caffe 预训练的例子,包括 GoogleNet
+
+
+
+* v1.0.0 (2016年9月8日):
+    * [Apache SINGA 1.0.0](https://archive.apache.org/dist/incubator/singa/1.0.0/apache-singa-incubating-1.0.0.tar.gz)
+      [\[MD5\]](https://archive.apache.org/dist/incubator/singa/1.0.0/apache-singa-incubating-1.0.0.tar.gz.md5)
+      [\[KEYS\]](https://archive.apache.org/dist/incubator/singa//1.0.0/KEYS)
+    * [发行说明 1.0.0](releases/RELEASE_NOTES_1.0.0.html)
+    * 新功能和主要更新,
+        * 用于支持更多机器学习模型的张量抽象.
+        * 设备抽象运行在不同的硬件设备上,包括CPU,(Nvidia / AMD)GPU 和 FPGA(将在更高版本中测试).
+        * 用 cmake 替换 GNU autotool 进行编译.
+        * 支持 Mac OS
+        * 改进Python绑定,包括安装和编程
+        * 更多深度学习模型, 包括 VGG 和 ResNet
+        * 读取/写入文件和编码/解码数据的更多 IO 类
+        * 直接基于 Socket 的新网络通信组件.
+        * 包含 Dropout 和 RNN 层的 Cudnn V5.
+        * 将网站制作工具从 maven 替换为 Sphinx
+        * 整合 Travis-CI
+
+
+* v0.3.0 (2016年4月20日):
+    * [Apache SINGA 0.3.0](https://archive.apache.org/dist/incubator/singa/0.3.0/apache-singa-incubating-0.3.0.tar.gz)
+      [\[MD5\]](https://archive.apache.org/dist/incubator/singa/0.3.0/apache-singa-incubating-0.3.0.tar.gz.md5)
+      [\[KEYS\]](https://archive.apache.org/dist/incubator/singa/0.3.0/KEYS)
+    * [发行说明 0.3.0](releases/RELEASE_NOTES_0.3.0.html)
+    * 新功能和主要更新,
+        * [在 GPU 集群上](v0.3.0/gpu.html) 可以在 GPU 集群上训练深度学习模型.
+        * [Python 包装器的改进](v0.3.0/python.html) 使得配置工作变得很容易, 包括神经网络和 SGD 算法.
+        * [新增 SGD 更新器](v0.3.0/updater.html), 包括 Adam, AdaDelta 和 AdaMax.
+        * [安装](v0.3.0/installation.html) 具有较少的相关库, 对于单节点培训.
+        * 在 CPU 和 GPU 上进行异构训练.
+        * 支持 cuDNN V4.
+        * 数据预读取.
+        * 修复一些错误.
+
+
+
+* v0.2.0 (2016年1月14日):
+    * [Apache SINGA 0.2.0](https://archive.apache.org/dist/incubator/singa/0.2.0/apache-singa-incubating-0.2.0.tar.gz)
+      [\[MD5\]](https://archive.apache.org/dist/incubator/singa/0.2.0/apache-singa-incubating-0.2.0.tar.gz.md5)
+      [\[KEYS\]](https://archive.apache.org/dist/incubator/singa/0.2.0/KEYS)
+    * [发行说明 0.2.0](releases/RELEASE_NOTES_0.2.0.html)
+    * 新功能和主要更新,
+        * [在 GPU 上进行训练](v0.2.0/gpu.html) 可以在具有多个 GPU 卡的单个节点上对复杂模型进行训练.
+        * [混合神经网络划分](v0.2.0/hybrid.html) 同时支持数据和模型并行.
+        * [Python 包装器](v0.2.0/python.html) 可以很容易地配置作业,包括神经网络和 SGD 算法.
+        * [RNN 模型和 BPTT 算法](v0.2.0/general-rnn.html) 实现并支持基于 RNN 模型的应用,例如 GRU.
+        * [云软件集成](v0.2.0/distributed-training.html) 包括 Mesos,Docker 和 HDFS.
+        * 可视化神经网络结构和层信息,有助于调试.
+        * 线性代数函数和针对 Blob 和原始数据指针的随机函数.
+        * 新层,包括 Softmax 层,ArgSort 层,Dummy 层,RNN 层和 cuDNN 层
+        * 更新 Layer 类以携带多个数据/梯度 Blob.
+        * 通过加载预训练模型参数来提取新数据的特征和测试性能.
+        * 为 IO 操作添加 Store 类.
+
+
+* v0.1.0 (2015年10月8日):
+    * [Apache SINGA 0.1.0](https://archive.apache.org/dist/incubator/singa/apache-singa-incubating-0.1.0.tar.gz)
+      [\[MD5\]](https://archive.apache.org/dist/incubator/singa/apache-singa-incubating-0.1.0.tar.gz.md5)
+      [\[KEYS\]](https://archive.apache.org/dist/incubator/singa/KEYS)
+    * [Amazon EC2 image](https://console.aws.amazon.com/ec2/v2/home?region=ap-southeast-1#LaunchInstanceWizard:ami=ami-b41001e6)
+    * [发行说明 0.1.0](releases/RELEASE_NOTES_0.1.0.html)
+    * 主要功能包括,
+        * 使用 GNU build 程序进行安装
+        * 用 zookeeper 进行工作管理的脚本
+        * 基于神经网络和层抽象的编程模型.
+        * 基于 Worker,Server 和 Stub 的系统体系结构.
+        * 训练三种不同类别的模型,即前馈模型,能量模型和 RNN 模型.
+        * 使用 CPU 的同步和异步分布式训练框架
+        * 检查点和恢复
+        * 使用 gtest 进行单元测试
+
+		
+**免责声明(英文)**
+
+Apache SINGA is an effort undergoing incubation at The Apache Software
+Foundation (ASF), sponsored by the name of Apache Incubator PMC. Incubation is
+required of all newly accepted projects until a further review indicates that
+the infrastructure, communications, and decision making process have stabilized
+in a manner consistent with other successful ASF projects. While incubation
+status is not necessarily a reflection of the completeness or stability of the
+code, it does indicate that the project has yet to be fully endorsed by the
+ASF.

http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/362c8736/doc/zh/index.rst
----------------------------------------------------------------------
diff --git a/doc/zh/index.rst b/doc/zh/index.rst
index 2707001..6c12380 100644
--- a/doc/zh/index.rst
+++ b/doc/zh/index.rst
@@ -82,6 +82,36 @@ SINGA 入门
 | |logo1| | |logo2| | |logo3| | |logo4| |
 +---------+---------+---------+---------+
 
+文档
+-------------
+
+* `这里 <docs.html>`_ 列出了文档和 Python API.
+* `C++ APIs <http://www.comp.nus.edu.sg/~dbsystem/singa/api/>`_ 由 Doxygen 生成.
+* 研究出版物清单可在 `此处 <http://www.comp.nus.edu.sg/~dbsystem/singa/research/publication/>`_ 查阅.
+
+如何贡献
+----------------------
+
+* 请订阅我们的开发邮件列表 dev-subscribe@singa.incubator.apache.org.
+
+* 如果您发现使用 SINGA 的任何问题,请将其报告给 `Issue Tracker <https://issues.apache.org/jira/browse/singa>`_.
+
+* 您也可以直接联系 `SINGA 提交者 <community/team-list.html>`_.
+
+关于更多描述贡献SINGA的细节, 见 `这里 <develop/how-contribute.html>`_ .
+
+历史
+------------
+
+2014年,SINGA 由新加坡国立大学 DB System Group 与浙江大学数据库团队合作发起.
+如果您在研究中使用 SINGA,请引用以下两篇论文:
+
+* B. C. Ooi, K.-L. Tan, S. Wang, W. Wang, Q. Cai, G. Chen, J. Gao, Z. Luo, A. K. H. Tung, Y. Wang, Z. Xie, M. Zhang, and K. Zheng. `SINGA: A distributed deep learning platform <http://www.comp.nus.edu.sg/~ooibc/singaopen-mm15.pdf>`_. ACM Multimedia (Open Source Software Competition) 2015 (`BibTex <http://www.comp.nus.edu.sg/~dbsystem/singa//assets/file/bib-oss.txt>`_).
+
+* W. Wang, G. Chen, T. T. A. Dinh, B. C. Ooi, K.-L.Tan, J. Gao, and S. Wang. `SINGA: putting deep learning in the hands of multimedia users <http://www.comp.nus.edu.sg/~ooibc/singa-mm15.pdf>`_. ACM Multimedia 2015 (`BibTex <http://www.comp.nus.edu.sg/~dbsystem/singa//assets/file/bib-singa.txt>`_, `Slides <files/mm2015.ppt>`_).
+
+诸如 `网易 <http://tech.163.com/17/0602/17/CLUL016I00098GJ5.html>`_, `yzBigData <http://www.yzbigdata.com/en/index.html>`_ 和 `Shentilium <https://shentilium.com/>`_ 等公司正在使用 SINGA 作为其应用程序.
+
 .. toctree::
    :hidden:
 
@@ -91,7 +121,7 @@ SINGA 入门
 .. toctree::
    :hidden:
    :maxdepth: 2
-   :caption: Development
+   :caption: 开发
 
    develop/schedule
    develop/how-contribute
@@ -101,7 +131,7 @@ SINGA 入门
 .. toctree::
    :hidden:
    :maxdepth: 2
-   :caption: Community
+   :caption: 社区
 
    community/source-repository
    community/mail-lists
@@ -110,11 +140,11 @@ SINGA 入门
 
 
 
-License
+许可证
 ----------
-SINGA is released under `Apache License Version 2.0 <http://www.apache.org/licenses/LICENSE-2.0>`_.
+SINGA 在 `Apache License Version 2.0 <http://www.apache.org/licenses/LICENSE-2.0>`_ 许可证下发布.
 
-Disclaimers
+免责声明(英文)
 -----------
 
 Apache SINGA is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.


[2/2] incubator-singa git commit: Merge branch 'pr360'

Posted by wa...@apache.org.
Merge branch 'pr360'


Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/3a373987
Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/3a373987
Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/3a373987

Branch: refs/heads/master
Commit: 3a373987aded26676d9e0aac3628d7d5ccf514fc
Parents: 6b1ed79 362c873
Author: Wei Wang <wa...@comp.nus.edu.sg>
Authored: Fri May 4 14:49:37 2018 +0800
Committer: Wei Wang <wa...@comp.nus.edu.sg>
Committed: Fri May 4 14:49:37 2018 +0800

----------------------------------------------------------------------
 doc/conf.py                           |   8 ++-
 doc/zh/community/issue-tracking.md    |   9 +++
 doc/zh/community/mail-lists.rst       |  28 ++++++++
 doc/zh/community/source-repository.md |  22 ++++++
 doc/zh/community/team-list.rst        |  84 ++++++++++++++++++++++
 doc/zh/develop/contribute-code.md     |  48 +++++++++++++
 doc/zh/develop/how-contribute.md      |   9 +++
 doc/zh/develop/schedule.rst           |  66 +++++++++++++++++
 doc/zh/docs.rst                       |  23 ++++++
 doc/zh/downloads.md                   | 109 +++++++++++++++++++++++++++++
 doc/zh/index.rst                      |  40 +++++++++--
 11 files changed, 439 insertions(+), 7 deletions(-)
----------------------------------------------------------------------