You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@singa.apache.org by mo...@apache.org on 2019/04/21 21:57:39 UTC

svn commit: r1857926 [6/8] - in /incubator/singa/site/trunk: ./ zh/ zh/_static/ zh/community/ zh/develop/ zh/docs/ zh/docs/model_zoo/ zh/docs/model_zoo/char-rnn/ zh/docs/model_zoo/cifar10/ zh/docs/model_zoo/imagenet/alexnet/ zh/docs/model_zoo/imagenet/...

Modified: incubator/singa/site/trunk/zh/docs/model_zoo/imagenet/vgg/README.html
URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/zh/docs/model_zoo/imagenet/vgg/README.html?rev=1857926&r1=1857925&r2=1857926&view=diff
==============================================================================
--- incubator/singa/site/trunk/zh/docs/model_zoo/imagenet/vgg/README.html (original)
+++ incubator/singa/site/trunk/zh/docs/model_zoo/imagenet/vgg/README.html Sun Apr 21 21:57:38 2019
@@ -1,5 +1,5 @@
 
-
+ 
 
 <!DOCTYPE html>
 <!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
@@ -9,7 +9,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>用VGG做图像分类 &mdash; incubator-singa 1.1.0 documentation</title>
+  <title>用VGG做图像分类 &mdash; incubator-singa 2.0.0 documentation</title>
   
 
   
@@ -38,18 +38,18 @@
     <link rel="search" title="Search" href="../../../../search.html" />
     <link rel="next" title="下载 SINGA" href="../../../../downloads.html" />
     <link rel="prev" title="用ResNet做图像分类" href="../resnet/README.html" />
-    <link href="../../../../_static/style.css" rel="stylesheet" type="text/css">
-    <!--link href="../../../../_static/fontawesome-all.min.css" rel="stylesheet" type="text/css"-->
-	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-    <style>
-	.fa:hover {
-	    opacity: 0.7;
-	}
-	.fab:hover {
-	    opacity: 0.7;
-	}
-    </style>
-
+     <link href="../../../../_static/style.css" rel="stylesheet" type="text/css">
+     <!--link href="../../../../_static/fontawesome-all.min.css" rel="stylesheet" type="text/css"-->
+   <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
+     <style>
+   .fa:hover {
+       opacity: 0.7;
+   }
+   .fab:hover {
+       opacity: 0.7;
+   }
+     </style>
+ 
 </head>
 
 <body class="wy-body-for-nav">
@@ -239,19 +239,19 @@
 <div class="section" id="id1">
 <h2>操作说明<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h2>
 <ul>
-<li><p>下载参数的checkpoint文件到如下目录</p>
+<li><p class="first">下载参数的checkpoint文件到如下目录</p>
 <div class="highlight-default notranslate"><div class="highlight"><pre><span></span>  $ wget https://s3-ap-southeast-1.amazonaws.com/dlfile/vgg/vgg11.tar.gz
   $ wget https://s3-ap-southeast-1.amazonaws.com/dlfile/resnet/synset_words.txt
   $ tar xvf vgg11.tar.gz
 </pre></div>
 </div>
 </li>
-<li><p>运行程序</p>
+<li><p class="first">运行程序</p>
 <div class="highlight-default notranslate"><div class="highlight"><pre><span></span>  $ python serve.py -h
 </pre></div>
 </div>
 </li>
-<li><p>例子</p>
+<li><p class="first">例子</p>
 <div class="highlight-default notranslate"><div class="highlight"><pre><span></span>  # use cpu
   $ python serve.py --use_cpu --parameter_file vgg11.pickle --depth 11 &amp;
   # use gpu
@@ -260,11 +260,11 @@
 </div>
 <p>我们提供了以下模型和深度配置的参数文件:</p>
 <ul class="simple">
-<li><p>不使用批量正则, <a class="reference external" href="https://s3-ap-southeast-1.amazonaws.com/dlfile/vgg/vgg11.tar.gz">11</a>, <a class="reference external" href="https://s3-ap-southeast-1.amazonaws.com/dlfile/vgg/vgg13.tar.gz">13</a>, <a class="reference external" href="https://s3-ap-southeast-1.amazonaws.com/dlfile/vgg/vgg16.tar.gz">16</a>, <a class="reference external" href="https://s3-ap-southeast-1.amazonaws.com/dlfile/vgg/vgg19.tar.gz">19</a></p></li>
-<li><p>使用批量正则, <a class="reference external" href="https://s3-ap-southeast-1.amazonaws.com/dlfile/vgg/vgg11_bn.tar.gz">11</a>, <a class="reference external" href="https://s3-ap-southeast-1.amazonaws.com/dlfile/vgg/vgg13_bn.tar.gz">13</a>, <a class="reference external" href="https://s3-ap-southeast-1.amazonaws.com/dlfile/vgg/vgg16_bn.tar.gz">16</a>, <a class="reference external" href="https://s3-ap-southeast-1.amazonaws.com/dlfile/vgg/vgg19_bn.tar.gz">19</a></p></li>
+<li>不使用批量正则, <a class="reference external" href="https://s3-ap-southeast-1.amazonaws.com/dlfile/vgg/vgg11.tar.gz">11</a>, <a class="reference external" href="https://s3-ap-southeast-1.amazonaws.com/dlfile/vgg/vgg13.tar.gz">13</a>, <a class="reference external" href="https://s3-ap-southeast-1.amazonaws.com/dlfile/vgg/vgg16.tar.gz">16</a>, <a class="reference external" href="https://s3-ap-southeast-1.amazonaws.com/dlfile/vgg/vgg19.tar.gz">19</a></li>
+<li>使用批量正则, <a class="reference external" href="https://s3-ap-southeast-1.amazonaws.com/dlfile/vgg/vgg11_bn.tar.gz">11</a>, <a class="reference external" href="https://s3-ap-southeast-1.amazonaws.com/dlfile/vgg/vgg13_bn.tar.gz">13</a>, <a class="reference external" href="https://s3-ap-southeast-1.amazonaws.com/dlfile/vgg/vgg16_bn.tar.gz">16</a>, <a class="reference external" href="https://s3-ap-southeast-1.amazonaws.com/dlfile/vgg/vgg19_bn.tar.gz">19</a></li>
 </ul>
 </li>
-<li><p>提交图片进行分类</p>
+<li><p class="first">提交图片进行分类</p>
 <div class="highlight-default notranslate"><div class="highlight"><pre><span></span>  $ curl -i -F image=@image1.jpg http://localhost:9999/api
   $ curl -i -F image=@image2.jpg http://localhost:9999/api
   $ curl -i -F image=@image3.jpg http://localhost:9999/api
@@ -278,7 +278,7 @@
 <h2>详细信息<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h2>
 <p>用<code class="docutils literal notranslate"><span class="pre">convert.py</span></code>从Pytorch参数文件中提取参数值</p>
 <ul>
-<li><p>运行程序</p>
+<li><p class="first">运行程序</p>
 <div class="highlight-default notranslate"><div class="highlight"><pre><span></span>  $ python convert.py -h
 </pre></div>
 </div>
@@ -334,46 +334,46 @@
   
     
   
-
-<div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
-  <span class="rst-current-version" data-toggle="rst-current-version">
-    <span class="fa fa-book"> incubator-singa </span>
-    v: latest
-    <span class="fa fa-caret-down"></span>
-  </span>
-  <div class="rst-other-versions">
-      <dl>
-          <dt>Languages</dt>
-          <dd><a href="../../../../../en/index.html">English</a></dd>
-          <dd><a href="../../../../../zh/index.html">中文</a></dd>
-      </dl>
-      <dl>
-          <dt>Versions</dt>
-          <dd><a href="http://singa.apache.org/v0.3.0/">0.3</a></dd>
-          <dd><a href="http://singa.apache.org/v1.1.0/">1.1</a></dd>
-      </dl>
-
-  </div>
-  <a href="http://incubator.apache.org/"> <img src= "../../../../_static/apache.png" style="background-color:white;"> </a>
-
-  <a href="https://github.com/apache/incubator-singa" class="fa fa-github" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://aws.amazon.com/marketplace/seller-profile?id=5bcac385-12c4-4802-aec7-351e09b77b4c" class="fab fa-aws" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://hub.docker.com/r/apache/singa/" class="fab fa-docker" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> 
-  <a href="https://www.linkedin.com/groups/13550034" class="fa fa-linkedin" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://twitter.com/ApacheSinga" class="fa fa-twitter" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://www.facebook.com/Apache-SINGA-347284219056544/" class="fa fa-facebook" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://www.researchgate.net/project/Apache-SINGA" class="fab fa-researchgate" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-
-</div>
-
- <a href="https://github.com/apache/incubator-singa">
-    <img style="position: absolute; top: 0; right: 0; border: 0; z-index: 10000;"
-        src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"
-        alt="Fork me on GitHub">
-</a>
-
  
