Modified: incubator/singa/site/trunk/zh/docs/installation.html
URL: 
http://svn.apache.org/viewvc/incubator/singa/site/trunk/zh/docs/installation.html?rev=1858059&r1=1858058&r2=1858059&view=diff
==============================================================================
--- incubator/singa/site/trunk/zh/docs/installation.html (original)
+++ incubator/singa/site/trunk/zh/docs/installation.html Wed Apr 24 14:57:35 
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 2.0.0 documentation</title>
+  <title>安装 &mdash; incubator-singa 1.1.0 documentation</title>
   
 
   
@@ -38,18 +38,18 @@
     <link rel="search" title="Search" href="../search.html" />
     <link rel="next" title="软件架构" href="software_stack.html" />
     <link rel="prev" title="文档" href="index.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">
@@ -216,12 +216,12 @@
 <p>目前,SINGA有适用于Linux和MacOSX的conda软件包(Python 
2.7和Python 3.6)。
 建议使用<a class="reference external" 
href="https://conda.io/miniconda.html";>Miniconda3</a>与SINGA一起使用。安è£
…完miniconda后,执行以下命令之一来安装SINGA。</p>
 <ol>
-<li><p class="first">CPU版本</p>
+<li><p>CPU版本</p>
 <div class="highlight-default notranslate"><div 
class="highlight"><pre><span></span> <span class="n">conda</span> <span 
class="n">install</span> <span class="o">-</span><span class="n">c</span> <span 
class="n">nusdbsystem</span> <span class="n">singa</span><span 
class="o">-</span><span class="n">cpu</span>
 </pre></div>
 </div>
 </li>
-<li><p class="first">由CUDA和cuDNN支持的GPU版本</p>
+<li><p>由CUDA和cuDNN支持的GPU版本</p>
 <div class="highlight-default notranslate"><div 
class="highlight"><pre><span></span> <span class="n">conda</span> <span 
class="n">install</span> <span class="o">-</span><span class="n">c</span> <span 
class="n">nusdbsystem</span> <span class="n">singa</span><span 
class="o">-</span><span class="n">gpu</span>
 </pre></div>
 </div>
@@ -278,29 +278,30 @@
 有关在Ubuntu 16.04上安装它们的说明,
 请参阅SINGA <a class="reference external" 
href="https://github.com/apache/incubator-singa/blob/master/tool/docker/";>Dockerfiles</a>。</p>
 <ul class="simple">
-<li>cmake (&gt;=2.8)</li>
-<li>gcc (&gt;=4.8.1) or Clang</li>
-<li>google protobuf (&gt;=2.5)</li>
-<li>blas (tested with openblas &gt;=0.2.10)</li>
-<li>swig(&gt;=3.0.10) for compiling PySINGA</li>
-<li>numpy(&gt;=1.11.0) for compiling PySINGA</li>
+<li><p>cmake (&gt;=2.8)</p></li>
+<li><p>gcc (&gt;=4.8.1) or Clang</p></li>
+<li><p>google protobuf (&gt;=2.5)</p></li>
+<li><p>blas (tested with openblas &gt;=0.2.10)</p></li>
+<li><p>swig(&gt;=3.0.10) for compiling PySINGA</p></li>
+<li><p>numpy(&gt;=1.11.0) for compiling PySINGA</p></li>
 </ul>
 <ol class="simple">
-<li>在incubator-singa目录下创建一个<code class="docutils literal 
notranslate"><span class="pre">build</span></code>文件夹并进入其中</li>
-<li>运行 <code class="docutils literal notranslate"><span 
class="pre">cmake</span> <span class="pre">[options]</span> <span 
class="pre">..</span></code>
-默认情况下除了<code class="docutils literal notranslate"><span 
class="pre">USE_PYTHON</span></code>,其他所有可选项都是OFF<ul>
-<li><code class="docutils literal notranslate"><span 
class="pre">USE_MODULES=ON</span></code>, 当protobuf和blas没有被安装
时使用</li>
-<li><code class="docutils literal notranslate"><span 
class="pre">USE_CUDA=ON</span></code>, 当CUDA和cuDNN可用时使用</li>
-<li><code class="docutils literal notranslate"><span 
class="pre">USE_PYTHON=ON</span></code>, 用于编译PySINGA</li>
-<li><code class="docutils literal notranslate"><span 
class="pre">USE_PYTHON3=ON</span></code>, 用于支持Python 3编译 
(默认的是Python 2)</li>
-<li><code class="docutils literal notranslate"><span 
class="pre">USE_OPENCL=ON</span></code>, 用于支持OpenCL编译</li>
-<li><code class="docutils literal notranslate"><span 
class="pre">PACKAGE=ON</span></code>, 用于创建Debian包</li>
-<li><code class="docutils literal notranslate"><span 
class="pre">ENABLE_TEST</span></code>,用于编译单元测试用例</li>
+<li><p>在incubator-singa目录下创建一个<code class="docutils literal 
notranslate"><span class="pre">build</span></code>文件夹并进入å…
¶ä¸­</p></li>
+<li><p>运行 <code class="docutils literal notranslate"><span 
class="pre">cmake</span> <span class="pre">[options]</span> <span 
class="pre">..</span></code>
+默认情况下除了<code class="docutils literal notranslate"><span 
class="pre">USE_PYTHON</span></code>,其他所有可选项都是OFF</p>
+<ul class="simple">
+<li><p><code class="docutils literal notranslate"><span 
class="pre">USE_MODULES=ON</span></code>, 当protobuf和blas没有被安装
时使用</p></li>
+<li><p><code class="docutils literal notranslate"><span 
class="pre">USE_CUDA=ON</span></code>, 当CUDA和cuDNN可用时使用</p></li>
+<li><p><code class="docutils literal notranslate"><span 
class="pre">USE_PYTHON=ON</span></code>, 用于编译PySINGA</p></li>
+<li><p><code class="docutils literal notranslate"><span 
class="pre">USE_PYTHON3=ON</span></code>, 用于支持Python 3编译 
(默认的是Python 2)</p></li>
+<li><p><code class="docutils literal notranslate"><span 
class="pre">USE_OPENCL=ON</span></code>, 用于支持OpenCL编译</p></li>
+<li><p><code class="docutils literal notranslate"><span 
class="pre">PACKAGE=ON</span></code>, 用于创建Debian包</p></li>
+<li><p><code class="docutils literal notranslate"><span 
class="pre">ENABLE_TEST</span></code>,用于编译单元测试用例</p></li>
 </ul>
 </li>
-<li>编译代码, 如: <code class="docutils literal notranslate"><span 
class="pre">make</span></code></li>
-<li>进入python文件夹</li>
-<li>运行 <code class="docutils literal notranslate"><span 
class="pre">pip</span> <span class="pre">install</span> <span 
class="pre">.</span></code>或者 <code class="docutils literal 
notranslate"><span class="pre">pip</span> <span class="pre">install</span> 
<span class="pre">-e</span> <span 
class="pre">.</span></code>。第二个指令创建符号链接而不是将文件复制到python站点åŒ
…文件夹中。</li>
+<li><p>编译代码, 如: <code class="docutils literal notranslate"><span 
class="pre">make</span></code></p></li>
+<li><p>进入python文件夹</p></li>
+<li><p>运行 <code class="docutils literal notranslate"><span 
class="pre">pip</span> <span class="pre">install</span> <span 
class="pre">.</span></code>或者 <code class="docutils literal 
notranslate"><span class="pre">pip</span> <span class="pre">install</span> 
<span class="pre">-e</span> <span 
class="pre">.</span></code>。第二个指令创建符号链接而不是将文件复制到python站点åŒ
…文件夹中。</p></li>
 </ol>
 <p>当USE_PYTHON=ON时,第4步和第5步用于安装PySINGA。</p>
 <p>在通过ENABLE_TEST=ON编译好SINGA后,你可以运行单元测试</p>
