Merge branch 'master' into LazyInstallPaddleWheels

PaddlePaddle · Sep 9, 2016 · 62da4ad · 62da4ad
2 parents b76682c + 3376736
commit 62da4ad
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 56 deletions.
diff --git a/doc_cn/algorithm/rnn/rnn.rst b/doc_cn/algorithm/rnn/rnn.rst
diff --git a/doc_cn/cluster/index.rst b/doc_cn/cluster/index.rst
diff --git a/doc_cn/demo/embedding_model/index.md b/doc_cn/demo/embedding_model/index.md
diff --git a/doc_cn/demo/image_classification/index.rst b/doc_cn/demo/image_classification/index.rst
diff --git a/doc_cn/demo/imagenet_model/index.md b/doc_cn/demo/imagenet_model/index.md
diff --git a/doc_cn/demo/semantic_role_labeling/index.md b/doc_cn/demo/semantic_role_labeling/index.md
diff --git a/doc_cn/demo/sentiment_analysis/index.md b/doc_cn/demo/sentiment_analysis/index.md
diff --git a/doc_cn/demo/text_generation/index.rst b/doc_cn/demo/text_generation/index.rst
diff --git a/doc_cn/dev/new_layer/index.rst b/doc_cn/dev/new_layer/index.rst
diff --git a/doc_cn/index.md b/doc_cn/index.md
diff --git a/doc_cn/index.rst b/doc_cn/index.rst
@@ -0,0 +1,19 @@
+PaddlePaddle文档
+================
+
+使用指南
+--------
+* `快速入门 <demo/quick_start/index.html>`_
+* `编译与安装 <build_and_install/index.html>`_
+* `用户接口 <ui/index.html>`_
+* `使用示例 <demo/index.html>`_
+* `模型配置 <../doc/ui/api/trainer_config_helpers/index.html>`_
+* `集群训练 <../doc/cluster/index.html>`_
+
+开发指南
+--------
+* `新写Layer <../doc/dev/new_layer/index.html>`_
+
+算法教程
+--------
+* `RNN配置 <../doc/algorithm/rnn/rnn.html>`_
diff --git a/doc_cn/ui/model.rst b/doc_cn/ui/model.rst
diff --git a/paddle/cuda/include/hl_device_functions.cuh b/paddle/cuda/include/hl_device_functions.cuh
@@ -16,8 +16,6 @@ limitations under the License. */
 #ifndef HL_DEVICE_FUNCTIONS_CUH_
 #define HL_DEVICE_FUNCTIONS_CUH_
 
-#if defined(__CUDA_ARCH__) && __CUDA_ARCH__ < 600
-
 namespace hppl {
 
 static __inline__ __device__ double atomicAdd(double* address, double val) {
@@ -42,6 +40,4 @@ static __inline__ __device__ double atomicAdd(double* address, double val) {
 using hppl::atomicAdd;
 #endif
 
-#endif
-
 #endif /* HL_DEVICE_FUNCTIONS_CUH_ */