-
+ <div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
+   <span class="rst-current-version" data-toggle="rst-current-version">
+     <span class="fa fa-book"> incubator-singa </span>
+     v: latest
+     <span class="fa fa-caret-down"></span>
+   </span>
+   <div class="rst-other-versions">
+       <dl>
+           <dt>Languages</dt>
+           <dd><a href="../../../../../index.html">English</a></dd>
+           <dd><a href="../../../.././index.html">中文</a></dd>
+       </dl>
+       <dl>
+           <dt>Versions</dt>
+           <dd><a href="http://singa.apache.org/v0.3.0/">0.3</a></dd>
+           <dd><a href="http://singa.apache.org/v1.1.0/">1.1</a></dd>
+       </dl>
+ 
+   </div>
+   <a href="http://incubator.apache.org/"> <img src= "../../../../_static/apache.png" style="background-color:white;"> </a>
+ 
+   <a href="https://github.com/apache/incubator-singa" class="fa fa-github" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://aws.amazon.com/marketplace/seller-profile?id=5bcac385-12c4-4802-aec7-351e09b77b4c" class="fab fa-aws" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://hub.docker.com/r/apache/singa/" class="fab fa-docker" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> 
+   <a href="https://www.linkedin.com/groups/13550034" class="fa fa-linkedin" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://twitter.com/ApacheSinga" class="fa fa-twitter" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://www.facebook.com/Apache-SINGA-347284219056544/" class="fa fa-facebook" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://www.researchgate.net/project/Apache-SINGA" class="fab fa-researchgate" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+ 
+ </div>
+ 
+  <a href="https://github.com/apache/incubator-singa">
+     <img style="position: absolute; top: 0; right: 0; border: 0; z-index: 10000;"
+         src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"
+         alt="Fork me on GitHub">
+ </a>
+ 
+  
+ 
 
 </body>
 </html>
\ No newline at end of file

Modified: incubator/singa/site/trunk/zh/docs/model_zoo/index.html
URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/zh/docs/model_zoo/index.html?rev=1857926&r1=1857925&r2=1857926&view=diff
==============================================================================
--- incubator/singa/site/trunk/zh/docs/model_zoo/index.html (original)
+++ incubator/singa/site/trunk/zh/docs/model_zoo/index.html Sun Apr 21 21:57:38 2019
@@ -1,5 +1,5 @@
 
-
+ 
 
 <!DOCTYPE html>
 <!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
@@ -9,7 +9,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>模型库 &mdash; incubator-singa 1.1.0 documentation</title>
+  <title>模型库 &mdash; incubator-singa 2.0.0 documentation</title>
   
 
   
@@ -38,18 +38,18 @@
     <link rel="search" title="Search" href="../../search.html" />
     <link rel="next" title="在Cifar-10上训练CNN" href="cifar10/README.html" />
     <link rel="prev" title="Utils" href="../utils.html" />
-    <link href="../../_static/style.css" rel="stylesheet" type="text/css">
-    <!--link href="../../_static/fontawesome-all.min.css" rel="stylesheet" type="text/css"-->
-	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-    <style>
-	.fa:hover {
-	    opacity: 0.7;
-	}
-	.fab:hover {
-	    opacity: 0.7;
-	}
-    </style>
-
+     <link href="../../_static/style.css" rel="stylesheet" type="text/css">
+     <!--link href="../../_static/fontawesome-all.min.css" rel="stylesheet" type="text/css"-->
+   <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
+     <style>
+   .fa:hover {
+       opacity: 0.7;
+   }
+   .fab:hover {
+       opacity: 0.7;
+   }
+     </style>
+ 
 </head>
 
 <body class="wy-body-for-nav">
@@ -316,46 +316,46 @@
   
     
   
-
-<div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
-  <span class="rst-current-version" data-toggle="rst-current-version">
-    <span class="fa fa-book"> incubator-singa </span>
-    v: latest
-    <span class="fa fa-caret-down"></span>
-  </span>
-  <div class="rst-other-versions">
-      <dl>
-          <dt>Languages</dt>
-          <dd><a href="../../../en/index.html">English</a></dd>
-          <dd><a href="../../../zh/index.html">中文</a></dd>
-      </dl>
-      <dl>
-          <dt>Versions</dt>
-          <dd><a href="http://singa.apache.org/v0.3.0/">0.3</a></dd>
-          <dd><a href="http://singa.apache.org/v1.1.0/">1.1</a></dd>
-      </dl>
-
-  </div>
-  <a href="http://incubator.apache.org/"> <img src= "../../_static/apache.png" style="background-color:white;"> </a>
-
-  <a href="https://github.com/apache/incubator-singa" class="fa fa-github" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://aws.amazon.com/marketplace/seller-profile?id=5bcac385-12c4-4802-aec7-351e09b77b4c" class="fab fa-aws" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://hub.docker.com/r/apache/singa/" class="fab fa-docker" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> 
-  <a href="https://www.linkedin.com/groups/13550034" class="fa fa-linkedin" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://twitter.com/ApacheSinga" class="fa fa-twitter" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://www.facebook.com/Apache-SINGA-347284219056544/" class="fa fa-facebook" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://www.researchgate.net/project/Apache-SINGA" class="fab fa-researchgate" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-
-</div>
-
- <a href="https://github.com/apache/incubator-singa">
-    <img style="position: absolute; top: 0; right: 0; border: 0; z-index: 10000;"
-        src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"
-        alt="Fork me on GitHub">
-</a>
-
  
-
+ <div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
+   <span class="rst-current-version" data-toggle="rst-current-version">
+     <span class="fa fa-book"> incubator-singa </span>
+     v: latest
+     <span class="fa fa-caret-down"></span>
+   </span>
+   <div class="rst-other-versions">
+       <dl>
+           <dt>Languages</dt>
+           <dd><a href="../../../index.html">English</a></dd>
+           <dd><a href="../.././index.html">中文</a></dd>
+       </dl>
+       <dl>
+           <dt>Versions</dt>
+           <dd><a href="http://singa.apache.org/v0.3.0/">0.3</a></dd>
+           <dd><a href="http://singa.apache.org/v1.1.0/">1.1</a></dd>
+       </dl>
+ 
+   </div>
+   <a href="http://incubator.apache.org/"> <img src= "../../_static/apache.png" style="background-color:white;"> </a>
+ 
+   <a href="https://github.com/apache/incubator-singa" class="fa fa-github" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://aws.amazon.com/marketplace/seller-profile?id=5bcac385-12c4-4802-aec7-351e09b77b4c" class="fab fa-aws" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://hub.docker.com/r/apache/singa/" class="fab fa-docker" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> 
+   <a href="https://www.linkedin.com/groups/13550034" class="fa fa-linkedin" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://twitter.com/ApacheSinga" class="fa fa-twitter" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://www.facebook.com/Apache-SINGA-347284219056544/" class="fa fa-facebook" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://www.researchgate.net/project/Apache-SINGA" class="fab fa-researchgate" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+ 
+ </div>
+ 
+  <a href="https://github.com/apache/incubator-singa">
+     <img style="position: absolute; top: 0; right: 0; border: 0; z-index: 10000;"
+         src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"
+         alt="Fork me on GitHub">
+ </a>
+ 
+  
+ 
 
 </body>
 </html>
\ No newline at end of file

Modified: incubator/singa/site/trunk/zh/docs/model_zoo/mnist/README.html
URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/zh/docs/model_zoo/mnist/README.html?rev=1857926&r1=1857925&r2=1857926&view=diff
==============================================================================
--- incubator/singa/site/trunk/zh/docs/model_zoo/mnist/README.html (original)
+++ incubator/singa/site/trunk/zh/docs/model_zoo/mnist/README.html Sun Apr 21 21:57:38 2019
@@ -1,5 +1,5 @@
 
-
+ 
 
 <!DOCTYPE html>
 <!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
@@ -9,7 +9,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>在MNIST数据集上训练RBM模型 &mdash; incubator-singa 1.1.0 documentation</title>
+  <title>在MNIST数据集上训练RBM模型 &mdash; incubator-singa 2.0.0 documentation</title>
   
 
   
@@ -38,18 +38,18 @@
     <link rel="search" title="Search" href="../../../search.html" />
     <link rel="next" title="在ImageNet上训练AlexNet" href="../imagenet/alexnet/README.html" />
     <link rel="prev" title="在文本上训练Char-RNN" href="../char-rnn/README.html" />
