Merge branch 'release/0.15.0' of https://github.com/PaddlePaddle/Paddle…

… into top_k_api
PaddlePaddle · Sep 5, 2018 · a5f0376 · a5f0376
2 parents 1829c3a + 3206b17
commit a5f0376
Show file tree

Hide file tree

Showing 144 changed files with 4,658 additions and 2,213 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -204,6 +204,10 @@ include(external/snappy)    # download snappy
 include(external/snappystream)
 include(external/threadpool)
 
+include(cudnn)              # set cudnn libraries, must before configure
+include(cupti)
+include(configure)          # add paddle env configuration
+
 if(WITH_GPU)
     include(cuda)
     include(tensorrt)
@@ -212,9 +216,6 @@ elseif()
     set(WITH_ANAKIN OFF CACHE STRING "Anakin is used in GPU only now." FORCE)
 endif()
 
-include(cudnn)              # set cudnn libraries, must before configure
-include(cupti)
-include(configure)          # add paddle env configuration
 include(generic)            # simplify cmake module
 include(package)            # set paddle packages
 include(ccache)             # set ccache for compilation

diff --git a/cmake/configure.cmake b/cmake/configure.cmake
@@ -110,10 +110,11 @@ if(WITH_GPU)
             message(WARNING "Anakin needs CUDNN >= 7.0 to compile. Force WITH_ANAKIN=OFF")
             set(WITH_ANAKIN OFF CACHE STRING "Anakin is valid only when CUDNN >= 7.0." FORCE)
         endif()
-    endif()
-    if(WITH_ANAKIN)
-        set(ENV{CUDNN_INCLUDE_DIR} ${CUDNN_INCLUDE_DIR})
-        set(ENV{CUDNN_LIBRARY} ${CUDNN_LIBRARY})
+        set(ENV{CUDNN_INCLUDE_DIR} "${CUDNN_INCLUDE_DIR}/")
+        get_filename_component(CUDNN_LIBRARY_DIR ${CUDNN_LIBRARY} DIRECTORY)
+        set(ENV{CUDNN_LIBRARY} ${CUDNN_LIBRARY_DIR})
+        message(STATUS "cudnn include header is ${CUDNN_INCLUDE_DIR}/cudnn.h")
+        message(STATUS "cudnn library is ${CUDNN_LIBRARY_DIR}")
     endif()
 elseif(WITH_AMD_GPU)
     add_definitions(-DPADDLE_WITH_HIP)