@@ -370,9 +371,9 @@
 </div>
 <p>另外,你将需要OpenCL Installable Client Driver (ICD)以在你
的平台上运行OpenCL。</p>
 <ul class="simple">
-<li>对于AMD和Nvidia GPU, 驱动包还需要包含正确的OpenCL ICD。</li>
-<li>对于英特尔CPUs和/或GPUs, 可以从<a class="reference external" 
href="https://software.intel.com/en-us/articles/opencl-drivers";>英特尔官网</a>上获取到。
 注意, 官网上提供的驱动仅支持近期的CPUs和GPUs。</li>
-<li>对于更老的英特尔CPUs,你可以选用<code class="docutils 
literal notranslate"><span class="pre">beignet-opencl-icd</span></code>包
。</li>
+<li><p>对于AMD和Nvidia GPU, 驱动包还需要包含正确的OpenCL 
ICD。</p></li>
+<li><p>对于英特尔CPUs和/或GPUs, 可以从<a class="reference external" 
href="https://software.intel.com/en-us/articles/opencl-drivers";>英特尔官网</a>上获取到。
 注意, 官网上提供的驱动仅支持近期的CPUs和GPUs。</p></li>
+<li><p>对于更老的英特尔CPUs,你可以选用<code class="docutils 
literal notranslate"><span class="pre">beignet-opencl-icd</span></code>包
。</p></li>
 </ul>
 <p>注意,在CPU上运行OpenCL目前是不推荐的,因为很慢。 内
存传输是以秒的级别(CPU上为1000 ms,而GPU上为1毫秒)。</p>
 <p>更多关于OpenCL环境配置的信息可以从<a class="reference 
external" href="https://wiki.tiker.net/OpenCLHowTo";>这里</a>获得。</p>
@@ -397,15 +398,15 @@
 <div class="section" id="faq">
 <h2>FAQ<a class="headerlink" href="#faq" title="Permalink to this 
headline">¶</a></h2>
 <ul>
-<li><p class="first">Q: 在使用由wheel安装的PySINGA(‘import 
singa’)时,出现错误。</p>
+<li><p>Q: 在使用由wheel安装的PySINGA(‘import 
singa’)时,出现错误。</p>
 <p>A: 请查看<code class="docutils literal notranslate"><span 
class="pre">python</span> <span class="pre">-c</span> <span 
class="pre">&quot;from</span> <span class="pre">singa</span> <span 
class="pre">import</span> <span 
class="pre">_singa_wrap&quot;</span></code>详细错误提示。 
这有时是由依赖库造
成的,比如,有多个版本的protobuf,cudnn缺失,numpy版本不匹é…
ã€‚ 下面的步骤详述了不同的案例:</p>
 <ol>
-<li><p 
class="first">检查cudnn,cuda和gcc版本,推荐使用cudnn5,cuda7.5和gcc4.8/4.9。
 如果gcc是5.0版本, 需要降低版本。 如果cudnn确实或者
与wheel版本不匹配,你
可以将正确的cudnn版本下载到~/local/cudnn/ 并且</p>
+<li><p>检查cudnn,cuda和gcc版本,推荐使用cudnn5,cuda7.5和gcc4.8/4.9。
 如果gcc是5.0版本, 需要降低版本。 如果cudnn确实或者
与wheel版本不匹配,你
可以将正确的cudnn版本下载到~/local/cudnn/ 并且</p>
 <div class="highlight-default notranslate"><div 
class="highlight"><pre><span></span> $ echo &quot;export 
LD_LIBRARY_PATH=/home/&lt;yourname&gt;/local/cudnn/lib64:$LD_LIBRARY_PATH&quot; 
&gt;&gt; ~/.bashrc
 </pre></div>
 </div>
 </li>
-<li><p class="first">如果是protobuf的问题,需要下载最新的<a 
class="reference external" 
href="https://issues.apache.org/jira/browse/SINGA-255";>编译过protobuf和openblas的whl文件</a>。
 或者,你可以从源码安装
protobuf到指定文件夹,比如:~/local/;解压tar文件,然后执行</p>
+<li><p>如果是protobuf的问题,需要下载最新的<a class="reference 
external" 
href="https://issues.apache.org/jira/browse/SINGA-255";>编译过protobuf和openblas的whl文件</a>。
 或者,你可以从源码安装
protobuf到指定文件夹,比如:~/local/;解压tar文件,然后执行</p>
 <div class="highlight-default notranslate"><div 
class="highlight"><pre><span></span> $ ./configure 
--prefix=/home/&lt;yourname&gt;local
  $ make &amp;&amp; make install
  $ echo &quot;export 
LD_LIBRARY_PATH=/home/&lt;yourname&gt;/local/lib:$LD_LIBRARY_PATH&quot; 
&gt;&gt; ~/.bashrc
@@ -413,9 +414,8 @@
 </pre></div>
 </div>
 </li>
-<li><p class="first">如果找不到其他python库,你
可以用pip或conda创建python虚拟环境。</p>
-</li>
-<li><p class="first">如果不是以上原因造成的,进入<code 
class="docutils literal notranslate"><span 
class="pre">_singa_wrap.so</span></code>所在文件夹,执行</p>
+<li><p>如果找不到其他python库,你
可以用pip或conda创建python虚拟环境。</p></li>
+<li><p>如果不是以上原因造成的,进入<code class="docutils literal 
notranslate"><span 
class="pre">_singa_wrap.so</span></code>所在文件夹,执行</p>
 <div class="highlight-default notranslate"><div 