-    <link href="../../../_static/style.css" rel="stylesheet" type="text/css">
-    <!--link href="../../../_static/fontawesome-all.min.css" rel="stylesheet" type="text/css"-->
-	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-    <style>
-	.fa:hover {
-	    opacity: 0.7;
-	}
-	.fab:hover {
-	    opacity: 0.7;
-	}
-    </style>
-
+     <link href="../../../_static/style.css" rel="stylesheet" type="text/css">
+     <!--link href="../../../_static/fontawesome-all.min.css" rel="stylesheet" type="text/css"-->
+   <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
+     <style>
+   .fa:hover {
+       opacity: 0.7;
+   }
+   .fab:hover {
+       opacity: 0.7;
+   }
+     </style>
+ 
 </head>
 
 <body class="wy-body-for-nav">
@@ -232,12 +232,13 @@
     under the License.
 --><div class="section" id="mnistrbm">
 <h1>在MNIST数据集上训练RBM模型<a class="headerlink" href="#mnistrbm" title="Permalink to this headline">¶</a></h1>
-<p>这个例子使用MNIST数据集来训练一个RBM模型。RBM模型及其超参数参考<a class="reference external" href="http://www.cs.toronto.edu/%7Ehinton/science.pdf">Hinton的论文</a>中的设定。</p>
+<p>这个例子使用MNIST数据集来训练一个RBM模型。RBM模型及其超参数参考<a class="reference external" href="http://www.cs.toronto.edu/~hinton/science.pdf">Hinton的论文</a>中的设定。</p>
 <div class="section" id="id1">
 <h2>操作说明<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h2>
 <ul>
-<li><p>下载预处理的<a class="reference external" href="https://github.com/mnielsen/neural-networks-and-deep-learning/raw/master/data/mnist.pkl.gz">MNIST数据集</a>。</p></li>
-<li><p>开始训练，</p>
+<li><p class="first">下载预处理的<a class="reference external" href="https://github.com/mnielsen/neural-networks-and-deep-learning/raw/master/data/mnist.pkl.gz">MNIST数据集</a>。</p>
+</li>
+<li><p class="first">开始训练，</p>
 <div class="highlight-default notranslate"><div class="highlight"><pre><span></span>  <span class="n">python</span> <span class="n">train</span><span class="o">.</span><span class="n">py</span> <span class="n">mnist</span><span class="o">.</span><span class="n">pkl</span><span class="o">.</span><span class="n">gz</span>
 </pre></div>
 </div>
@@ -297,46 +298,46 @@
   
     
   
-
-<div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
-  <span class="rst-current-version" data-toggle="rst-current-version">
-    <span class="fa fa-book"> incubator-singa </span>
-    v: latest
-    <span class="fa fa-caret-down"></span>
-  </span>
-  <div class="rst-other-versions">
-      <dl>
-          <dt>Languages</dt>
-          <dd><a href="../../../../en/index.html">English</a></dd>
-          <dd><a href="../../../../zh/index.html">中文</a></dd>
-      </dl>
-      <dl>
-          <dt>Versions</dt>
-          <dd><a href="http://singa.apache.org/v0.3.0/">0.3</a></dd>
-          <dd><a href="http://singa.apache.org/v1.1.0/">1.1</a></dd>
-      </dl>
-
-  </div>
-  <a href="http://incubator.apache.org/"> <img src= "../../../_static/apache.png" style="background-color:white;"> </a>
-
-  <a href="https://github.com/apache/incubator-singa" class="fa fa-github" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://aws.amazon.com/marketplace/seller-profile?id=5bcac385-12c4-4802-aec7-351e09b77b4c" class="fab fa-aws" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://hub.docker.com/r/apache/singa/" class="fab fa-docker" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> 
-  <a href="https://www.linkedin.com/groups/13550034" class="fa fa-linkedin" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://twitter.com/ApacheSinga" class="fa fa-twitter" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://www.facebook.com/Apache-SINGA-347284219056544/" class="fa fa-facebook" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://www.researchgate.net/project/Apache-SINGA" class="fab fa-researchgate" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-
-</div>
-
- <a href="https://github.com/apache/incubator-singa">
-    <img style="position: absolute; top: 0; right: 0; border: 0; z-index: 10000;"
-        src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"
-        alt="Fork me on GitHub">
-</a>
-
  
-
+ <div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
+   <span class="rst-current-version" data-toggle="rst-current-version">
+     <span class="fa fa-book"> incubator-singa </span>
+     v: latest
+     <span class="fa fa-caret-down"></span>
+   </span>
+   <div class="rst-other-versions">
+       <dl>
+           <dt>Languages</dt>
+           <dd><a href="../../../../index.html">English</a></dd>
+           <dd><a href="../../.././index.html">中文</a></dd>
+       </dl>
+       <dl>
+           <dt>Versions</dt>
+           <dd><a href="http://singa.apache.org/v0.3.0/">0.3</a></dd>
+           <dd><a href="http://singa.apache.org/v1.1.0/">1.1</a></dd>
+       </dl>
+ 
+   </div>
+   <a href="http://incubator.apache.org/"> <img src= "../../../_static/apache.png" style="background-color:white;"> </a>
+ 
+   <a href="https://github.com/apache/incubator-singa" class="fa fa-github" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://aws.amazon.com/marketplace/seller-profile?id=5bcac385-12c4-4802-aec7-351e09b77b4c" class="fab fa-aws" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://hub.docker.com/r/apache/singa/" class="fab fa-docker" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> 
+   <a href="https://www.linkedin.com/groups/13550034" class="fa fa-linkedin" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://twitter.com/ApacheSinga" class="fa fa-twitter" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://www.facebook.com/Apache-SINGA-347284219056544/" class="fa fa-facebook" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://www.researchgate.net/project/Apache-SINGA" class="fab fa-researchgate" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+ 
+ </div>
+ 
+  <a href="https://github.com/apache/incubator-singa">
+     <img style="position: absolute; top: 0; right: 0; border: 0; z-index: 10000;"
+         src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"
+         alt="Fork me on GitHub">
+ </a>
+ 
+  
+ 
 
 </body>
 </html>
\ No newline at end of file

Modified: incubator/singa/site/trunk/zh/docs/net.html
URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/zh/docs/net.html?rev=1857926&r1=1857925&r2=1857926&view=diff
==============================================================================
--- incubator/singa/site/trunk/zh/docs/net.html (original)
+++ incubator/singa/site/trunk/zh/docs/net.html Sun Apr 21 21:57:38 2019
@@ -1,5 +1,5 @@
 
-
+ 
 
 <!DOCTYPE html>
 <!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
@@ -9,7 +9,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>前馈网络 &mdash; incubator-singa 1.1.0 documentation</title>
+  <title>前馈网络 &mdash; incubator-singa 2.0.0 documentation</title>
   
 
   
@@ -38,18 +38,18 @@
     <link rel="search" title="Search" href="../search.html" />
     <link rel="next" title="初始化器(Initializer)" href="initializer.html" />
     <link rel="prev" title="层(Layer)" href="layer.html" />
-    <link href="../_static/style.css" rel="stylesheet" type="text/css">
-    <!--link href="../_static/fontawesome-all.min.css" rel="stylesheet" type="text/css"-->
-	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-    <style>
-	.fa:hover {
-	    opacity: 0.7;
-	}
-	.fab:hover {
-	    opacity: 0.7;
-	}
-    </style>
-
+     <link href="../_static/style.css" rel="stylesheet" type="text/css">
+     <!--link href="../_static/fontawesome-all.min.css" rel="stylesheet" type="text/css"-->
+   <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
+     <style>
+   .fa:hover {
+       opacity: 0.7;
+   }
+   .fab:hover {
+       opacity: 0.7;
+   }
+     </style>
+ 
 </head>
 
 <body class="wy-body-for-nav">
@@ -268,8 +268,8 @@
 <p>该功能将从src层获取样本形状以设置新添加的层。 对于第一层，它被设置在外部。 调用函数应确保层顺序的正确性。 如果src是None，最后一层是src层。 如果有多个src图层，则src是src层的列表。</p>
 <p><strong>参数：</strong></p>
 <ul class="simple">
-<li><p><strong>lyr (Layer)</strong> – 待添加的层</p></li>
-<li><p><strong>src (Layer)</strong> – lyr层的父层</p></li>
+<li><strong>lyr (Layer)</strong> – 待添加的层</li>
+<li><strong>src (Layer)</strong> – lyr层的父层</li>
 </ul>
 </div>
 <hr class="docutils" />
