From 0b37c2f67a2ddb31cae40060502a44ac5af9fffc Mon Sep 17 00:00:00 2001 From: Luo Tao Date: Thu, 15 Dec 2016 16:02:09 +0800 Subject: [PATCH] fix conflict --- doc/howto/{ => dev}/contribute_to_paddle_cn.md | 0 doc/howto/index_cn.rst | 3 +++ doc/howto/index_en.rst | 2 +- doc/howto/optimization/gpu_profiling_cn.rst | 7 +++++-- doc/howto/optimization/gpu_profiling_en.rst | 7 +++++-- doc/howto/optimization/index_en.rst | 7 ------- 6 files changed, 14 insertions(+), 12 deletions(-) rename doc/howto/{ => dev}/contribute_to_paddle_cn.md (100%) delete mode 100644 doc/howto/optimization/index_en.rst diff --git a/doc/howto/contribute_to_paddle_cn.md b/doc/howto/dev/contribute_to_paddle_cn.md similarity index 100% rename from doc/howto/contribute_to_paddle_cn.md rename to doc/howto/dev/contribute_to_paddle_cn.md diff --git a/doc/howto/index_cn.rst b/doc/howto/index_cn.rst index 618f0c6e72..e03138723e 100644 --- a/doc/howto/index_cn.rst +++ b/doc/howto/index_cn.rst @@ -18,6 +18,7 @@ :maxdepth: 1 dev/write_docs_cn.rst + dev/contribute_to_paddle_cn.md 模型配置 -------- @@ -32,3 +33,5 @@ .. toctree:: :maxdepth: 1 + + optimization/gpu_profiling_cn.rst diff --git a/doc/howto/index_en.rst b/doc/howto/index_en.rst index 1000d956a7..983dc743eb 100644 --- a/doc/howto/index_en.rst +++ b/doc/howto/index_en.rst @@ -33,4 +33,4 @@ Optimization .. toctree:: :maxdepth: 1 - optimization/index_en.rst + optimization/gpu_profiling_en.rst diff --git a/doc/howto/optimization/gpu_profiling_cn.rst b/doc/howto/optimization/gpu_profiling_cn.rst index d3def92c4b..e2b0b0396e 100644 --- a/doc/howto/optimization/gpu_profiling_cn.rst +++ b/doc/howto/optimization/gpu_profiling_cn.rst @@ -1,5 +1,8 @@ -PaddlePaddle 性能分析与调优 -===================================== +================== +GPU性能分析与调优 +================== + +.. contents:: 此教程将向您分步介绍如何使用内置的定时工具、 **nvprof** 或 **nvvp** 来运行性能分析和调优。 diff --git a/doc/howto/optimization/gpu_profiling_en.rst b/doc/howto/optimization/gpu_profiling_en.rst index a54db6a3c2..ed208ceaf7 100644 --- a/doc/howto/optimization/gpu_profiling_en.rst +++ b/doc/howto/optimization/gpu_profiling_en.rst @@ -1,5 +1,8 @@ -Profiling on PaddlePaddle -========================= +==================== +Tune GPU Performance +==================== + +.. contents:: This tutorial will guide you step-by-step through how to conduct profiling and performance tuning using built-in timer, **nvprof** and **nvvp**. diff --git a/doc/howto/optimization/index_en.rst b/doc/howto/optimization/index_en.rst deleted file mode 100644 index 84804fc9af..0000000000 --- a/doc/howto/optimization/index_en.rst +++ /dev/null @@ -1,7 +0,0 @@ -Tune GPU Performance -==================== - -.. toctree:: - :maxdepth: 3 - - gpu_profiling_en.rst -- GitLab