Skip to content

Commit

Permalink
Merge pull request PaddlePaddle#73 from reyoung/merge_icode
Browse files Browse the repository at this point in the history
Merge Baidu Internal Changes.
  • Loading branch information
emailweixu authored Sep 14, 2016
2 parents 487dc67 + c7762da commit 9300678
Show file tree
Hide file tree
Showing 26 changed files with 487 additions and 138 deletions.
1 change: 1 addition & 0 deletions doc/build/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Install PaddlePaddle
:glob:

install_*
internal/install_from_jumbo.md

Build from Source
-----------------
Expand Down
1 change: 1 addition & 0 deletions doc/cluster/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ Cluster Train
:glob:

opensource/cluster_train.md
internal/index.md
4 changes: 4 additions & 0 deletions doc_cn/build_and_install/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ Note: The intallation packages are still in pre-release state and your experienc

.. toctree::
:maxdepth: 1
:glob:

源码下载(对内) <../build/internal/download_paddle_source_zh_cn.rst>
使用Jumbo安装(对内) <../build/internal/install_from_jumbo.rst>
从源码编译安装(对内) <../build/internal/build_from_source_zh_cn.rst>
install/docker_install.rst
install/ubuntu_install.rst
cmake/index.rst
11 changes: 11 additions & 0 deletions doc_cn/cluster/index.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
集群训练
========

* `集群训练 <../../doc/cluster/index.html>`_

.. toctree::
:maxdepth: 2
:glob:

集群训练(对内) <internal/index.md>

2 changes: 1 addition & 1 deletion doc_cn/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ PaddlePaddle文档
* `用户接口 <ui/index.html>`_
* `使用示例 <demo/index.html>`_
* `模型配置 <../doc/ui/api/trainer_config_helpers/index.html>`_
* `集群训练 <../doc/cluster/index.html>`_
* `集群训练 <cluster/index.html>`_

开发指南
--------
Expand Down
4 changes: 2 additions & 2 deletions paddle/gserver/evaluators/CTCErrorEvaluator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,8 @@ class CTCErrorEvaluator : public Evaluator {
virtual real evalImp(std::vector<Argument>& arguments) {
CHECK_EQ(arguments.size(), (size_t)2);
Argument output, label;
output.resizeAndCopyFrom(arguments[0], false);
label.resizeAndCopyFrom(arguments[1], false);
output.resizeAndCopyFrom(arguments[0], false, HPPL_STREAM_DEFAULT);
label.resizeAndCopyFrom(arguments[1], false, HPPL_STREAM_DEFAULT);
hl_stream_synchronize(HPPL_STREAM_DEFAULT);
CHECK(label.sequenceStartPositions);
CHECK(label.ids);
Expand Down
Loading

0 comments on commit 9300678

Please sign in to comment.