@@ -294,8 +294,8 @@
 目前仅支持单输出层、单损失函数及度量方法的网络。 TODO(wangwei) 考虑多损失函数和多度量值。</p>
 <p><strong>参数：</strong></p>
 <ul class="simple">
-<li><p><strong>x</strong> – 输入数据，一个输入tensor或字典：层名-&gt;tensor</p></li>
-<li><p><strong>y</strong> – 输入数据的标签，一个tensor</p></li>
+<li><strong>x</strong> – 输入数据，一个输入tensor或字典：层名-&gt;tensor</li>
+<li><strong>y</strong> – 输入数据的标签，一个tensor</li>
 </ul>
 <p><strong>返回值：</strong> 参数梯度，损失函数和度量值</p>
 </div>
@@ -305,8 +305,8 @@
 <p>根据给定数据评估损失函数和度量值。目前仅支持单输出层、单损失函数及度量方法的网络。TODO(wangwei) 考虑多损失函数和多度量值。</p>
 <p><strong>参数：</strong></p>
 <ul class="simple">
-<li><p><strong>x</strong> – 输入数据，单个tensor或一个字典： 层名 -&gt; tensor</p></li>
-<li><p><strong>y</strong> – 输入数据的标签，单个tensor.</p></li>
+<li><strong>x</strong> – 输入数据，单个tensor或一个字典： 层名 -&gt; tensor</li>
+<li><strong>y</strong> – 输入数据的标签，单个tensor.</li>
 </ul>
 </div>
 <hr class="docutils" />
@@ -316,7 +316,7 @@
 目前仅支持单输出层的网络。</p>
 <p><strong>参数：</strong></p>
 <ul class="simple">
-<li><p><strong>x</strong> - 输入数据，单个tesnor或一个字典： 层名 -&gt; tensor</p></li>
+<li><strong>x</strong> - 输入数据，单个tesnor或一个字典： 层名 -&gt; tensor</li>
 </ul>
 <p><strong>返回值：</strong> 单个输出tensor作为预测结果</p>
 </div>
@@ -327,8 +327,8 @@
 对于多输入层，将会保留输入层的顺序。</p>
 <p><strong>参数：</strong></p>
 <ul class="simple">
-<li><p><strong>layers</strong> – 层列表；同个层（如slice层）的多个输出层应该以正确的顺序加入，此功能将不会改变其顺序。</p></li>
-<li><p><strong>src_of_layer</strong> – 字典: src层名 -&gt; src层列表</p></li>
+<li><strong>layers</strong> – 层列表；同个层（如slice层）的多个输出层应该以正确的顺序加入，此功能将不会改变其顺序。</li>
+<li><strong>src_of_layer</strong> – 字典: src层名 -&gt; src层列表</li>
 </ul>
 <p><strong>返回值：</strong> 排序后层列表</p>
 </div>
@@ -339,9 +339,9 @@
 如果一个层具有来自其他层和来自x的输入，则来自x的数据在来自其他层的数据之前被排序，例如，如果层1-&gt;层2并且x [‘layer2’]具有数据，则输入层2展平，即[x [‘layer2’]，层1的输出]</p>
 <p><strong>参数：</strong></p>
 <ul class="simple">
-<li><p><strong>flag</strong> – True代表训练;False代表评估;也可以是model_pb2.kTrain或model_pb2.kEval或者其他未来可能使用的值。</p></li>
-<li><p><strong>x</strong> – 一个tensor或一个字典：层名 -&gt; tensor</p></li>
-<li><p><strong>output(list)</strong> – 层名列表，将会和默认输出一起作为返回值</p></li>
+<li><strong>flag</strong> – True代表训练;False代表评估;也可以是model_pb2.kTrain或model_pb2.kEval或者其他未来可能使用的值。</li>
+<li><strong>x</strong> – 一个tensor或一个字典：层名 -&gt; tensor</li>
+<li><strong>output(list)</strong> – 层名列表，将会和默认输出一起作为返回值</li>
 </ul>
 <p><strong>返回值：</strong> 如果只有一个输出层，返回输出tensor;否则返回字典：层名-&gt;输出tensor</p>
 </div>
@@ -357,9 +357,9 @@
 <p>用io/snapshot保存模型参数。</p>
 <p><strong>参数：</strong></p>
 <ul class="simple">
-<li><p><strong>f</strong> – 文件名</p></li>
-<li><p><strong>buffer_size</strong> – 输入输出的大小(MB)，默认为10MB；请确保它比任何一个参数对象要大。</p></li>
-<li><p><strong>use_pickle(boolean)</strong> – 如果为真，将使用pickle保存；否则，将用protobuf做序列化，会占用较少空间。</p></li>
+<li><strong>f</strong> – 文件名</li>
+<li><strong>buffer_size</strong> – 输入输出的大小(MB)，默认为10MB；请确保它比任何一个参数对象要大。</li>
+<li><strong>use_pickle(boolean)</strong> – 如果为真，将使用pickle保存；否则，将用protobuf做序列化，会占用较少空间。</li>
 </ul>
 </div>
 <hr class="docutils" />
@@ -418,46 +418,46 @@
   
     
   
-
-<div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
-  <span class="rst-current-version" data-toggle="rst-current-version">
-    <span class="fa fa-book"> incubator-singa </span>
-    v: latest
-    <span class="fa fa-caret-down"></span>
-  </span>
-  <div class="rst-other-versions">
-      <dl>
-          <dt>Languages</dt>
-          <dd><a href="../../en/index.html">English</a></dd>
-          <dd><a href="../../zh/index.html">中文</a></dd>
-      </dl>
-      <dl>
-          <dt>Versions</dt>
-          <dd><a href="http://singa.apache.org/v0.3.0/">0.3</a></dd>
-          <dd><a href="http://singa.apache.org/v1.1.0/">1.1</a></dd>
-      </dl>
-
-  </div>
-  <a href="http://incubator.apache.org/"> <img src= "../_static/apache.png" style="background-color:white;"> </a>
-
-  <a href="https://github.com/apache/incubator-singa" class="fa fa-github" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://aws.amazon.com/marketplace/seller-profile?id=5bcac385-12c4-4802-aec7-351e09b77b4c" class="fab fa-aws" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://hub.docker.com/r/apache/singa/" class="fab fa-docker" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> 
-  <a href="https://www.linkedin.com/groups/13550034" class="fa fa-linkedin" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://twitter.com/ApacheSinga" class="fa fa-twitter" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://www.facebook.com/Apache-SINGA-347284219056544/" class="fa fa-facebook" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://www.researchgate.net/project/Apache-SINGA" class="fab fa-researchgate" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-
-</div>
-
- <a href="https://github.com/apache/incubator-singa">
-    <img style="position: absolute; top: 0; right: 0; border: 0; z-index: 10000;"
-        src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"
-        alt="Fork me on GitHub">
-</a>
-
  
-
+ <div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
+   <span class="rst-current-version" data-toggle="rst-current-version">
+     <span class="fa fa-book"> incubator-singa </span>
+     v: latest
+     <span class="fa fa-caret-down"></span>
+   </span>
+   <div class="rst-other-versions">
+       <dl>
+           <dt>Languages</dt>
+           <dd><a href="../../index.html">English</a></dd>
+           <dd><a href=".././index.html">中文</a></dd>
+       </dl>
+       <dl>
+           <dt>Versions</dt>
+           <dd><a href="http://singa.apache.org/v0.3.0/">0.3</a></dd>
+           <dd><a href="http://singa.apache.org/v1.1.0/">1.1</a></dd>
+       </dl>
+ 
+   </div>
+   <a href="http://incubator.apache.org/"> <img src= "../_static/apache.png" style="background-color:white;"> </a>
+ 
+   <a href="https://github.com/apache/incubator-singa" class="fa fa-github" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://aws.amazon.com/marketplace/seller-profile?id=5bcac385-12c4-4802-aec7-351e09b77b4c" class="fab fa-aws" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://hub.docker.com/r/apache/singa/" class="fab fa-docker" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> 
+   <a href="https://www.linkedin.com/groups/13550034" class="fa fa-linkedin" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://twitter.com/ApacheSinga" class="fa fa-twitter" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://www.facebook.com/Apache-SINGA-347284219056544/" class="fa fa-facebook" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://www.researchgate.net/project/Apache-SINGA" class="fab fa-researchgate" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+ 
+ </div>
+ 
+  <a href="https://github.com/apache/incubator-singa">
+     <img style="position: absolute; top: 0; right: 0; border: 0; z-index: 10000;"
+         src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"
+         alt="Fork me on GitHub">
+ </a>
+ 
+  
+ 
 
 </body>
 </html>