class="highlight"><pre><span></span> $ python
  &gt;&gt; import importlib
  &gt;&gt; importlib.import_module(&#39;_singa_wrap&#39;)
@@ -431,33 +431,33 @@
 </pre></div>
 </div>
 </li>
-<li><p class="first">Q: 运行<code class="docutils literal notranslate"><span 
class="pre">cmake</span> <span 
class="pre">..</span></code>报错,找不到依赖库。</p>
+<li><p>Q: 运行<code class="docutils literal notranslate"><span 
class="pre">cmake</span> <span 
class="pre">..</span></code>报错,找不到依赖库。</p>
 <p>A: 如果你没有安装相应库,就去安装它们。如果你
把这些库安装在非系统默认的路径下,如/usr/local,你
可以将正确路径导出到环境变量中:</p>
 <div class="highlight-default notranslate"><div 
class="highlight"><pre><span></span>  $ export CMAKE_INCLUDE_PATH=&lt;path to 
your header file folder&gt;
   $ export CMAKE_LIBRARY_PATH=&lt;path to your lib file folder&gt;
 </pre></div>
 </div>
 </li>
-<li><p class="first">Q: <code class="docutils literal notranslate"><span 
class="pre">make</span></code>报错,如连接阶段</p>
+<li><p>Q: <code class="docutils literal notranslate"><span 
class="pre">make</span></code>报错,如连接阶段</p>
 <p>A: 如果你的库文件在非系统默认路径下,你
需要导出相应的变量</p>
 <div class="highlight-default notranslate"><div 
class="highlight"><pre><span></span>  $ export LIBRARY_PATH=&lt;path to your 
lib file folder&gt;
   $ export LD_LIBRARY_PATH=&lt;path to your lib file folder&gt;
 </pre></div>
 </div>
 </li>
-<li><p class="first">Q: 头文件错误,比如:’cblas.h no such file or 
directory exists’</p>
+<li><p>Q: 头文件错误,比如:’cblas.h no such file or directory 
exists’</p>
 <p>A: 你需要把cblas.h的路径加入到CPLUS_INCLUDE_PATH,如</p>
 <div class="highlight-default notranslate"><div 
class="highlight"><pre><span></span>  $ export 
CPLUS_INCLUDE_PATH=/opt/OpenBLAS/include:$CPLUS_INCLUDE_PATH
 </pre></div>
 </div>
 </li>
-<li><p class="first">Q:编译SINGA时,我发现了错误<code 
class="docutils literal notranslate"><span class="pre">SSE2</span> <span 
class="pre">instruction</span> <span class="pre">set</span> <span 
class="pre">not</span> <span class="pre">enabled</span></code></p>
+<li><p>Q:编译SINGA时,我发现了错误<code class="docutils literal 
notranslate"><span class="pre">SSE2</span> <span class="pre">instruction</span> 
<span class="pre">set</span> <span class="pre">not</span> <span 
class="pre">enabled</span></code></p>
 <p>A:你可以尝试如下命令</p>
 <div class="highlight-default notranslate"><div 
class="highlight"><pre><span></span>  $ make CFLAGS=&#39;-msse2&#39; 
CXXFLAGS=&#39;-msse2&#39;
 </pre></div>
 </div>
 </li>
-<li><p class="first">Q:当我试图导å…
¥.py文件时,我得到错误提示<code class="docutils literal 
notranslate"><span class="pre">ImportError:</span> <span 
class="pre">cannot</span> <span class="pre">import</span> <span 
class="pre">name</span> <span class="pre">enum_type_wrapper</span></code>。</p>
+<li><p>Q:当我试图导入.py文件时,我得到错误提示<code 
class="docutils literal notranslate"><span class="pre">ImportError:</span> 
<span class="pre">cannot</span> <span class="pre">import</span> <span 
class="pre">name</span> <span class="pre">enum_type_wrapper</span></code>。</p>
 <p>A: 你需要安装绑定到python的protobuf,可以由如下命令安装
</p>
 <div class="highlight-default notranslate"><div 
class="highlight"><pre><span></span>  $ sudo apt-get install protobuf
 </pre></div>
@@ -470,7 +470,7 @@
 </pre></div>
 </div>
 </li>
-<li><p class="first">Q: 当我从源ç 
åˆ›å»ºOpenBLAS时,被告知需要Fortran编译器。</p>
+<li><p>Q: 当我从源ç 
åˆ›å»ºOpenBLAS时,被告知需要Fortran编译器。</p>
 <p>A: 你可以用如下命令编译OpenBLAS</p>
 <div class="highlight-default notranslate"><div 
class="highlight"><pre><span></span>  $ make ONLY_CBLAS=1
 </pre></div>
@@ -480,7 +480,7 @@
 </pre></div>
 </div>
 </li>
-<li><p class="first">Q: 当我创建protocol 
buffer时,出现错误提示<code class="docutils literal notranslate"><span 
class="pre">GLIBC++_3.4.20</span> <span class="pre">not</span> <span 
class="pre">found</span> <span class="pre">in</span> <span 
class="pre">/usr/lib64/libstdc++.so.6</span></code>。</p>
+<li><p>Q: 当我创建protocol buffer时,出现错误提示<code 
class="docutils literal notranslate"><span class="pre">GLIBC++_3.4.20</span> 
<span class="pre">not</span> <span class="pre">found</span> <span 
class="pre">in</span> <span 
class="pre">/usr/lib64/libstdc++.so.6</span></code>。</p>
 <p>A: 
这说明连接器找到了libstdc++.so.6,但是这个库属于一个更老版本的GCC编译器。
 
要编译的程序依赖于定义在新版本GCC下的libstdc++库,所以连接器å¿
…须被告知如何找到新版的可共享的libstdc++库。 
最简单的处理方法是找到正确的libstdc++库,导出到LD_LIBRARY_PATH变量。
 比如,如果GLIBC++_3.4.20被列在如下命令的输出中</p>
 <div class="highlight-default notranslate"><div 
class="highlight"><pre><span></span>  $ strings 
/usr/local/lib64/libstdc++.so.6|grep GLIBC++
 </pre></div>
@@ -490,7 +490,7 @@
 </pre></div>
 </div>
 </li>
-<li><p class="first">Q: 
当我创建glog时报错,”src/logging_unittest.cc:83:20: error: 
‘gflags’ is not a namespace-name”。</p>
+<li><p>Q: 当我创建glog时报错,”src/logging_unittest.cc:83:20: error: 
‘gflags’ is not a namespace-name”。</p>
 <p>A: 这可能是你装
了一个不同命名空间的gflags,比如”google”,所以glog找不到’gflags’命名空间。
 gflags不是创建glog必须的, 所以你
可以修改configure.ac文件以忽略gflags。</p>
 <div class="highlight-default notranslate"><div 
class="highlight"><pre><span></span>  <span class="mf">1.</span> <span 
class="n">cd</span> <span class="n">to</span> <span class="n">glog</span> <span 
class="n">src</span> <span class="n">directory</span>
   <span class="mf">2.</span> <span class="n">change</span> <span 
class="n">line</span> <span class="mi">125</span> <span class="n">of</span> 
<span class="n">configure</span><span class="o">.</span><span 
class="n">ac</span>  <span class="n">to</span> <span 
class="s2">&quot;AC_CHECK_LIB(gflags, main, ac_cv_have_libgflags=0, 
ac_cv_have_libgflags=0)&quot;</span>
@@ -499,16 +499,16 @@
 </div>
 <p>之后,你可以重新创建glog。</p>
 </li>
-<li><p class="first">Q: 当使用虚拟环境时,每次我运行pip 
install都会重新安装numpy。 然而,在<code class="docutils literal 
notranslate"><span class="pre">import</span> <span 
class="pre">numpy</span></code>时,numpy可能并没有被使用。</p>
+<li><p>Q: 当使用虚拟环境时,每次我运行pip 
install都会重新安装numpy。 然而,在<code class="docutils literal 
notranslate"><span class="pre">import</span> <span 
class="pre">numpy</span></code>时,numpy可能并没有被使用。</p>
 <p>A: 这可能是因为在使用虚拟环境时,<code class="docutils 
literal notranslate"><span 
class="pre">PYTHONPATH</span></code>被设置成了空以防止与虚拟环境中的路径发生冲突。</p>
 </li>
-<li><p class="first">Q: 当从源码编译PySINGA时,会因
为缺失&lt;numpy/objectarray.h&gt;而出现编译错误。</p>
+<li><p>Q: 当从源码编译PySINGA时,会因
为缺失&lt;numpy/objectarray.h&gt;而出现编译错误。</p>
 <p>A: 请安装numpy并且通过如下命令导出numpy头文件</p>
 <div class="highlight-default notranslate"><div 
class="highlight"><pre><span></span>  $ export CPLUS_INCLUDE_PATH=`python -c 
&quot;import numpy; print numpy.get_include()&quot;`:$CPLUS_INCLUDE_PATH
 </pre></div>
 </div>
 </li>
-<li><p class="first">Q: 当在Mac OS 
X下运行PySINGA时,我得到了错误信息”Fatal Python error: 
PyThreadState_Get: no current thread Abort trap: 6”。</p>
+<li><p>Q: 当在Mac OS X下运行PySINGA时,我得到了错误信息”Fatal 
Python error: PyThreadState_Get: no current thread Abort trap: 6”。</p>
 <p>A: 这个错误很典型地出现在当你
系统中存在多个版本的python并且你是通过pip安装
 SINGA的(这个问题可以通过由conda安装SINGA来解决), 
比如:一个来自于OS,一个通过Homebrew安装。 
和SINGA连接的Python必须和Python解析器是同个版本。你
可以通过which python来查看python解析器版本,并通过otool -L 
<path to _singa_wrap.so>检查和PySINGA连接的Python版本。 
为了解决这个问题, 需要用正确的Python版本来编译SINGA。 
特别地,如果你从源码创建的PySINGA,当唤起<a class="reference 
external" 
href="http://stackoverflow.com/questions/15291500/i-have-2-versions-of-python-installed-but-cmake-is-using-older-version-how-do";>cmake</a>时ä½
 éœ
 €è¦æŒ‡å®šå®‰è£…路径</p>
 <div class="highlight-default notranslate"><div 
class="highlight"><pre><span></span>  $ cmake -DPYTHON_LIBRARY=`python-config 
--prefix`/lib/libpython2.7.dylib -DPYTHON_INCLUDE_DIR=`python-config 
--prefix`/include/python2.7/ ..
@@ -567,50 +567,46 @@ SINGA的(这个问é¢�
   
     
   
+
+<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://www.apache.org"; style="color:lightblue;padding: 5px; 
font-size: 10px; text-align: center; text-decoration: none; margin: 5px 
2px;">Foundation</a>
-   <a href="http://www.apache.org/events/current-event"; 
style="color:lightblue;padding: 5px; font-size: 10px; text-align: center; 
text-decoration: none; margin: 5px 2px;">Events</a>
-   <a href="http://www.apache.org/foundation/thanks.html"; 
style="color:lightblue;padding: 5px; font-size: 10px; text-align: center; 
text-decoration: none; margin: 5px 2px;">Thanks</a>
-   <a href="http://www.apache.org/foundation/sponsorship.html"; 
style="color:lightblue;padding: 5px; font-size: 10px;  text-align: center; 
text-decoration: none; margin: 5px 2px;">Sponsorship</a>
-   <a href="http://www.apache.org/licenses/"; style="color:lightblue;padding: 
5px; font-size: 10px;  text-align: center; text-decoration: none; margin: 5px 
2px;">License</a>
-   <br>
-   <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/layer.html
URL: 
http://svn.apache.org/viewvc/incubator/singa/site/trunk/zh/docs/layer.html?rev=1858059&r1=1858058&r2=1858059&view=diff
==============================================================================
--- incubator/singa/site/trunk/zh/docs/layer.html (original)
+++ incubator/singa/site/trunk/zh/docs/layer.html Wed Apr 24 14:57:35 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>层(Layer) &mdash; incubator-singa 2.0.0 documentation</title>
+  <title>层(Layer) &mdash; incubator-singa 1.1.0 documentation</title>
   
 
   
@@ -38,18 +38,18 @@
     <link rel="search" title="Search" href="../search.html" />
     <link rel="next" title="前馈网络" href="net.html" />
     <link rel="prev" title="张量(Tensor)" href="tensor.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">
@@ -284,14 +284,14 @@
 <p>Python层的基类。
 典型地,层实例的生命周期包括:</p>
 <ol class="simple">
-<li>构造
层没有input_sample_shapes,转到2;用input_sample_shapes构建层,转到3</li>
-<li>调用setup来创建参数并设置其他元字段</li>
-<li>调用前向传播或访问层成员</li>
-<li>调用后向传播并获取参数完成更新</li>
+<li><p>构造
层没有input_sample_shapes,转到2;用input_sample_shapes构建层,转到3</p></li>
+<li><p>调用setup来创建参数并设置其他元字段</p></li>
+<li><p>调用前向传播或访问层成员</p></li>
+<li><p>调用后向传播并获取参数完成更新</p></li>
 </ol>
 <p><strong>参数:</strong></p>
 <ul class="simple">
-<li><strong>name (str)</strong> – 层名</li>
+<li><p><strong>name (str)</strong> – 层名</p></li>
 </ul>
 <hr class="docutils" />
 <div class="section" id="setup-in-shapes">
@@ -299,7 +299,7 @@
 <p>调用C++setup函数创建参数并设置元数据。</p>
 <p><strong>参数:</strong></p>
 <ul class="simple">
-<li><strong>in_shapes</strong> – 如果层接受单个输å…
¥tensor,则in_shapes是指定输入tensor形状的单个元组; 
如果该层接受多个输å…
¥tensor(例如,concatenation层),则in_shapes是元组的å…
ƒç»„,每个元组对于一个输入tensor</li>
+<li><p><strong>in_shapes</strong> – 如果层接受单个输å…
¥tensor,则in_shapes是指定输入tensor形状的单个元组; 
如果该层接受多个输å…
¥tensor(例如,concatenation层),则in_shapes是元组的å…
ƒç»„,每个元组对于一个输入tensor</p></li>
 </ul>
 </div>
 <hr class="docutils" />
@@ -331,8 +331,8 @@
 <p>当前层的前向传播。</p>
 <p><strong>参数:</strong></p>
 <ul class="simple">
-<li><strong>flag</strong> – True (kTrain) for training (kEval); False for 
evaluating; other values for furture use.</li>
-<li><strong>x (Tensor or list<Tensor>)</strong> – an input tensor if the 
layer is connected from a single layer; a list of tensors if the layer is 
connected from multiple layers.</li>
+<li><p><strong>flag</strong> – True (kTrain) for training (kEval); False for 
evaluating; other values for furture use.</p></li>
+<li><p><strong>x (Tensor or list<Tensor>)</strong> – an input tensor if the 
layer is connected from a single layer; a list of tensors if the layer is 
connected from multiple layers.</p></li>
 </ul>
 <p><strong>返回值:</strong> 
如果该层被连接在一个单独的层则返回tensor;如果被连接到多个层,则返回一个tensor列表</p>
 </div>
@@ -342,8 +342,8 @@
 <p>当前层的后向传播。</p>
 <p><strong>参数:</strong></p>
 <ul class="simple">
-<li><strong>flag (int)</strong> – 保留为以后使用</li>
-<li><strong>dy (Tensor or list<Tensor>)</strong> – 与目æ 
‡æŸå¤±ç›¸å¯¹åº”的梯度tensor</li>
+<li><p><strong>flag (int)</strong> – 保留为以后使用</p></li>
+<li><p><strong>dy (Tensor or list<Tensor>)</strong> – 与目æ 
‡æŸå¤±ç›¸å¯¹åº”的梯度tensor</p></li>
 </ul>
 <p><strong>返回值:</strong> &lt;dx, &lt;dp1, dp2..&gt;&gt;,dx是输å…
¥x的梯度,dpi是第i个参数的梯度</p>
 </div>
@@ -353,7 +353,7 @@
 <p>将层状态tensor移至指定设备。</p>
 <p><strong>参数:</strong></p>
 <ul class="simple">
-<li><strong>device</strong> – 
swig转换的设备,由singa.device创建</li>
+<li><p><strong>device</strong> – 
swig转换的设备,由singa.device创建</p></li>
 </ul>
 </div>
 </div>
@@ -378,18 +378,18 @@
 <p>创建一个层做2D卷积。</p>
 <p><strong>参数:</strong></p>
 <ul class="simple">
-<li><strong>nb_kernels (int)</strong> – 输入tensor的通道(æ 
¸ï¼‰æ•°</li>
-<li><strong>kernel</strong> – 一个或一对整型数表示æ 
¸çš„高和宽</li>
-<li><strong>stride</strong> – 
一个或一对整型数表示步长的高和宽</li>
-<li><strong>border_mode (string)</strong> – 填充
模式,不区分大小写,‘valid’ -&gt; 在高和宽长度上补0 
‘same’ -&gt; 填充核一半(下取整)数目的0,核必
须是奇数</li>
-<li><strong>cudnn_prefer (string)</strong> – 
偏好的cudnn卷积算法,可以是‘fatest’, ‘autotune’, 
‘limited_workspace’和‘no_workspace’</li>
-<li><strong>data_format (string)</strong> – ‘NCHW’或‘NHWC’</li>
-<li><strong>use_bias (bool)</strong> – True或False</li>
-<li><strong>pad</strong> – 一个或一对整型数表示填充
的高和宽</li>
-<li><strong>W_specs (dict)</strong> – 用于指定权重矩阵的规æ 
¼ï¼Œå­—段包括代表参数名称的‘name’,代表学习
速率乘数的’lr_mult,代表权重衰减乘数的’’decay_mult’,代表初始化方法的’init’,å
…¶å¯ä»¥æ˜¯â€™gaussian’,’uniform’,’ 
xavier’,相应的初始化方法为’’’std’,’mean’,’high’,’low’。TODO(wangwei)’clamp’为渐变约束,value为æ
 ‡é‡ï¼Œâ€™regularizer’为正规化,目前支持’l2’</li>
-<li><strong>b_specs (dict)</strong> – 偏移向量的超
参数,同W_specs类似</li>
-<li><strong>name (string)</strong> – 层名</li>
-<li><strong>input_sample_shape</strong> – 用于输入tensor形状的三å…
ƒç»„,例如(通道,高度,宽度)或(高度,宽度,通道)</li>
+<li><p><strong>nb_kernels (int)</strong> – 输入tensor的通道(æ 
¸ï¼‰æ•°</p></li>
+<li><p><strong>kernel</strong> – 一个或一对整型数表示æ 
¸çš„高和宽</p></li>
+<li><p><strong>stride</strong> – 
一个或一对整型数表示步长的高和宽</p></li>
+<li><p><strong>border_mode (string)</strong> – 填充
模式,不区分大小写,‘valid’ -&gt; 在高和宽长度上补0 
‘same’ -&gt; 填充核一半(下取整)数目的0,核必
须是奇数</p></li>
+<li><p><strong>cudnn_prefer (string)</strong> – 
偏好的cudnn卷积算法,可以是‘fatest’, ‘autotune’, 
‘limited_workspace’和‘no_workspace’</p></li>
+<li><p><strong>data_format (string)</strong> – 
‘NCHW’或‘NHWC’</p></li>
+<li><p><strong>use_bias (bool)</strong> – True或False</p></li>
+<li><p><strong>pad</strong> – 一个或一对整型数表示填充
的高和宽</p></li>
+<li><p><strong>W_specs (dict)</strong> – 用于指定权重矩阵的规æ 
¼ï¼Œå­—段包括代表参数名称的‘name’,代表学习
速率乘数的’lr_mult,代表权重衰减乘数的’’decay_mult’,代表初始化方法的’init’,å
…¶å¯ä»¥æ˜¯â€™gaussian’,’uniform’,’ 
xavier’,相应的初始化方法为’’’std’,’mean’,’high’,’low’。TODO(wangwei)’clamp’为渐变约束,value为æ
 ‡é‡ï¼Œâ€™regularizer’为正规化,目前支持’l2’</p></li>
+<li><p><strong>b_specs (dict)</strong> – 偏移向量的超
参数,同W_specs类似</p></li>
+<li><p><strong>name (string)</strong> – 层名</p></li>
+<li><p><strong>input_sample_shape</strong> – 用于输入tensor形状的三å…
ƒç»„,例如(通道,高度,宽度)或(高度,宽度,通道)</p></li>
 </ul>
 </div>
 <hr class="docutils" />
@@ -410,7 +410,7 @@
 所有的参数都与Conv2D相同,除了下面的参数。</p>
 <p><strong>参数:</strong></p>
 <ul class="simple">
-<li><strong>mode</strong> – 池
化模式,model_pb2.PoolingConf.MAX或model_pb2.PoolingConf.AVE</li>
+<li><p><strong>mode</strong> – 池
化模式,model_pb2.PoolingConf.MAX或model_pb2.PoolingConf.AVE</p></li>
 </ul>
 </div>
 <hr class="docutils" />
@@ -442,11 +442,11 @@
 <p>批量正则化。</p>
 <p><strong>参数:</strong></p>
 <ul class="simple">
-<li><strong>momentum (float)</strong> – 用于运行的均值和方差</li>
-<li><strong>beta_specs (dict)</strong> – 字典,包
括beta参数的字段:’name’参数名称’;lr_mult’学习
速率乘数;’decay_mult’权重衰减乘数;’init’初始化方法;可以是’gaussian’,’uniform’和’xavier’,’std’,’mean’,’high’,’low’表示相应初始化方法;’clamp’表示梯度约束,值是æ
 ‡é‡ï¼›â€™regularizer’用于正则化,目前支持’l2’</li>
-<li><strong>gamma_specs (dict)</strong> – 同beta_specs类似, 
但用于gamma参数.</li>
-<li><strong>name (string)</strong> – 层名</li>
-<li><strong>input_sample_shape (tuple)</strong> – 
整型数,至少一个</li>
+<li><p><strong>momentum (float)</strong> – 
用于运行的均值和方差</p></li>
+<li><p><strong>beta_specs (dict)</strong> – 字典,包
括beta参数的字段:’name’参数名称’;lr_mult’学习
速率乘数;’decay_mult’权重衰减乘数;’init’初始化方法;可以是’gaussian’,’uniform’和’xavier’,’std’,’mean’,’high’,’low’表示相应初始化方法;’clamp’表示梯度约束,值是æ
 ‡é‡ï¼›â€™regularizer’用于正则化,目前支持’l2’</p></li>
+<li><p><strong>gamma_specs (dict)</strong> – 同beta_specs类似, 
但用于gamma参数.</p></li>
+<li><p><strong>name (string)</strong> – 层名</p></li>
+<li><p><strong>input_sample_shape (tuple)</strong> – 
整型数,至少一个</p></li>
 </ul>
 </div>
 <hr class="docutils" />
@@ -456,9 +456,9 @@
 <p>局部响应归一化。</p>
 <p><strong>参数:</strong></p>
 <ul class="simple">
-<li><strong>size (int)</strong> – 用于归一化的通道数.</li>
-<li><strong>mode (string)</strong> – ‘cross_channel’</li>
-<li><strong>input_sample_shape (tuple)</strong> – 3维元组,(channel, 
height, width)</li>
+<li><p><strong>size (int)</strong> – 用于归一化的通道数.</p></li>
+<li><p><strong>mode (string)</strong> – ‘cross_channel’</p></li>
+<li><p><strong>input_sample_shape (tuple)</strong> – 3维元组,(channel, 
height, width)</p></li>
 </ul>
 </div>
 <hr class="docutils" />
@@ -468,12 +468,12 @@
 <p>进行线性或放射变换,也被叫做内积或全连接层。</p>
 <p><strong>参数:</strong></p>
 <ul class="simple">
-<li><strong>num_output (int)</strong> – 输出特征长度</li>
-<li><strong>use_bias (bool)</strong> – 转换后的特征向量是否加
上偏移向量</li>
-<li><strong>W_specs (dict)</strong> – 包
含权值矩阵的字段:’name’参数名称’;lr_mult’学习
速率乘数;’decay_mult’权重衰减乘数;’init’初始化方法;可以是’gaussian’,’uniform’和’xavier’,’std’,’mean’,’high’,’low’表示相应初始化方法;’clamp’表示梯度约束,值是æ
 ‡é‡ï¼›â€™regularizer’用于正则化,目前支持’l2’</li>
-<li><strong>b_specs (dict)</strong> – 偏移向量的字段, 
同W_specs类似</li>
-<li><strong>W_transpose (bool)</strong> – 
如果为真,输出为x*W.T+b</li>
-<li><strong>input_sample_shape (tuple)</strong> – 输入特征长度</li>
+<li><p><strong>num_output (int)</strong> – 输出特征长度</p></li>
+<li><p><strong>use_bias (bool)</strong> – 转换后的特征向量是否加
上偏移向量</p></li>
+<li><p><strong>W_specs (dict)</strong> – 包
含权值矩阵的字段:’name’参数名称’;lr_mult’学习
速率乘数;’decay_mult’权重衰减乘数;’init’初始化方法;可以是’gaussian’,’uniform’和’xavier’,’std’,’mean’,’high’,’low’表示相应初始化方法;’clamp’表示梯度约束,值是æ
 ‡é‡ï¼›â€™regularizer’用于正则化,目前支持’l2’</p></li>
+<li><p><strong>b_specs (dict)</strong> – 偏移向量的字段, 
同W_specs类似</p></li>
+<li><p><strong>W_transpose (bool)</strong> – 
如果为真,输出为x*W.T+b</p></li>
+<li><p><strong>input_sample_shape (tuple)</strong> – 输å…
¥ç‰¹å¾é•¿åº¦</p></li>
 </ul>
 </div>
 <hr class="docutils" />
@@ -483,8 +483,8 @@
 <p>Dropout层</p>
 <p><strong>参数:</strong></p>
 <ul class="simple">
-<li><strong>p (float)</strong> – 随机丢掉一个元素(即将å…
¶ä¸­è®¾ä¸º0)的概率</li>
-<li><strong>name (string)</strong> – 层名</li>
+<li><p><strong>p (float)</strong> – 随机丢掉一个元素(即将å…
¶ä¸­è®¾ä¸º0)的概率</p></li>
+<li><p><strong>name (string)</strong> – 层名</p></li>
 </ul>
 </div>
 <hr class="docutils" />
@@ -494,9 +494,9 @@
 <p>激励层</p>
 <p><strong>参数:</strong></p>
 <ul class="simple">
-<li><strong>name (string)</strong> – 层名</li>
-<li><strong>mode (string)</strong> – ‘relu’, ‘sigmoid’或 
‘tanh’</li>
-<li><strong>input_sample_shape (tuple)</strong> – 单个样本的形状</li>
+<li><p><strong>name (string)</strong> – 层名</p></li>
+<li><p><strong>mode (string)</strong> – ‘relu’, ‘sigmoid’或 
‘tanh’</p></li>
+<li><p><strong>input_sample_shape (tuple)</strong> – 单个æ 
·æœ¬çš„形状</p></li>
 </ul>
 </div>
 <hr class="docutils" />
@@ -506,8 +506,8 @@
 <p>采用SoftMax。</p>
 <p><strong>参数:</strong></p>
 <ul class="simple">
-<li><strong>axis (int)</strong> – 对[axis, 
-1)的数据逐个进行SoftMax</li>
-<li><strong>input_sample_shape (tuple)</strong> – 单个样本的形状</li>
+<li><p><strong>axis (int)</strong> – 对[axis, 
-1)的数据逐个进行SoftMax</p></li>
+<li><p><strong>input_sample_shape (tuple)</strong> – 单个æ 
·æœ¬çš„形状</p></li>
 </ul>
 </div>
 <hr class="docutils" />
@@ -517,8 +517,8 @@
 <p>将输入tensor重塑为一个矩阵。</p>
 <p><strong>参数:</strong></p>
 <ul class="simple">
-<li><strong>axis (int)</strong> – 根据指定维度将输å…
¥é‡å¡‘为矩阵,[0,axis)作为行,[axis, -1)作为列</li>
-<li><strong>input_sample_shape (tuple)</strong> – 单个样本的形状</li>
+<li><p><strong>axis (int)</strong> – 根据指定维度将输å…
¥é‡å¡‘为矩阵,[0,axis)作为行,[axis, -1)作为列</p></li>
+<li><p><strong>input_sample_shape (tuple)</strong> – 单个æ 
·æœ¬çš„形状</p></li>
 </ul>
 </div>
 <hr class="docutils" />
@@ -528,7 +528,7 @@
 <p>对所有输入tensor求和。</p>
 <p><strong>参数:</strong></p>
 <ul class="simple">
-<li><strong>input_sample_shape</strong> – 输入样本的形状。所有æ 
·æœ¬çš„形状应该一致。</li>
+<li><p><strong>input_sample_shape</strong> – 输入样本的形状。所有æ 
·æœ¬çš„形状应该一致。</p></li>
 </ul>
 <div class="section" id="setup-in-shape">
 <h4>setup(in_shape)<a class="headerlink" href="#setup-in-shape" 
title="Permalink to this headline">¶</a></h4>
@@ -547,7 +547,7 @@ TODO(wangwei) 元素级别ç
 <p>复制每个输入层的梯度tensor。</p>
 <p><strong>参数:</strong></p>
 <ul class="simple">
-<li><strong>grad</strong> - 梯度tensor</li>
+<li><p><strong>grad</strong> - 梯度tensor</p></li>
 </ul>
 <p><strong>返回值:</strong> tensor列表,每个输入层对应å…
¶ä¸­ä¸€ä¸ª</p>
 </div>
@@ -559,8 +559,8 @@ TODO(wangwei) 元素级别ç
 <p>生成输入tensor的多个副本。</p>
 <p><strong>参数:</strong></p>
 <ul class="simple">
-<li><strong>num_output (int)</strong> – 待生成的输出tensor数目</li>
-<li><strong>input_sample_shape()</strong> – 包
含一个整型数,代表输入样本特征大小</li>
+<li><p><strong>num_output (int)</strong> – 待
生成的输出tensor数目</p></li>
+<li><p><strong>input_sample_shape()</strong> – 包
含一个整型数,代表输入样本特征大小</p></li>
 </ul>
 <div class="section" id="id4">
 <h4>setup(in_shape)<a class="headerlink" href="#id4" title="Permalink to this 
headline">¶</a></h4>
@@ -573,8 +573,8 @@ TODO(wangwei) 元素级别ç
 <p>生成输入tensor的多个副本。</p>
 <p><strong>参数:</strong></p>
 <ul class="simple">
-<li><strong>flag</strong> – 没有用到</li>
-<li><strong>input</strong> – 单个输入tensor</li>
+<li><p><strong>flag</strong> – 没有用到</p></li>
+<li><p><strong>input</strong> – 单个输入tensor</p></li>
 </ul>
 <p><strong>返回值:</strong> 输出tensor列表,每个对应输å…
¥çš„一个拷贝</p>
 </div>
@@ -583,7 +583,7 @@ TODO(wangwei) 元素级别ç
 <p>对所有输入tensor求和得到单个输出tensor。</p>
 <p><strong>参数:</strong></p>
 <ul class="simple">
-<li><strong>grad</strong> - 梯度tensor</li>
+<li><p><strong>grad</strong> - 梯度tensor</p></li>
 </ul>
 <p><strong>返回值:</strong> 一个tensor,代表所有输å…
¥æ¢¯åº¦tensor的求和</p>
 </div>
@@ -595,16 +595,16 @@ TODO(wangwei) 元素级别ç
 <p>将tensor竖直(axis=0)或水平(axis=1)拼接。目前仅
支持2维tensor。</p>
 <p><strong>参数:</strong></p>
 <ul class="simple">
-<li><strong>axis (int)</strong> – 0表示拼接行; 1表示拼接列;</li>
-<li><strong>input_sample_shapes</strong> – 样本形状的å…
ƒç»„列表,每个对应一个输入样本的tensor</li>
+<li><p><strong>axis (int)</strong> – 0表示拼接行; 
1表示拼接列;</p></li>
+<li><p><strong>input_sample_shapes</strong> – 样本形状的å…
ƒç»„列表,每个对应一个输入样本的tensor</p></li>
 </ul>
 <div class="section" id="id6">
 <h4>forward(flag, inputs)<a class="headerlink" href="#id6" title="Permalink to 
this headline">¶</a></h4>
 <p>拼接所有输入tensor。</p>
 <p><strong>参数:</strong></p>
 <ul class="simple">
-<li><strong>flag</strong> – 同Layer::forward()</li>
-<li><strong>input</strong> – tensor列表</li>
+<li><p><strong>flag</strong> – 同Layer::forward()</p></li>
+<li><p><strong>input</strong> – tensor列表</p></li>
 </ul>
 <p><strong>返回值:</strong> 一个拼接后的tensor</p>
 </div>
@@ -612,8 +612,8 @@ TODO(wangwei) 元素级别ç
 <h4>backward(flag, dy)<a class="headerlink" href="#id7" title="Permalink to 
this headline">¶</a></h4>
 <p><strong>参数:</strong></p>
 <ul class="simple">
-<li><strong>flag</strong> – same as Layer::backward()</li>
-<li><strong>dy (Tensor)</strong> – the gradient tensors of y w.r.t objective 
loss</li>
+<li><p><strong>flag</strong> – same as Layer::backward()</p></li>
+<li><p><strong>dy (Tensor)</strong> – the gradient tensors of y w.r.t 
objective loss</p></li>
 </ul>
 <p><strong>返回值:</strong> 元组(dx, []), 
dx是tensor列表,对应输入的梯度;[]是空列表</p>
 </div>
@@ -625,9 +625,9 @@ TODO(wangwei) 元素级别ç
 <p>将输å…
¥tensor沿竖直(axis=0)或水平(axis=1)分成多个子tensor。</p>
 <p><strong>参数:</strong></p>
 <ul class="simple">
-<li><strong>axis (int)</strong> – 0代表分割行; 1代表分割列;</li>
-<li><strong>slice_point (list)</strong> – 
沿着轴分割的位置;n-1个分割点对应n个子tensor;</li>
-<li><strong>input_sample_shape</strong> – 输入样本tensor的形状</li>
+<li><p><strong>axis (int)</strong> – 0代表分割行; 
1代表分割列;</p></li>
+<li><p><strong>slice_point (list)</strong> – 
沿着轴分割的位置;n-1个分割点对应n个子tensor;</p></li>
+<li><p><strong>input_sample_shape</strong> – 输入æ 
·æœ¬tensor的形状</p></li>
 </ul>
 <div class="section" id="id8">
 <h4>get_output_sample_shape()<a class="headerlink" href="#id8" 
title="Permalink to this headline">¶</a></h4>
@@ -637,8 +637,8 @@ TODO(wangwei) 元素级别ç
 <p>沿给定轴分割输入tensor。</p>
 <p><strong>参数:</strong></p>
 <ul class="simple">
-<li><strong>flag</strong> – 同Layer::forward()</li>
-<li><strong>x</strong> – 单个输入tensor</li>
+<li><p><strong>flag</strong> – 同Layer::forward()</p></li>
+<li><p><strong>x</strong> – 单个输入tensor</p></li>
 </ul>
 <p><strong>返回值:</strong> 输出tensor列表</p>
 </div>
@@ -647,9 +647,9 @@ TODO(wangwei) 元素级别ç
 <p>拼接所有梯度tensor以生成一个输出tensor。</p>
 <p><strong>参数:</strong></p>
 <ul class="simple">
-<li><strong>flag</strong> – 同Layer::backward()</li>
-<li><strong>grads</strong> – 
tensor列表,每个对应一个分割的梯度tensor
-<strong>返回值:</strong> 元组(dx, []), 
dx是一个tensor,对应原始输入的梯度;[]是空列表</li>
+<li><p><strong>flag</strong> – 同Layer::backward()</p></li>
+<li><p><strong>grads</strong> – 
tensor列表,每个对应一个分割的梯度tensor
+<strong>返回值:</strong> 元组(dx, []), 
dx是一个tensor,对应原始输入的梯度;[]是空列表</p></li>
 </ul>
 </div>
 </div>
@@ -660,29 +660,29 @@ TODO(wangwei) 元素级别ç
 <p>递归层包含4个单元,即lstm, gru, tanh和relu。</p>
 <p><strong>参数:</strong></p>
 <ul class="simple">
-<li><strong>hidden_size</strong> – 隐含层特征大小,同所有层的å 
†æ ˆã€‚</li>
-<li><strong>rnn_mode</strong> – 决定了RNN单元,可以是‘lstm’, 
‘gru’, ‘tanh’和 
‘relu’。对于每种模式,可以参考cudnn手册。</li>
-<li><strong>num_stacks</strong> – rnn层的堆æ 
ˆæ•°é‡ã€‚这不同于需要展开的序列长度。</li>
-<li><strong>input_mode</strong> – ‘linear’,通过线性变换将输å…
¥ç‰¹å¾x转换成大小为hidden_size的特征向量;’skip’,仅
要求输入特征大小等于hidden_size。</li>
-<li><strong>bidirection</strong> – 对于双向RNN为真。</li>
-<li><strong>param_specs</strong> – RNN参数的初始化配置。</li>
-<li><strong>input_sample_shape</strong> – 包含一个整型数,代表输å…
¥æ ·æœ¬çš„特征大小。</li>
+<li><p><strong>hidden_size</strong> – 
隐含层特征大小,同所有层的堆栈。</p></li>
+<li><p><strong>rnn_mode</strong> – 决定了RNN单元,可以是‘lstm’, 
‘gru’, ‘tanh’和 
‘relu’。对于每种模式,可以参考cudnn手册。</p></li>
+<li><p><strong>num_stacks</strong> – rnn层的堆æ 
ˆæ•°é‡ã€‚这不同于需要展开的序列长度。</p></li>
+<li><p><strong>input_mode</strong> – 
‘linear’,通过线性变换将输å…
¥ç‰¹å¾x转换成大小为hidden_size的特征向量;’skip’,仅
要求输入特征大小等于hidden_size。</p></li>
+<li><p><strong>bidirection</strong> – 对于双向RNN为真。</p></li>
+<li><p><strong>param_specs</strong> – RNN参数的初始化配置。</p></li>
+<li><p><strong>input_sample_shape</strong> – 包
含一个整型数,代表输入样本的特征大小。</p></li>
 </ul>
 <div class="section" id="id10">
 <h4>forward(flag, inputs)<a class="headerlink" href="#id10" title="Permalink 
to this headline">¶</a></h4>
 <p><strong>参数:</strong></p>
 <ul class="simple">
-<li><strong>flag</strong> – True(kTrain) 
代表训练;False(kEval)代表验证; 其他值用作以后使用。</li>
-<li><strong>&lt;x1, x2,..xn, hx, cx&gt;</strong> – 其中,xi是输å…
¥(inputs,)第i个位置的tensor,它的形状是 (batch_size, 
input_feature_length); xi的batch_size必须大于xi + 1的大小; 
hx是初始隐藏状态,形状是(num_stacks * 
bidirection?2:1,batch_size,hidden_size)。 
cx是与hy相同形状的初始细胞状态张量。 cx仅对lstm有效。 
对于其他RNN,不存在cx。 
hx和cx都可以是没有形状和数据的虚拟张量。
-返回值:&lt;y1,y2,… yn,hy,cy&gt;,å…
¶ä¸­yi是第i个位置的输出张量,其形状是(batch_size,hidden_size 
*双向?2:1)。 hy是最终的隐藏状态张量。 
cx是最终的细胞状态张量。 cx仅用于lstm。</li>
+<li><p><strong>flag</strong> – True(kTrain) 
代表训练;False(kEval)代表验证; 其他值用作以后使用。</p></li>
+<li><p><strong>&lt;x1, x2,..xn, hx, cx&gt;</strong> – 其中,xi是输å…
¥(inputs,)第i个位置的tensor,它的形状是 (batch_size, 
input_feature_length); xi的batch_size必须大于xi + 1的大小; 
hx是初始隐藏状态,形状是(num_stacks * 
bidirection?2:1,batch_size,hidden_size)。 
cx是与hy相同形状的初始细胞状态张量。 cx仅对lstm有效。 
对于其他RNN,不存在cx。 
hx和cx都可以是没有形状和数据的虚拟张量。
+返回值:&lt;y1,y2,… yn,hy,cy&gt;,å…
¶ä¸­yi是第i个位置的输出张量,其形状是(batch_size,hidden_size 
*双向?2:1)。 hy是最终的隐藏状态张量。 
cx是最终的细胞状态张量。 cx仅用于lstm。</p></li>
 </ul>
 </div>
 <div class="section" id="id11">
 <h4>backward(flag, grad)<a class="headerlink" href="#id11" title="Permalink to 
this headline">¶</a></h4>
 <p><strong>参数:</strong></p>
 <ul class="simple">
-<li><strong>flag</strong> – 未来使用</li>
-<li><strong>&lt;dy1, dy2,..dyn, dhy, dcy&gt;</strong> - 其中,dyi是(grad,) 
第i个位置的梯度,它的形状是 (batch_size, hidden_size*bidirection?2 
(i-th) – 1); dhy是最终隐藏状态的渐变,它的形状是(num_stacks 
*双向?2:1,batch_size,hidden_size)。dcy是最终单å…
ƒçŠ¶æ€çš„æ¢¯åº¦ã€‚ cx仅对lstm有效,其他RNN不存在cx。 
dhy和dcy都可以是没有形状和数据的虚拟tensor。</li>
+<li><p><strong>flag</strong> – 未来使用</p></li>
+<li><p><strong>&lt;dy1, dy2,..dyn, dhy, dcy&gt;</strong> - å…
¶ä¸­ï¼Œdyi是(grad,) 第i个位置的梯度,它的形状是 (batch_size, 
hidden_size*bidirection?2 (i-th) – 1); 
dhy是最终隐藏状态的渐变,它的形状是(num_stacks 
*双向?2:1,batch_size,hidden_size)。dcy是最终单å…
ƒçŠ¶æ€çš„æ¢¯åº¦ã€‚ cx仅对lstm有效,其他RNN不存在cx。 
dhy和dcy都可以是没有形状和数据的虚拟tensor。</p></li>
 </ul>
 <p><strong>返回值:</strong> &lt;dx1,dx2,… dxn,dhx,dcx&gt;,å…
¶ä¸­dxi是第i个输入的梯度张
量,它的形状是(batch_size,input_feature_length)。 
dhx是初始隐藏状态的梯度。 dcx是初始单元状态的梯度,仅
对lstm有效。</p>
 </div>
@@ -753,50 +753,46 @@ TODO(wangwei) 元素级别ç
   
     
   
+
+<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://www.apache.org"; style="color:lightblue;padding: 5px; 
font-size: 10px; text-align: center; text-decoration: none; margin: 5px 
2px;">Foundation</a>
-   <a href="http://www.apache.org/events/current-event"; 
style="color:lightblue;padding: 5px; font-size: 10px; text-align: center; 
text-decoration: none; margin: 5px 2px;">Events</a>
-   <a href="http://www.apache.org/foundation/thanks.html"; 
style="color:lightblue;padding: 5px; font-size: 10px; text-align: center; 
text-decoration: none; margin: 5px 2px;">Thanks</a>
-   <a href="http://www.apache.org/foundation/sponsorship.html"; 
style="color:lightblue;padding: 5px; font-size: 10px;  text-align: center; 
text-decoration: none; margin: 5px 2px;">Sponsorship</a>
-   <a href="http://www.apache.org/licenses/"; style="color:lightblue;padding: 
5px; font-size: 10px;  text-align: center; text-decoration: none; margin: 5px 
2px;">License</a>
-   <br>
-   <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/loss.html
URL: 
http://svn.apache.org/viewvc/incubator/singa/site/trunk/zh/docs/loss.html?rev=1858059&r1=1858058&r2=1858059&view=diff
==============================================================================
--- incubator/singa/site/trunk/zh/docs/loss.html (original)
+++ incubator/singa/site/trunk/zh/docs/loss.html Wed Apr 24 14:57:35 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>损失(Loss) &mdash; incubator-singa 2.0.0 documentation</title>
+  <title>损失(Loss) &mdash; incubator-singa 1.1.0 documentation</title>
   
 
   
@@ -38,18 +38,18 @@
     <link rel="search" title="Search" href="../search.html" />
     <link rel="next" title="度量(Metric)" href="metric.html" />
     <link rel="prev" title="初始化器(Initializer)" href="initializer.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">
@@ -243,9 +243,9 @@
 <h3>evaluate(flag, x, y)<a class="headerlink" href="#evaluate-flag-x-y" 
title="Permalink to this headline">¶</a></h3>
 <p><strong>参数:</strong></p>
 <ul class="simple">
-<li><strong>flag (int)</strong> – 必须是kEval</li>
-<li><strong>x (Tensor)</strong> – 预测Tensor</li>
-<li><strong>y (Tensor)</strong> – 真实Tensor</li>
+<li><p><strong>flag (int)</strong> – 必须是kEval</p></li>
+<li><p><strong>x (Tensor)</strong> – 预测Tensor</p></li>
+<li><p><strong>y (Tensor)</strong> – 真实Tensor</p></li>
 </ul>
 <p><strong>返回值:</strong> 所有样本的平均损失</p>
 </div>
@@ -255,9 +255,9 @@
 <p>计算损失值</p>
 <p><strong>参数:</strong></p>
 <ul class="simple">
-<li><strong>flag</strong> – 
kTrain/kEval或布尔值。如果是kTrain/True,那么在下一次调用forward前会å
…ˆè°ƒç”¨backward计算梯度。</li>
-<li><strong>x (Tensor)</strong> – 预测Tensor</li>
-<li><strong>y (Tensor)</strong> – 真实Tensor, x.shape[0]必
须和y.shape[0]相同</li>
+<li><p><strong>flag</strong> – 
kTrain/kEval或布尔值。如果是kTrain/True,那么在下一次调用forward前会å
…ˆè°ƒç”¨backward计算梯度。</p></li>
+<li><p><strong>x (Tensor)</strong> – 预测Tensor</p></li>
+<li><p><strong>y (Tensor)</strong> – 真实Tensor, x.shape[0]必
须和y.shape[0]相同</p></li>
 </ul>
 <p><strong>返回值:</strong> tensor,每个æ 
·æœ¬å¯¹åº”一个浮点型损失值</p>
 </div>
@@ -291,9 +291,9 @@
 <p>通过0.5 * ||x-y||^2计算损失。</p>
 <p><strong>参数:</strong></p>
 <ul class="simple">
-<li><strong>flag (int)</strong> – 
kTrain或kEval;如果是kTrain,那么在下一次调用forward前会å…
ˆè°ƒç”¨backward计算梯度。</li>
-<li><strong>x (Tensor)</strong> – 预测Tensor</li>
-<li><strong>y (Tensor)</strong> – 真实Tensor, 每个æ 
·æœ¬å¯¹åº”一个整型数, 取值为[0, x.shape[1])。</li>
+<li><p><strong>flag (int)</strong> – 
kTrain或kEval;如果是kTrain,那么在下一次调用forward前会å…
ˆè°ƒç”¨backward计算梯度。</p></li>
+<li><p><strong>x (Tensor)</strong> – 预测Tensor</p></li>
+<li><p><strong>y (Tensor)</strong> – 真实Tensor, 每个æ 
·æœ¬å¯¹åº”一个整型数, 取值为[0, x.shape[1])。</p></li>
 </ul>
 <p><strong>返回值:</strong> tensor,每个样本对应一个损失值</p>
 <hr class="docutils" />
@@ -348,50 +348,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://www.apache.org"; style="color:lightblue;padding: 5px; 
font-size: 10px; text-align: center; text-decoration: none; margin: 5px 
2px;">Foundation</a>
-   <a href="http://www.apache.org/events/current-event"; 
style="color:lightblue;padding: 5px; font-size: 10px; text-align: center; 
text-decoration: none; margin: 5px 2px;">Events</a>
-   <a href="http://www.apache.org/foundation/thanks.html"; 
style="color:lightblue;padding: 5px; font-size: 10px; text-align: center; 
text-decoration: none; margin: 5px 2px;">Thanks</a>
-   <a href="http://www.apache.org/foundation/sponsorship.html"; 
style="color:lightblue;padding: 5px; font-size: 10px;  text-align: center; 
text-decoration: none; margin: 5px 2px;">Sponsorship</a>
-   <a href="http://www.apache.org/licenses/"; style="color:lightblue;padding: 
5px; font-size: 10px;  text-align: center; text-decoration: none; margin: 5px 
2px;">License</a>
-   <br>
-   <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


Reply via email to