-testing during training | test_all_data_in_one_period |
+testing during training | test_period |
√ | √ | | |
diff --git a/doc/howto/cmd_parameter/detail_introduction.md b/doc/howto/cmd_parameter/detail_introduction.md
index 07608e5edf740bd3e1242913f1d2d7589ad313aa..510396b629e398cef2ccda2f1cec474160693219 100644
--- a/doc/howto/cmd_parameter/detail_introduction.md
+++ b/doc/howto/cmd_parameter/detail_introduction.md
@@ -31,7 +31,7 @@
- type: string (default: null).
* `--version`
- - Whether to print version infomatrion.
+ - Whether to print version information.
- type: bool (default: 0).
* `--show_layer_stat`
@@ -110,8 +110,8 @@
- type: int32 (default: -1).
* `--test_period`
- - Run testing every test_period train batches. If not set, run testing each pass.
- - type: int32 (default: 1000).
+ - if equal 0, do test on all test data at the end of each pass. While if equal non-zero, do test on all test data every test_period batches.
+ - type: int32 (default: 0).
* `--test_wait`
- Whether to wait for parameter per pass if not exist. If set test_data_path in submitting environment of cluster, it will launch one process to perfom testing, so we need to set test_wait=1. Note that in the cluster submitting environment, this argument has been set True by default.
@@ -121,10 +121,6 @@
- File that saves the model list when testing. It was set automatically when using cluster submitting environment after setting model_path.
- type: string (default: "", null).
-* `--test_all_data_in_one_period`
- - This argument is usually used in testing period during traning. If true, all data will be tested in one test period. Otherwise (batch_size * log_peroid) data will be tested.
- - type: bool (default: 0).
-
* `--predict_output_dir`
- Directory that saves the layer output. It is configured in Outputs() in network config. Default, this argument is null, meaning save nothing. Specify this directory if you want to save feature map of some layers in testing mode. Note that, layer outputs are values after activation function.
- type: string (default: "", null).
diff --git a/doc/howto/cmd_parameter/use_case.md b/doc/howto/cmd_parameter/use_case.md
index a6bfba29af4f73055338c3a671bcafaa1456c7cf..4d7bb33f36fe258ee24796eedc9296065923e58f 100644
--- a/doc/howto/cmd_parameter/use_case.md
+++ b/doc/howto/cmd_parameter/use_case.md
@@ -10,9 +10,8 @@ paddle train \
--config=network_config \
--save_dir=output \
--trainer_count=COUNT \ #(default:1)
- --test_period=M \ #(default:1000)
- --test_all_data_in_one_period=true \ #(default:false)
- --num_passes=N \ #(defalut:100)
+ --test_period=M \ #(default:0)
+ --num_passes=N \ #(defalut:100)
--log_period=K \ #(default:100)
--dot_period=1000 \ #(default:1)
#[--show_parameter_stats_period=100] \ #(default:0)
diff --git a/doc_cn/build/docker/build_docker_image.rst b/doc_cn/build/docker/build_docker_image.rst
deleted file mode 100644
index 73409ceaff4e1a1f8ac3ad0d828e003a214c8fcb..0000000000000000000000000000000000000000
--- a/doc_cn/build/docker/build_docker_image.rst
+++ /dev/null
@@ -1,38 +0,0 @@
-构建PaddlePaddle Docker Image
-===========================
-
-PaddlePaddle的Docker Image构建源码放置在 :code:`${源码根目录}/paddle/scripts/docker/`目录下。
-该Image基于ubuntu 14.04。该目录下有两个文件,Dockerfile和build.sh。其中:
-
-* Dockerfile是docker image的主要描述文件。描述了Docker image的构建步骤、各种参数和维护
- 人员等等。
-* build.sh是docker image的主要构建步骤。
-
-该image的构建在docker 1.12版本测试通过, 低于docker 1.12版本的情况下并没有测试。主要由于旧版本
-的docker可能缺乏 :code:`--build-arg` 参数,从而不能在运行编译命令的时候接受参数。
-
-同时,该构建脚本充分考虑了网络不稳定的情况,对于cuda的Toolkit有断点续传和传输速度过小重启下载的
-简单优化。
-
-使用脚本构建PaddlePaddle Docker Image
--------------------------------------------
-
-该脚本的使用方法是,进入该源码目录,执行 :code:`docker build .` 命令。可以使用
- :code:`--build-arg` 传入的配置参数包括:
-
-* LOWEST\_DL\_SPEED\: 多线程下载过程中,最低线程的下载速度(默认单位是Bytes,可以传入10K,
- 10M,或者10G这样的单位)。如果小于这个下载速度,那么这个下载线程将会关闭。所有的下载线程关闭时,
- 下载进程会重启。
-* WITH\_GPU\: ON or OFF。是否开启GPU功能。注意,编译PaddlePaddle的GPU版本并不需要一定在具有GPU
- 的机器上进行。但是,运行PaddlePaddle的GPU版本一定要在具有CUDA的机器上运行。
-
-简单的使用样例为\:
-
-.. code-block:: bash
-
- cd ${源码根目录}/paddle/scripts/docker/
- docker build --build-arg LOWEST_DL_SPEED=50K\
- --build-arg WITH_GPU=ON \
- --tag paddle_gpu:latest .
-
-即可在本地编译出PaddlePaddle的镜像。
diff --git a/doc_cn/build_and_install/index.rst b/doc_cn/build_and_install/index.rst
index 2205e282248c4e7f6d1173be47aadf160554c6be..48163fb36e561fe5fd8f6907379687a8b5c97f68 100644
--- a/doc_cn/build_and_install/index.rst
+++ b/doc_cn/build_and_install/index.rst
@@ -8,9 +8,7 @@ PaddlePaddle提供数个预编译的二进制来进行安装,包括Docker镜
.. toctree::
:maxdepth: 1
- :glob:
- 使用Jumbo安装(对内) <../build/internal/install_from_jumbo.rst>
install/docker_install.rst
install/ubuntu_install.rst
@@ -25,8 +23,5 @@ PaddlePaddle提供数个预编译的二进制来进行安装,包括Docker镜
.. toctree::
:maxdepth: 1
- :glob:
- 源码下载(对内) <../build/internal/download_paddle_source_zh_cn.rst>
- 从源码编译安装(对内) <../build/internal/build_from_source_zh_cn.rst>
cmake/index.rst
diff --git a/doc_cn/build_and_install/install/docker_install.rst b/doc_cn/build_and_install/install/docker_install.rst
index 90a5c937094164985a4f23ac8ce1de2577042afb..40339659be406ec72da8ad89b6d5dd38d72bb5ae 100644
--- a/doc_cn/build_and_install/install/docker_install.rst
+++ b/doc_cn/build_and_install/install/docker_install.rst
@@ -60,38 +60,21 @@ mac osx或者是windows机器,请参考
`mac osx的安装文档