\ No newline at end of file

Modified: incubator/singa/site/trunk/zh/docs/optimizer.html
URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/zh/docs/optimizer.html?rev=1857926&r1=1857925&r2=1857926&view=diff
==============================================================================
--- incubator/singa/site/trunk/zh/docs/optimizer.html (original)
+++ incubator/singa/site/trunk/zh/docs/optimizer.html Sun Apr 21 21:57:38 2019
@@ -1,5 +1,5 @@
 
-
+ 
 
 <!DOCTYPE html>
 <!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
@@ -9,7 +9,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>优化器(Optimizer) &mdash; incubator-singa 1.1.0 documentation</title>
+  <title>优化器(Optimizer) &mdash; incubator-singa 2.0.0 documentation</title>
   
 
   
@@ -38,18 +38,18 @@
     <link rel="search" title="Search" href="../search.html" />
     <link rel="next" title="数据(Data)" href="data.html" />
     <link rel="prev" title="度量(Metric)" href="metric.html" />
-    <link href="../_static/style.css" rel="stylesheet" type="text/css">
-    <!--link href="../_static/fontawesome-all.min.css" rel="stylesheet" type="text/css"-->
-	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-    <style>
-	.fa:hover {
-	    opacity: 0.7;
-	}
-	.fab:hover {
-	    opacity: 0.7;
-	}
-    </style>
-
+     <link href="../_static/style.css" rel="stylesheet" type="text/css">
+     <!--link href="../_static/fontawesome-all.min.css" rel="stylesheet" type="text/css"-->
+   <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
+     <style>
+   .fa:hover {
+       opacity: 0.7;
+   }
+   .fab:hover {
+       opacity: 0.7;
+   }
+     </style>
+ 
 </head>
 
 <body class="wy-body-for-nav">
@@ -291,18 +291,18 @@
 <p>Python优化器类的基类。
 典型地，优化器有如下作用：</p>
 <ol class="simple">
-<li><p>构建优化器</p></li>
-<li><p>（可选）以参数名为注册每种参数</p></li>
-<li><p>使用优化器依照给定参数梯度及其他信息更新参数值</p></li>
+<li>构建优化器</li>
+<li>（可选）以参数名为注册每种参数</li>
+<li>使用优化器依照给定参数梯度及其他信息更新参数值</li>
 </ol>
 <p>它的子类应该重写apply_with_lr函数已用于真实的参数更新。</p>
 <p><strong>参数：</strong></p>
 <ul class="simple">
-<li><p><strong>lr (float)</strong> – 学习速率</p></li>
-<li><p><strong>momentum (float)</strong> – 动量</p></li>
-<li><p><strong>weight_decay (float)</strong> – L2正则化系数，被排除于‘regularizer’之外</p></li>
-<li><p><strong>regularizer</strong> –  Regularizer或RegularizerConf实例；如被设置，正则化将被用于apply_with_lr()。 用户也可以在优化器外部做正则化。</p></li>
-<li><p><strong>constraint</strong> – Constraint或ConstraintConf实例；如被设置，正则化将被用于apply_with_lr()。 用户也可以在优化器外部做正则化。</p></li>
+<li><strong>lr (float)</strong> – 学习速率</li>
+<li><strong>momentum (float)</strong> – 动量</li>
+<li><strong>weight_decay (float)</strong> – L2正则化系数，被排除于‘regularizer’之外</li>
+<li><strong>regularizer</strong> –  Regularizer或RegularizerConf实例；如被设置，正则化将被用于apply_with_lr()。 用户也可以在优化器外部做正则化。</li>
+<li><strong>constraint</strong> – Constraint或ConstraintConf实例；如被设置，正则化将被用于apply_with_lr()。 用户也可以在优化器外部做正则化。</li>
 </ul>
 <hr class="docutils" />
 <div class="section" id="register-name-specs">
@@ -310,8 +310,8 @@
 <p>注册参数，包括为每个参数对象创建正则化和约束条件。 这里参数特定的正则化和约束比全局设置有更高优先级。 如果所有参数对于学习速率、正规化器和约束条件共享相同的设置，则不需要调用该函数。</p>
 <p><strong>参数：</strong></p>
 <ul class="simple">
-<li><p><strong>name (str)</strong> – 参数名</p></li>
-<li><p><strong>specs (ParamSpec)</strong> – protobuf对象，包括正则化和约束条件、学习速率和权值衰减乘子。</p></li>
+<li><strong>name (str)</strong> – 参数名</li>
+<li><strong>specs (ParamSpec)</strong> – protobuf对象，包括正则化和约束条件、学习速率和权值衰减乘子。</li>
 </ul>
 </div>
 <hr class="docutils" />
@@ -320,11 +320,11 @@
 <p>如果可用，将采用正则化和约束条件。 如果全局正则化和参数特定的正则化都存在，会采用参数特定的正则化。</p>
 <p><strong>参数：</strong></p>
 <ul class="simple">
-<li><p><strong>epoch (int)</strong> – 训练的epoch ID （完整训练一遍训练数据称为一个epoch）</p></li>
-<li><p><strong>value (Tensor)</strong> – 参数Tensor</p></li>
-<li><p><strong>grad (Tensor)</strong> – 参数梯度Tensor</p></li>
-<li><p><strong>name (string)</strong> – 参数名以索引到特定的规则（正则化或约束条件）</p></li>
-<li><p><strong>step (int)</strong> – 每个epoch内的迭代ID</p></li>
+<li><strong>epoch (int)</strong> – 训练的epoch ID （完整训练一遍训练数据称为一个epoch）</li>
+<li><strong>value (Tensor)</strong> – 参数Tensor</li>
+<li><strong>grad (Tensor)</strong> – 参数梯度Tensor</li>
+<li><strong>name (string)</strong> – 参数名以索引到特定的规则（正则化或约束条件）</li>
+<li><strong>step (int)</strong> – 每个epoch内的迭代ID</li>
 </ul>
 <p><strong>返回值：</strong> 更新后的梯度tensor</p>
 </div>
@@ -335,13 +335,13 @@
 <p>子类优化器必须重写这个函数。如果grad为空，将不做任何操作。</p>
 <p><strong>参数：</strong></p>
 <ul class="simple">
-<li><p><strong>epoch (int)</strong> – 训练的epoch ID （完整训练一遍训练数据称为一个epoch）</p></li>
-<li><p><strong>lr (float)</strong> – 学习速率</p></li>
-<li><p><strong>value (Tensor)</strong> – 参数Tensor</p></li>
-<li><p><strong>grad (Tensor)</strong> – 参数梯度Tensor</p></li>
-<li><p><strong>name (string)</strong> – 参数名以索引到特定的规则（正则化或约束条件）</p></li>
-<li><p><strong>step (int)</strong> – 每个epoch内的迭代ID
-<strong>返回值：</strong> 更新后的参数值</p></li>
+<li><strong>epoch (int)</strong> – 训练的epoch ID （完整训练一遍训练数据称为一个epoch）</li>
+<li><strong>lr (float)</strong> – 学习速率</li>
+<li><strong>value (Tensor)</strong> – 参数Tensor</li>
+<li><strong>grad (Tensor)</strong> – 参数梯度Tensor</li>
+<li><strong>name (string)</strong> – 参数名以索引到特定的规则（正则化或约束条件）</li>
+<li><strong>step (int)</strong> – 每个epoch内的迭代ID
+<strong>返回值：</strong> 更新后的参数值</li>
 </ul>
 </div>
 <hr class="docutils" />
@@ -350,11 +350,11 @@
 <p>假设学习速率生成器配置完成，完成参数更新。 子类不需要重写这个函数。</p>
 <p><strong>参数：</strong></p>
 <ul class="simple">
-<li><p><strong>epoch (int)</strong> – 训练的epoch ID （完整训练一遍训练数据称为一个epoch）</p></li>
-<li><p><strong>value (Tensor)</strong> – 参数Tensor</p></li>
-<li><p><strong>grad (Tensor)</strong> – 参数梯度Tensor</p></li>
-<li><p><strong>name (string)</strong> – 参数名以索引到特定的规则（正则化或约束条件）</p></li>
-<li><p><strong>step (int)</strong> – 每个epoch内的迭代ID</p></li>
+<li><strong>epoch (int)</strong> – 训练的epoch ID （完整训练一遍训练数据称为一个epoch）</li>
+<li><strong>value (Tensor)</strong> – 参数Tensor</li>
+<li><strong>grad (Tensor)</strong> – 参数梯度Tensor</li>
+<li><strong>name (string)</strong> – 参数名以索引到特定的规则（正则化或约束条件）</li>
+<li><strong>step (int)</strong> – 每个epoch内的迭代ID</li>
 </ul>
 <p><strong>返回值：</strong> 更新后的参数值</p>
 </div>
