Deploy to GitHub Pages: b68f2d20

develop/doc/api/v2/config/layer.html

@@ -866,14 +866,17 @@ y_i &\gets \gamma \hat{x_i} + \beta \qquad &//\ scale\ and\ shift\end{sp
 <li><strong>name</strong> (<em>basestring</em>) &#8211; The name of this layer. It is optional.</li>
 <li><strong>input</strong> (<em>paddle.v2.config_base.Layer</em>) &#8211; batch normalization input. Better be linear activation.
 Because there is an activation inside batch_normalization.</li>
-<li><strong>batch_norm_type</strong> (<em>None | string</em><em>, </em><em>None</em><em> or </em><em>&quot;batch_norm&quot;</em><em> or </em><em>&quot;cudnn_batch_norm&quot;</em>) &#8211; We have batch_norm and cudnn_batch_norm. batch_norm
-supports both CPU and GPU. cudnn_batch_norm requires
-cuDNN version greater or equal to v4 (&gt;=v4). But
-cudnn_batch_norm is faster and needs less memory
-than batch_norm. By default (None), we will
-automaticly select cudnn_batch_norm for GPU and
-batch_norm for CPU. Otherwise, select batch norm
-type based on the specified type. If you use cudnn_batch_norm,
+<li><strong>batch_norm_type</strong> (<em>None | string</em><em>, </em><em>None</em><em> or </em><em>&quot;batch_norm&quot;</em><em> or </em><em>&quot;cudnn_batch_norm&quot;</em><em>
+or </em><em>&quot;mkldnn_batch_norm&quot;</em>) &#8211; We have batch_norm, mkldnn_batch_norm and cudnn_batch_norm.
+batch_norm supports CPU, MKLDNN and GPU. cudnn_batch_norm
+requires cuDNN version greater or equal to v4 (&gt;=v4).
+But cudnn_batch_norm is faster and needs less
+memory than batch_norm. mkldnn_batch_norm requires
+enable use_mkldnn. By default (None), we will
+automaticly select cudnn_batch_norm for GPU,
+mkldnn_batch_norm for MKLDNN and batch_norm for CPU.
+Otherwise, select batch norm type based on the
+specified type. If you use cudnn_batch_norm,
 we suggested you use latest version, such as v5.1.</li>
 <li><strong>act</strong> (<em>paddle.v2.activation.Base</em>) &#8211; Activation Type. Better be relu. Because batch
 normalization will normalize input near zero.</li>

develop/doc_cn/api/v2/config/layer.html

@@ -880,14 +880,17 @@ y_i &\gets \gamma \hat{x_i} + \beta \qquad &//\ scale\ and\ shift\end{sp
 <li><strong>name</strong> (<em>basestring</em>) &#8211; The name of this layer. It is optional.</li>
 <li><strong>input</strong> (<em>paddle.v2.config_base.Layer</em>) &#8211; batch normalization input. Better be linear activation.
 Because there is an activation inside batch_normalization.</li>
-<li><strong>batch_norm_type</strong> (<em>None | string</em><em>, </em><em>None</em><em> or </em><em>&quot;batch_norm&quot;</em><em> or </em><em>&quot;cudnn_batch_norm&quot;</em>) &#8211; We have batch_norm and cudnn_batch_norm. batch_norm
-supports both CPU and GPU. cudnn_batch_norm requires
-cuDNN version greater or equal to v4 (&gt;=v4). But
-cudnn_batch_norm is faster and needs less memory
-than batch_norm. By default (None), we will
-automaticly select cudnn_batch_norm for GPU and
-batch_norm for CPU. Otherwise, select batch norm
-type based on the specified type. If you use cudnn_batch_norm,
+<li><strong>batch_norm_type</strong> (<em>None | string</em><em>, </em><em>None</em><em> or </em><em>&quot;batch_norm&quot;</em><em> or </em><em>&quot;cudnn_batch_norm&quot;</em><em>
+or </em><em>&quot;mkldnn_batch_norm&quot;</em>) &#8211; We have batch_norm, mkldnn_batch_norm and cudnn_batch_norm.
+batch_norm supports CPU, MKLDNN and GPU. cudnn_batch_norm
+requires cuDNN version greater or equal to v4 (&gt;=v4).
+But cudnn_batch_norm is faster and needs less
+memory than batch_norm. mkldnn_batch_norm requires
+enable use_mkldnn. By default (None), we will
+automaticly select cudnn_batch_norm for GPU,
+mkldnn_batch_norm for MKLDNN and batch_norm for CPU.
+Otherwise, select batch norm type based on the
+specified type. If you use cudnn_batch_norm,
 we suggested you use latest version, such as v5.1.</li>
 <li><strong>act</strong> (<em>paddle.v2.activation.Base</em>) &#8211; Activation Type. Better be relu. Because batch
 normalization will normalize input near zero.</li>