Skip to content

Commit 34b4c7d

Browse files
wanghaoshuangwanghaoshuang
committed
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into seq_error
2 parents 9ce8bcd + 9030a65 commit 34b4c7d

File tree

759 files changed

+3636
-2257
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

759 files changed

+3636
-2257
lines changed

‎.gitignore

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
paddle/operators/check_t.save
2+
paddle/operators/check_tensor.ls
3+
paddle/operators/tensor.save
4+
python/paddle/v2/fluid/tests/book/image_classification_resnet.inference.model/
5+
python/paddle/v2/fluid/tests/book/image_classification_vgg.inference.model/
6+
python/paddle/v2/fluid/tests/book/label_semantic_roles.inference.model/
17
*.DS_Store
28
build/
39
build_doc/
@@ -27,5 +33,5 @@ CMakeFiles
2733
cmake_install.cmake
2834
paddle/.timestamp
2935
python/paddlepaddle.egg-info/
30-
paddle/pybind/pybind.h
36+
paddle/fluid/pybind/pybind.h
3137
python/paddle/version.py

‎AUTHORS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
|---|---|
33
| backyes | Yan-Fei Wang |
44
| beckett1124 | Bin Qi |
5-
| Canpio | Jia-Yi Feng |
5+
| JiayiFeng | Jia-Yi Feng |
66
| chengxiaohua1105 | Xiao-Hua Cheng |
77
| cxwangyi, yiwangbaidu, wangkuiyi | Yi Wang |
88
| cxysteven | Xing-Yi Cheng |

‎CONTRIBUTING.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Contribute Code
22

3+
You are welcome to contribute to project PaddlePaddle. To contribute to PaddlePaddle, you have to agree with the
4+
[PaddlePaddle Contributor License Agreement](https://gist.github.com/wangkuiyi/0c22c7b1bd3bb7eb27d76f85c3a3e329).
5+
36
We sincerely appreciate your contribution. This document explains our workflow and work style.
47

58
## Workflow

‎cmake/cuda.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,8 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
181181
elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
182182
list(APPEND CUDA_NVCC_FLAGS ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
183183
elseif(CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
184-
list(APPEND CUDA_NVCC_FLAGS ${CMAKE_CXX_FLAGS_MINSIZEREL})
184+
# nvcc 9 does not support -Os. Use Release flags instead
185+
list(APPEND CUDA_NVCC_FLAGS ${CMAKE_CXX_FLAGS_RELEASE})
185186
endif()
186187

187188
mark_as_advanced(CUDA_BUILD_CUBIN CUDA_BUILD_EMULATION CUDA_VERBOSE_BUILD)

‎cmake/generic.cmake

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,20 +179,24 @@ function(cc_library TARGET_NAME)
179179
set(oneValueArgs "")
180180
set(multiValueArgs SRCS DEPS)
181181
cmake_parse_arguments(cc_library "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
182-
if (cc_library_SRCS)
183-
if (cc_library_SHARED OR cc_library_shared) # build *.so
182+
if(cc_library_SRCS)
183+
if(cc_library_SHARED OR cc_library_shared) # build *.so
184184
add_library(${TARGET_NAME} SHARED ${cc_library_SRCS})
185185
else()
186186
add_library(${TARGET_NAME} STATIC ${cc_library_SRCS})
187187
endif()
188-
if (cc_library_DEPS)
188+
if(cc_library_DEPS)
189189
# Don't need link libwarpctc.so
190-
if ("${cc_library_DEPS};" MATCHES "warpctc;")
190+
if("${cc_library_DEPS};" MATCHES "warpctc;")
191191
list(REMOVE_ITEM cc_library_DEPS warpctc)
192192
add_dependencies(${TARGET_NAME} warpctc)
193193
endif()
194+
# Support linking flags: --whole-archive (Linux) / -force_load (MacOS)
195+
target_circle_link_libraries(${TARGET_NAME} ${cc_library_DEPS})
196+
if("${cc_library_DEPS}" MATCHES "ARCHIVE_START")
197+
list(REMOVE_ITEM cc_library_DEPS ARCHIVE_START ARCHIVE_END)
198+
endif()
194199
add_dependencies(${TARGET_NAME} ${cc_library_DEPS})
195-
target_link_libraries(${TARGET_NAME} ${cc_library_DEPS})
196200
endif()
197201

198202
# cpplint code style

‎doc/api/v2/fluid/layers.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,12 @@ batch_norm
323323
.. autofunction:: paddle.v2.fluid.layers.batch_norm
324324
:noindex:
325325

326+
layer_norm
327+
----------
328+
329+
.. autofunction:: paddle.v2.fluid.layers.layer_norm
330+
:noindex:
331+
326332
beam_search_decode
327333
------------------
328334

‎doc/index_cn.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,4 @@ PaddlePaddle 文档
88
build_and_install/index_cn.rst
99
howto/index_cn.rst
1010
dev/index_cn.rst
11-
api/index_cn.rst
1211
faq/index_cn.rst

‎doc/index_en.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@ PaddlePaddle Documentation
88
build_and_install/index_en.rst
99
howto/index_en.rst
1010
dev/index_en.rst
11-
api/index_en.rst

‎paddle/CMakeLists.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,7 @@ else()
1919
endif()
2020

2121
if(NOT ANDROID AND NOT IOS)
22-
add_subdirectory(memory)
23-
add_subdirectory(platform)
24-
add_subdirectory(framework)
25-
add_subdirectory(operators)
26-
add_subdirectory(pybind)
27-
add_subdirectory(inference)
22+
add_subdirectory(fluid)
2823
endif()
2924

3025
if(WITH_SWIG_PY)

‎paddle/fluid/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
add_subdirectory(memory)
2+
add_subdirectory(platform)
3+
add_subdirectory(framework)
4+
add_subdirectory(operators)
5+
add_subdirectory(pybind)
6+
add_subdirectory(inference)

0 commit comments

Comments
 (0)