@@ -384,8 +384,8 @@
 <p>RMSProp优化器。构造器参数请参考Optimizer基类。</p>
 <p><strong>参数：</strong></p>
 <ul class="simple">
-<li><p><strong>rho (float)</strong> – [0, 1]间的浮点数</p></li>
-<li><p><strong>epsilon (float)</strong> – 很小的值，以避免数值误差</p></li>
+<li><strong>rho (float)</strong> – [0, 1]间的浮点数</li>
+<li><strong>epsilon (float)</strong> – 很小的值，以避免数值误差</li>
 </ul>
 <div class="section" id="id2">
 <h3>apply_with_lr(epoch, lr, grad, value, name, step=-1)<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h3>
@@ -398,7 +398,7 @@
 <p>AdaGrad优化器。构造器参数请参考Optimizer基类。</p>
 <p><strong>参数：</strong></p>
 <ul class="simple">
-<li><p><strong>epsilon (float)</strong> – 很小的值，以避免数值误差</p></li>
+<li><strong>epsilon (float)</strong> – 很小的值，以避免数值误差</li>
 </ul>
 <div class="section" id="id3">
 <h3>apply_with_lr(epoch, lr, grad, value, name, step=-1)<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h3>
@@ -411,16 +411,16 @@
 <p>Ada优化器。构造器参数请参考Optimizer基类。</p>
 <p><strong>参数：</strong></p>
 <ul class="simple">
-<li><p><strong>beta_1 (float)</strong> – 动量系数</p></li>
-<li><p><strong>beta_2 (float)</strong> – 整合的梯度平方的系数</p></li>
-<li><p><strong>epsilon (float)</strong> – 很小的值，以避免数值误差</p></li>
+<li><strong>beta_1 (float)</strong> – 动量系数</li>
+<li><strong>beta_2 (float)</strong> – 整合的梯度平方的系数</li>
+<li><strong>epsilon (float)</strong> – 很小的值，以避免数值误差</li>
 </ul>
 <div class="section" id="id4">
 <h3>apply_with_lr(epoch, lr, grad, value, name, step=-1)<a class="headerlink" href="#id4" title="Permalink to this headline">¶</a></h3>
 <p>更新一个参数对象</p>
 <p><strong>参数：</strong></p>
 <ul class="simple">
-<li><p><strong>step (int)</strong> – 累积训练迭代数，而不是当前迭代ID</p></li>
+<li><strong>step (int)</strong> – 累积训练迭代数，而不是当前迭代ID</li>
 </ul>
 </div>
 </div>
@@ -440,7 +440,7 @@
 <p>正则化的封装使用C++实现。</p>
 <p><strong>参数：</strong></p>
 <ul class="simple">
-<li><p><strong>conf (RegularizerConf)</strong> – protobuf配置信息</p></li>
+<li><strong>conf (RegularizerConf)</strong> – protobuf配置信息</li>
 </ul>
 <div class="section" id="id5">
 <h3>apply(epoch, value, grad, step=-1)<a class="headerlink" href="#id5" title="Permalink to this headline">¶</a></h3>
@@ -453,7 +453,7 @@
 <p>L2正则化。</p>
 <p><strong>参数：</strong></p>
 <ul class="simple">
-<li><p><strong>coefficient (float)</strong> – 正则化系数</p></li>
+<li><strong>coefficient (float)</strong> – 正则化系数</li>
 </ul>
 <div class="section" id="id6">
 <h3>apply(epoch, value, grad, step=-1)<a class="headerlink" href="#id6" title="Permalink to this headline">¶</a></h3>
@@ -475,7 +475,7 @@
 <p>约束的封装使用C++实现。</p>
 <p><strong>参数：</strong></p>
 <ul class="simple">
-<li><p><strong>conf (RegularizerConf)</strong> – protobuf配置信息</p></li>
+<li><strong>conf (RegularizerConf)</strong> – protobuf配置信息</li>
 </ul>
 <div class="section" id="id8">
 <h3>apply(epoch, value, grad, step=-1)<a class="headerlink" href="#id8" title="Permalink to this headline">¶</a></h3>
@@ -540,46 +540,46 @@
   
     
   
-
-<div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
-  <span class="rst-current-version" data-toggle="rst-current-version">
-    <span class="fa fa-book"> incubator-singa </span>
-    v: latest
-    <span class="fa fa-caret-down"></span>
-  </span>
-  <div class="rst-other-versions">
-      <dl>
-          <dt>Languages</dt>
-          <dd><a href="../../en/index.html">English</a></dd>
-          <dd><a href="../../zh/index.html">中文</a></dd>
-      </dl>
-      <dl>
-          <dt>Versions</dt>
-          <dd><a href="http://singa.apache.org/v0.3.0/">0.3</a></dd>
-          <dd><a href="http://singa.apache.org/v1.1.0/">1.1</a></dd>
-      </dl>
-
-  </div>
-  <a href="http://incubator.apache.org/"> <img src= "../_static/apache.png" style="background-color:white;"> </a>
-
-  <a href="https://github.com/apache/incubator-singa" class="fa fa-github" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://aws.amazon.com/marketplace/seller-profile?id=5bcac385-12c4-4802-aec7-351e09b77b4c" class="fab fa-aws" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://hub.docker.com/r/apache/singa/" class="fab fa-docker" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> 
-  <a href="https://www.linkedin.com/groups/13550034" class="fa fa-linkedin" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://twitter.com/ApacheSinga" class="fa fa-twitter" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://www.facebook.com/Apache-SINGA-347284219056544/" class="fa fa-facebook" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://www.researchgate.net/project/Apache-SINGA" class="fab fa-researchgate" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-
-</div>
-
- <a href="https://github.com/apache/incubator-singa">
-    <img style="position: absolute; top: 0; right: 0; border: 0; z-index: 10000;"
-        src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"
-        alt="Fork me on GitHub">
-</a>
-
  
-
+ <div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
+   <span class="rst-current-version" data-toggle="rst-current-version">
+     <span class="fa fa-book"> incubator-singa </span>
+     v: latest
+     <span class="fa fa-caret-down"></span>
+   </span>
+   <div class="rst-other-versions">
+       <dl>
+           <dt>Languages</dt>
+           <dd><a href="../../index.html">English</a></dd>
+           <dd><a href=".././index.html">中文</a></dd>
+       </dl>
+       <dl>
+           <dt>Versions</dt>
+           <dd><a href="http://singa.apache.org/v0.3.0/">0.3</a></dd>
+           <dd><a href="http://singa.apache.org/v1.1.0/">1.1</a></dd>
+       </dl>
+ 
+   </div>
+   <a href="http://incubator.apache.org/"> <img src= "../_static/apache.png" style="background-color:white;"> </a>
+ 
+   <a href="https://github.com/apache/incubator-singa" class="fa fa-github" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://aws.amazon.com/marketplace/seller-profile?id=5bcac385-12c4-4802-aec7-351e09b77b4c" class="fab fa-aws" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://hub.docker.com/r/apache/singa/" class="fab fa-docker" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> 
+   <a href="https://www.linkedin.com/groups/13550034" class="fa fa-linkedin" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://twitter.com/ApacheSinga" class="fa fa-twitter" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://www.facebook.com/Apache-SINGA-347284219056544/" class="fa fa-facebook" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://www.researchgate.net/project/Apache-SINGA" class="fab fa-researchgate" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+ 
+ </div>
+ 
+  <a href="https://github.com/apache/incubator-singa">
+     <img style="position: absolute; top: 0; right: 0; border: 0; z-index: 10000;"
+         src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"
+         alt="Fork me on GitHub">
+ </a>
+ 
+  
+ 
 
 </body>
 </html>
\ No newline at end of file

Modified: incubator/singa/site/trunk/zh/docs/snapshot.html
URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/zh/docs/snapshot.html?rev=1857926&r1=1857925&r2=1857926&view=diff
==============================================================================
--- incubator/singa/site/trunk/zh/docs/snapshot.html (original)
+++ incubator/singa/site/trunk/zh/docs/snapshot.html Sun Apr 21 21:57:38 2019
@@ -1,5 +1,5 @@
 
-
+ 
 
 <!DOCTYPE html>
 <!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