diff --git a/cmake/external/anakin.cmake b/cmake/external/anakin.cmake
@@ -19,17 +19,17 @@ execute_process(COMMAND bash -c "cd ${ANAKIN_SOURCE_DIR}; wget -q --no-check-cer
 include_directories(${ANAKIN_INCLUDE})
 include_directories(${ANAKIN_INCLUDE}/saber/)
 
-set(ANAKIN_COMPILE_EXTRA_FLAGS 
+set(ANAKIN_COMPILE_EXTRA_FLAGS
     -Wno-error=unused-but-set-variable -Wno-unused-but-set-variable
-    -Wno-error=unused-variable -Wno-unused-variable 
+    -Wno-error=unused-variable -Wno-unused-variable
     -Wno-error=format-extra-args -Wno-format-extra-args
-    -Wno-error=comment -Wno-comment 
-    -Wno-error=format -Wno-format 
+    -Wno-error=comment -Wno-comment
+    -Wno-error=format -Wno-format
     -Wno-error=switch -Wno-switch
-    -Wno-error=return-type -Wno-return-type 
+    -Wno-error=return-type -Wno-return-type
     -Wno-error=non-virtual-dtor -Wno-non-virtual-dtor
     -Wno-sign-compare
-    -Wno-reorder 
+    -Wno-reorder
     -Wno-error=cpp)
 
 ExternalProject_Add(
@@ -47,6 +47,7 @@ ExternalProject_Add(
                         -DPROTOBUF_ROOT=${THIRD_PARTY_PATH}/install/protobuf
                         -DMKLML_ROOT=${THIRD_PARTY_PATH}/install/mklml
                         -DCUDNN_ROOT=${CUDNN_ROOT}
+                        -DCUDNN_INCLUDE_DIR=${CUDNN_INCLUDE_DIR}
                         ${EXTERNAL_OPTIONAL_ARGS}
     CMAKE_CACHE_ARGS    -DCMAKE_INSTALL_PREFIX:PATH=${ANAKIN_INSTALL_DIR}
 )

diff --git a/cmake/external/grpc.cmake b/cmake/external/grpc.cmake
@@ -44,7 +44,7 @@ ExternalProject_Add(
     # 3. keep only zlib, cares, protobuf, boringssl under "third_party",
     #    checkout and clean other dirs under third_party
     # 4. remove .git, and package the directory.
-    URL "http://paddlepaddledeps.bj.bcebos.com/grpc-v1.10.x.tar.gz"
+    URL "http://paddlepaddledeps.cdn.bcebos.com/grpc-v1.10.x.tar.gz"
     URL_MD5  "1f268a2aff6759839dccd256adcc91cf"
     PREFIX          ${GRPC_SOURCES_DIR}
     UPDATE_COMMAND  ""

diff --git a/doc/fluid/new_docs/advanced_usage/deploy/index_anakin.rst b/doc/fluid/new_docs/advanced_usage/deploy/index_anakin.rst
@@ -1,5 +1,5 @@
-服务器端部署 - Anakin
-#####################
+Anakin - 服务器端加速引擎
+#######################
 
 
 使用文档

diff --git a/doc/fluid/new_docs/advanced_usage/deploy/index_native.rst b/doc/fluid/new_docs/advanced_usage/deploy/index_native.rst
diff --git a/doc/fluid/new_docs/advanced_usage/index.rst b/doc/fluid/new_docs/advanced_usage/index.rst
@@ -10,7 +10,6 @@
 ..  toctree::
     :maxdepth: 2
 
-    deploy/index_native.rst
     deploy/index_anakin.rst
     deploy/index_mobile.rst
     development/contribute_to_paddle.md

diff --git a/...uide/basics/image_classification/index.md → .../basics/image_classification/README.cn.md b/...uide/basics/image_classification/index.md → .../basics/image_classification/README.cn.md
diff --git a/doc/fluid/new_docs/beginners_guide/basics/image_classification/image/dog.png b/doc/fluid/new_docs/beginners_guide/basics/image_classification/image/dog.png
diff --git a/doc/fluid/new_docs/beginners_guide/basics/image_classification/image/dog_cat.png b/doc/fluid/new_docs/beginners_guide/basics/image_classification/image/dog_cat.png
diff --git a/doc/fluid/new_docs/beginners_guide/basics/image_classification/image/fea_conv0.png b/doc/fluid/new_docs/beginners_guide/basics/image_classification/image/fea_conv0.png
diff --git a/doc/fluid/new_docs/beginners_guide/basics/image_classification/image/flowers.png b/doc/fluid/new_docs/beginners_guide/basics/image_classification/image/flowers.png
diff --git a/...fluid/new_docs/beginners_guide/basics/image_classification/image/googlenet.jpeg b/...fluid/new_docs/beginners_guide/basics/image_classification/image/googlenet.jpeg
diff --git a/doc/fluid/new_docs/beginners_guide/basics/image_classification/image/ilsvrc.png b/doc/fluid/new_docs/beginners_guide/basics/image_classification/image/ilsvrc.png
diff --git a/doc/fluid/new_docs/beginners_guide/basics/image_classification/image/inception.png b/doc/fluid/new_docs/beginners_guide/basics/image_classification/image/inception.png
diff --git a/doc/fluid/new_docs/beginners_guide/basics/image_classification/image/lenet.png b/doc/fluid/new_docs/beginners_guide/basics/image_classification/image/lenet.png
diff --git a/doc/fluid/new_docs/beginners_guide/basics/image_classification/image/plot.png b/doc/fluid/new_docs/beginners_guide/basics/image_classification/image/plot.png
diff --git a/doc/fluid/new_docs/beginners_guide/basics/image_classification/image/resnet.png b/doc/fluid/new_docs/beginners_guide/basics/image_classification/image/resnet.png
diff --git a/...uid/new_docs/beginners_guide/basics/image_classification/image/resnet_block.jpg b/...uid/new_docs/beginners_guide/basics/image_classification/image/resnet_block.jpg
diff --git a/...d/new_docs/beginners_guide/basics/image_classification/image/train_and_test.png b/...d/new_docs/beginners_guide/basics/image_classification/image/train_and_test.png
diff --git a/doc/fluid/new_docs/beginners_guide/basics/image_classification/image/vgg16.png b/doc/fluid/new_docs/beginners_guide/basics/image_classification/image/vgg16.png
diff --git a/doc/fluid/new_docs/beginners_guide/basics/index.rst b/doc/fluid/new_docs/beginners_guide/basics/index.rst
@@ -10,9 +10,9 @@
 ..  toctree::
     :maxdepth: 2
 
-    image_classification/index.md
-    word2vec/index.md
-    recommender_system/index.md
-    understand_sentiment/index.md
-    label_semantic_roles/index.md
-    machine_translation/index.md
+    image_classification/README.cn.md
+    word2vec/README.cn.md
+    recommender_system/README.cn.md
+    understand_sentiment/README.cn.md
+    label_semantic_roles/README.cn.md
+    machine_translation/README.cn.md
diff --git a/...uide/basics/label_semantic_roles/index.md → .../basics/label_semantic_roles/README.cn.md b/...uide/basics/label_semantic_roles/index.md → .../basics/label_semantic_roles/README.cn.md
diff --git a/...eginners_guide/basics/label_semantic_roles/image/bidirectional_stacked_lstm.png b/...eginners_guide/basics/label_semantic_roles/image/bidirectional_stacked_lstm.png
diff --git a/...nners_guide/basics/label_semantic_roles/image/bidirectional_stacked_lstm_en.png b/...nners_guide/basics/label_semantic_roles/image/bidirectional_stacked_lstm_en.png
diff --git a/...luid/new_docs/beginners_guide/basics/label_semantic_roles/image/bio_example.png b/...luid/new_docs/beginners_guide/basics/label_semantic_roles/image/bio_example.png
diff --git a/...d/new_docs/beginners_guide/basics/label_semantic_roles/image/bio_example_en.png b/...d/new_docs/beginners_guide/basics/label_semantic_roles/image/bio_example_en.png
diff --git a/.../new_docs/beginners_guide/basics/label_semantic_roles/image/db_lstm_network.png b/.../new_docs/beginners_guide/basics/label_semantic_roles/image/db_lstm_network.png
diff --git a/...w_docs/beginners_guide/basics/label_semantic_roles/image/db_lstm_network_en.png b/...w_docs/beginners_guide/basics/label_semantic_roles/image/db_lstm_network_en.png
diff --git a/...w_docs/beginners_guide/basics/label_semantic_roles/image/dependency_parsing.png b/...w_docs/beginners_guide/basics/label_semantic_roles/image/dependency_parsing.png
diff --git a/...ocs/beginners_guide/basics/label_semantic_roles/image/dependency_parsing_en.png b/...ocs/beginners_guide/basics/label_semantic_roles/image/dependency_parsing_en.png
diff --git a/...new_docs/beginners_guide/basics/label_semantic_roles/image/linear_chain_crf.png b/...new_docs/beginners_guide/basics/label_semantic_roles/image/linear_chain_crf.png
diff --git a/...uid/new_docs/beginners_guide/basics/label_semantic_roles/image/stacked_lstm.png b/...uid/new_docs/beginners_guide/basics/label_semantic_roles/image/stacked_lstm.png
diff --git a/.../new_docs/beginners_guide/basics/label_semantic_roles/image/stacked_lstm_en.png b/.../new_docs/beginners_guide/basics/label_semantic_roles/image/stacked_lstm_en.png