@@ -9,7 +9,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Snapshot &mdash; incubator-singa 1.1.0 documentation</title>
+  <title>Snapshot &mdash; incubator-singa 2.0.0 documentation</title>
   
 
   
@@ -38,18 +38,18 @@
     <link rel="search" title="Search" href="../search.html" />
     <link rel="next" title="Utils" href="utils.html" />
     <link rel="prev" title="图像工具" href="image_tool.html" />
-    <link href="../_static/style.css" rel="stylesheet" type="text/css">
-    <!--link href="../_static/fontawesome-all.min.css" rel="stylesheet" type="text/css"-->
-	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-    <style>
-	.fa:hover {
-	    opacity: 0.7;
-	}
-	.fab:hover {
-	    opacity: 0.7;
-	}
-    </style>
-
+     <link href="../_static/style.css" rel="stylesheet" type="text/css">
+     <!--link href="../_static/fontawesome-all.min.css" rel="stylesheet" type="text/css"-->
+   <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
+     <style>
+   .fa:hover {
+       opacity: 0.7;
+   }
+   .fab:hover {
+       opacity: 0.7;
+   }
+     </style>
+ 
 </head>
 
 <body class="wy-body-for-nav">
@@ -251,8 +251,8 @@
 <p>调用write方法写回参数。</p>
 <p><strong>参数：</strong></p>
 <ul class="simple">
-<li><p><strong>param_name (string)</strong> – 参数名</p></li>
-<li><p><strong>param_val (Tensor)</strong> – 参数值的tensor</p></li>
+<li><strong>param_name (string)</strong> – 参数名</li>
+<li><strong>param_val (Tensor)</strong> – 参数值的tensor</li>
 </ul>
 <hr class="docutils" />
 </div>
@@ -306,46 +306,46 @@
   
     
   
-
-<div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
-  <span class="rst-current-version" data-toggle="rst-current-version">
-    <span class="fa fa-book"> incubator-singa </span>
-    v: latest
-    <span class="fa fa-caret-down"></span>
-  </span>
-  <div class="rst-other-versions">
-      <dl>
-          <dt>Languages</dt>
-          <dd><a href="../../en/index.html">English</a></dd>
-          <dd><a href="../../zh/index.html">中文</a></dd>
-      </dl>
-      <dl>
-          <dt>Versions</dt>
-          <dd><a href="http://singa.apache.org/v0.3.0/">0.3</a></dd>
-          <dd><a href="http://singa.apache.org/v1.1.0/">1.1</a></dd>
-      </dl>
-
-  </div>
-  <a href="http://incubator.apache.org/"> <img src= "../_static/apache.png" style="background-color:white;"> </a>
-
-  <a href="https://github.com/apache/incubator-singa" class="fa fa-github" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://aws.amazon.com/marketplace/seller-profile?id=5bcac385-12c4-4802-aec7-351e09b77b4c" class="fab fa-aws" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://hub.docker.com/r/apache/singa/" class="fab fa-docker" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> 
-  <a href="https://www.linkedin.com/groups/13550034" class="fa fa-linkedin" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://twitter.com/ApacheSinga" class="fa fa-twitter" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://www.facebook.com/Apache-SINGA-347284219056544/" class="fa fa-facebook" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://www.researchgate.net/project/Apache-SINGA" class="fab fa-researchgate" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-
-</div>
-
- <a href="https://github.com/apache/incubator-singa">
-    <img style="position: absolute; top: 0; right: 0; border: 0; z-index: 10000;"
-        src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"
-        alt="Fork me on GitHub">
-</a>
-
  
-
+ <div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
+   <span class="rst-current-version" data-toggle="rst-current-version">
+     <span class="fa fa-book"> incubator-singa </span>
+     v: latest
+     <span class="fa fa-caret-down"></span>
+   </span>
+   <div class="rst-other-versions">
+       <dl>
+           <dt>Languages</dt>
+           <dd><a href="../../index.html">English</a></dd>
+           <dd><a href=".././index.html">中文</a></dd>
+       </dl>
+       <dl>
+           <dt>Versions</dt>
+           <dd><a href="http://singa.apache.org/v0.3.0/">0.3</a></dd>
+           <dd><a href="http://singa.apache.org/v1.1.0/">1.1</a></dd>
+       </dl>
+ 
+   </div>
+   <a href="http://incubator.apache.org/"> <img src= "../_static/apache.png" style="background-color:white;"> </a>
+ 
+   <a href="https://github.com/apache/incubator-singa" class="fa fa-github" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://aws.amazon.com/marketplace/seller-profile?id=5bcac385-12c4-4802-aec7-351e09b77b4c" class="fab fa-aws" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://hub.docker.com/r/apache/singa/" class="fab fa-docker" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> 
+   <a href="https://www.linkedin.com/groups/13550034" class="fa fa-linkedin" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://twitter.com/ApacheSinga" class="fa fa-twitter" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://www.facebook.com/Apache-SINGA-347284219056544/" class="fa fa-facebook" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://www.researchgate.net/project/Apache-SINGA" class="fab fa-researchgate" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+ 
+ </div>
+ 
+  <a href="https://github.com/apache/incubator-singa">
+     <img style="position: absolute; top: 0; right: 0; border: 0; z-index: 10000;"
+         src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"
+         alt="Fork me on GitHub">
+ </a>
+ 
+  
+ 
 
 </body>
 </html>
\ No newline at end of file

Modified: incubator/singa/site/trunk/zh/docs/software_stack.html
URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/zh/docs/software_stack.html?rev=1857926&r1=1857925&r2=1857926&view=diff
==============================================================================
--- incubator/singa/site/trunk/zh/docs/software_stack.html (original)
+++ incubator/singa/site/trunk/zh/docs/software_stack.html Sun Apr 21 21:57:38 2019
@@ -1,5 +1,5 @@
 
-
+ 
 
 <!DOCTYPE html>
 <!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
@@ -9,7 +9,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>软件架构 &mdash; incubator-singa 1.1.0 documentation</title>
+  <title>软件架构 &mdash; incubator-singa 2.0.0 documentation</title>
   
 
   
@@ -38,18 +38,18 @@
     <link rel="search" title="Search" href="../search.html" />
     <link rel="next" title="设备(Device)" href="device.html" />
     <link rel="prev" title="安装" href="installation.html" />
-    <link href="../_static/style.css" rel="stylesheet" type="text/css">
-    <!--link href="../_static/fontawesome-all.min.css" rel="stylesheet" type="text/css"-->
-	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-    <style>
-	.fa:hover {
-	    opacity: 0.7;
-	}
-	.fab:hover {
-	    opacity: 0.7;
-	}
-    </style>
-
+     <link href="../_static/style.css" rel="stylesheet" type="text/css">
+     <!--link href="../_static/fontawesome-all.min.css" rel="stylesheet" type="text/css"-->
+   <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
+     <style>
+   .fa:hover {
+       opacity: 0.7;
+   }
+   .fab:hover {
+       opacity: 0.7;
+   }
+     </style>
+ 
 </head>
 
 <body class="wy-body-for-nav">
@@ -212,15 +212,15 @@
 <p>张量(<a class="reference external" href="tensor.html">Tensor</a>)和设备(<a class="reference external" href="device.html">Device</a>)是SINGA的两个核心抽象类。 Tensor代表了一个多维数组，存储了模型的变量并且为机器学习算法提供线性代数的操作，这些操作包括矩阵乘法和随机函数。每个Tensor实例被分配在一个设备实例上。 每个Device实例被创建在一台硬件设备上，如GPU或CPU核上。设备类用于管理张量所占用的内存以及在执行单元上执行张量操作，比如CPU线程æˆ
 –CUDA流。</p>
 <p>依赖于硬件和编程语言，SINGA实现了以下特定的设备类：</p>
 <ul class="simple">
-<li><p><strong>CudaGPU</strong> 代表一个Nvidia GPU。 执行单元是CUDA流。</p></li>
-<li><p><strong>CppCPU</strong> 代表一个CPU。 执行单元是CPU线程。</p></li>
-<li><p><strong>OpenclGPU</strong> 代表Nvidia和AMD的GPU。执行单元是CommandQueues。OpenCL和很多硬件设备兼容，比如FPGA和ARM，所以OpenclGPU可以扩展到其他设备上。</p></li>
+<li><strong>CudaGPU</strong> 代表一个Nvidia GPU。 执行单元是CUDA流。</li>
+<li><strong>CppCPU</strong> 代表一个CPU。 执行单元是CPU线程。</li>
+<li><strong>OpenclGPU</strong> 代表Nvidia和AMD的GPU。执行单元是CommandQueues。OpenCL和很多硬件设备兼容，比如FPGA和ARM，所以OpenclGPU可以扩展到其他设备上。</li>
 </ul>
 <p>不同类型的设备使用不同编程语言书写用于张量操作的核函数，</p>
 <ul class="simple">
-<li><p>CppMath (tensor_math_cpp.h) 用Cpp实现了CppCPU的张量操作</p></li>
-<li><p>CudaMath (tensor_math_cuda.h) 用CUDA实现了CudaGPU的张量操作</p></li>
-<li><p>OpenclMath (tensor_math_opencl.h) 用OpenCL实现了OpenclGPU的张量操作</p></li>
+<li>CppMath (tensor_math_cpp.h) 用Cpp实现了CppCPU的张量操作</li>
+<li>CudaMath (tensor_math_cuda.h) 用CUDA实现了CudaGPU的张量操作</li>
+<li>OpenclMath (tensor_math_opencl.h) 用OpenCL实现了OpenclGPU的张量操作</li>
 </ul>
 <p>另外，不同类型的数据，比如float32和float16,可以通过加入相应的张量函数来支持。</p>
 <p>典型地，用户将创建一个Device实例并把它传给多个Tensor实例。 当用户调用Tensor函数时，这些函数会自动唤起对应的实现(CppMath/CudaMath/OpenclMath)。 换句话说，Tensor操作的实现对用户是透明的。</p>
@@ -232,23 +232,23 @@
 <h2>模型<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h2>
 <p>在Tensor和Device的抽象化之上，SINGA提供了更高级的类用于机器学习模型。</p>
 <ul class="simple">
-<li><p><a class="reference external" href="layer.html">Layer</a>和它的子类特别用于神经网络。 每个层为向前传递特征和向后传递梯度提供函数支持。 它们将复杂的操作封装起来使用户可以很容易创建神经网络连接一系列层。</p></li>
-<li><p><a class="reference external" href="initializer.html">Initializer</a>和它的子类为初始化模型参数（存储在Tesnor实例中）提供了可变的方法，包括Uniform,Gaussian等等。</p></li>
-<li><p><a class="reference external" href="loss.html">Loss</a>和它的子类定义了训练目标损失函数。与目标损失对应的计算损失值和计算梯度的函数都已被实现。 常见的损失函数包括平方差和交叉熵。</p></li>
-<li><p><a class="reference external" href="metric.html">Metric</a>和它的子类提供了评估模型性能的函数，比如精确度。</p></li>
-<li><p><a class="reference external" href="optimizer.html">Optimizer</a>和它的子类实现了如何利用参数梯度更新模型参数的方法，包括SGD, AdaGrad, RMSProp等等。</p></li>
+<li><a class="reference external" href="layer.html">Layer</a>和它的子类特别用于神经网络。 每个层为向前传递特征和向后传递梯度提供函数支持。 它们将复杂的操作封装起来使用户可以很容易创建神经网络连接一系列层。</li>
+<li><a class="reference external" href="initializer.html">Initializer</a>和它的子类为初始化模型参数（存储在Tesnor实例中）提供了可变的方法，包括Uniform,Gaussian等等。</li>
+<li><a class="reference external" href="loss.html">Loss</a>和它的子类定义了训练目标损失函数。与目标损失对应的计算损失值和计算梯度的函数都已被实现。 常见的损失函数包括平方差和交叉熵。</li>
+<li><a class="reference external" href="metric.html">Metric</a>和它的子类提供了评估模型性能的函数，比如精确度。</li>
+<li><a class="reference external" href="optimizer.html">Optimizer</a>和它的子类实现了如何利用参数梯度更新模型参数的方法，包括SGD, AdaGrad, RMSProp等等。</li>
 </ul>
 </div>
 <div class="section" id="id4">
 <h2>输入输出<a class="headerlink" href="#id4" title="Permalink to this headline">¶</a></h2>
 <p>输入输出包含数据加载，数据预处理和信息传递类。</p>
 <ul class="simple">
-<li><p>Reader和它的子类从磁盘文件加载字符串记录</p></li>
-<li><p>Writer和它的子类将字符串记录写到磁盘文件中</p></li>
-<li><p>Encoder和它的子类将Tensor实例编译成字符串记录</p></li>
-<li><p>Decoder和它的子类将字符串记录解码为Tensor实例</p></li>
-<li><p>Endpoint代表为消息传递提供函数的交互终端</p></li>
-<li><p>Message代表Endpoint实例间的交互消息。它会传递元数据和负载</p></li>
+<li>Reader和它的子类从磁盘文件加载字符串记录</li>
+<li>Writer和它的子类将字符串记录写到磁盘文件中</li>
+<li>Encoder和它的子类将Tensor实例编译成字符串记录</li>
+<li>Decoder和它的子类将字符串记录解码为Tensor实例</li>
+<li>Endpoint代表为消息传递提供函数的交互终端</li>
+<li>Message代表Endpoint实例间的交互消息。它会传递元数据和负载</li>
 </ul>
 </div>
 </div>
@@ -300,46 +300,46 @@
   
     
   
-
-<div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
-  <span class="rst-current-version" data-toggle="rst-current-version">
-    <span class="fa fa-book"> incubator-singa </span>
-    v: latest
-    <span class="fa fa-caret-down"></span>
-  </span>
-  <div class="rst-other-versions">
-      <dl>
-          <dt>Languages</dt>
-          <dd><a href="../../en/index.html">English</a></dd>
-          <dd><a href="../../zh/index.html">中文</a></dd>
-      </dl>
-      <dl>
-          <dt>Versions</dt>
-          <dd><a href="http://singa.apache.org/v0.3.0/">0.3</a></dd>
-          <dd><a href="http://singa.apache.org/v1.1.0/">1.1</a></dd>
-      </dl>
-
-  </div>
-  <a href="http://incubator.apache.org/"> <img src= "../_static/apache.png" style="background-color:white;"> </a>
-
-  <a href="https://github.com/apache/incubator-singa" class="fa fa-github" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://aws.amazon.com/marketplace/seller-profile?id=5bcac385-12c4-4802-aec7-351e09b77b4c" class="fab fa-aws" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://hub.docker.com/r/apache/singa/" class="fab fa-docker" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> 
-  <a href="https://www.linkedin.com/groups/13550034" class="fa fa-linkedin" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://twitter.com/ApacheSinga" class="fa fa-twitter" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://www.facebook.com/Apache-SINGA-347284219056544/" class="fa fa-facebook" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-  <a href="https://www.researchgate.net/project/Apache-SINGA" class="fab fa-researchgate" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
-
-</div>
-
- <a href="https://github.com/apache/incubator-singa">
-    <img style="position: absolute; top: 0; right: 0; border: 0; z-index: 10000;"
-        src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"
-        alt="Fork me on GitHub">
-</a>
-
  
-
+ <div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
+   <span class="rst-current-version" data-toggle="rst-current-version">
+     <span class="fa fa-book"> incubator-singa </span>
+     v: latest
+     <span class="fa fa-caret-down"></span>
+   </span>
+   <div class="rst-other-versions">
+       <dl>
+           <dt>Languages</dt>
+           <dd><a href="../../index.html">English</a></dd>
+           <dd><a href=".././index.html">中文</a></dd>
+       </dl>
+       <dl>
+           <dt>Versions</dt>
+           <dd><a href="http://singa.apache.org/v0.3.0/">0.3</a></dd>
+           <dd><a href="http://singa.apache.org/v1.1.0/">1.1</a></dd>
+       </dl>
+ 
+   </div>
+   <a href="http://incubator.apache.org/"> <img src= "../_static/apache.png" style="background-color:white;"> </a>
+ 
+   <a href="https://github.com/apache/incubator-singa" class="fa fa-github" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://aws.amazon.com/marketplace/seller-profile?id=5bcac385-12c4-4802-aec7-351e09b77b4c" class="fab fa-aws" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://hub.docker.com/r/apache/singa/" class="fab fa-docker" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> 
+   <a href="https://www.linkedin.com/groups/13550034" class="fa fa-linkedin" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://twitter.com/ApacheSinga" class="fa fa-twitter" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://www.facebook.com/Apache-SINGA-347284219056544/" class="fa fa-facebook" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+   <a href="https://www.researchgate.net/project/Apache-SINGA" class="fab fa-researchgate" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a>
+ 
+ </div>
+ 
+  <a href="https://github.com/apache/incubator-singa">
+     <img style="position: absolute; top: 0; right: 0; border: 0; z-index: 10000;"
+         src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"
+         alt="Fork me on GitHub">
+ </a>
+ 
+  
+ 
 
 </body>
 </html>
\ No newline at end of file