Skip to content

Commit 0d33fb3

Browse files
huangxu96huangxu96
committed
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into reduce_sum_op_fp16
2 parents 36024ca + 67c2700 commit 0d33fb3

File tree

575 files changed

+18578
-6271
lines changed

Some content is hidden

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

575 files changed

+18578
-6271
lines changed

‎AUTHORS.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
| Github account | name |
22
|---|---|
33
| abhinavarora | Abhinav Arora |
4+
| andreazanetti | Andrea Zanetti |
5+
| arlesniak | Artur Lesniak |
6+
| arogowie-intel | Adam Osewski |
47
| backyes | Yan-Fei Wang |
58
| baiyfbupt | Yi-Fan Bai |
69
| beckett1124 | Bin Qi |
710
| ChengduoZH | Cheng-Duo Zhao|
811
| chengxiaohua1105 | Xiao-Hua Cheng |
912
| cxwangyi, yiwangbaidu, wangkuiyi | Yi Wang |
1013
| cxysteven | Xing-Yi Cheng |
14+
| ddokupil | Dariusz Dokupil |
1115
| dzhwinter | Zhi-Hong Dong |
1216
| dragonwarrior | Long Wang |
1317
| dyning | Yuning Du |
@@ -21,6 +25,7 @@
2125
| hedaoyuan | Dao-Yuan He |
2226
| helinwang | He-Lin Wang |
2327
| jacquesqiao | Long-Fei Qiao |
28+
| jakpiase | Jakub Piasecki |
2429
| [jczaja](https://raw.githubusercontent.com/jczaja/Paddle/paddle-poland-team/doc/images/paddle_poland_team.jpg) | Jacek Czaja |
2530
| JiayiFeng | Jia-Yi Feng |
2631
| kbinias | Krzysztof Binias |
@@ -42,6 +47,7 @@
4247
| pakchoi | Chuan-Jiang Song |
4348
| panyx0718 | Xin Pan |
4449
| pengli09 | Peng Li |
50+
| pmajchrzak |Piotr Majchrzak |
4551
| pkuyym | Ya-Ming Yang |
4652
| pzelazko-intel | Pawel Zelazko |
4753
| [pawelpiotrowicz](https://raw.githubusercontent.com/jczaja/Paddle/paddle-poland-team/doc/images/paddle_poland_team.jpg) | Pawel Piotrowicz |

‎README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
2-
<p align="center">
1+
<p align="center">
32
<img align="center" src="doc/imgs/logo.png", width=1600>
43
<p>
54

@@ -87,7 +86,7 @@ We provide [English](https://www.paddlepaddle.org.cn/documentation/docs/en/guide
8786
## Communication
8887

8988
- [Github Issues](https://github.com/PaddlePaddle/Paddle/issues): bug reports, feature requests, install issues, usage issues, etc.
90-
- QQ discussion group: 778260830 (PaddlePaddle).
89+
- QQ discussion group: 793866180 (PaddlePaddle).
9190
- [Forums](https://ai.baidu.com/forum/topic/list/168?pageNo=1): discuss implementations, research, etc.
9291

9392
## Copyright and License

‎README_cn.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ PaddlePaddle用户可领取**免费Tesla V100在线算力资源**，训练模型
8383
## 交流与反馈
8484

8585
- 欢迎您通过[Github Issues](https://github.com/PaddlePaddle/Paddle/issues)来提交问题、报告与建议
86-
- QQ群: 778260830 (PaddlePaddle)
86+
- QQ群: 793866180 (PaddlePaddle)
8787
- [论坛](https://ai.baidu.com/forum/topic/list/168): 欢迎大家在PaddlePaddle论坛分享在使用PaddlePaddle中遇到的问题和经验, 营造良好的论坛氛围
8888

8989
## 版权和许可证

‎cmake/external/eigen.cmake‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ elseif(LINUX)
3333
# which will cause compiler error of using __host__ funciont in __host__ __device__
3434
file(TO_NATIVE_PATH ${PADDLE_SOURCE_DIR}/patches/eigen/Meta.h native_src)
3535
file(TO_NATIVE_PATH ${EIGEN_SOURCE_DIR}/Eigen/src/Core/util/Meta.h native_dst)
36-
set(EIGEN_PATCH_COMMAND cp ${native_src} ${native_dst})
36+
file(TO_NATIVE_PATH ${PADDLE_SOURCE_DIR}/patches/eigen/TensorReductionGpu.h native_src1)
37+
file(TO_NATIVE_PATH ${EIGEN_SOURCE_DIR}/unsupported/Eigen/CXX11/src/Tensor/TensorReductionGpu.h native_dst1)
38+
set(EIGEN_PATCH_COMMAND cp ${native_src} ${native_dst} && cp ${native_src1} ${native_dst1})
3739
endif()
3840
endif()
3941

‎cmake/external/warpctc.cmake‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,21 @@ if(WITH_ASCEND OR WITH_ASCEND_CL)
7878
-DCMAKE_INSTALL_PREFIX:PATH=${WARPCTC_INSTALL_DIR}
7979
)
8080
else()
81+
if(WIN32)
82+
set(WARPCTC_C_FLAGS $<FILTER:${CMAKE_C_FLAGS},EXCLUDE,/Zc:inline>)
83+
set(WARPCTC_C_FLAGS_DEBUG $<FILTER:${CMAKE_C_FLAGS_DEBUG},EXCLUDE,/Zc:inline>)
84+
set(WARPCTC_C_FLAGS_RELEASE $<FILTER:${CMAKE_C_FLAGS_RELEASE},EXCLUDE,/Zc:inline>)
85+
set(WARPCTC_CXX_FLAGS $<FILTER:${CMAKE_CXX_FLAGS},EXCLUDE,/Zc:inline>)
86+
set(WARPCTC_CXX_FLAGS_RELEASE $<FILTER:${CMAKE_CXX_FLAGS_RELEASE},EXCLUDE,/Zc:inline>)
87+
set(WARPCTC_CXX_FLAGS_DEBUG $<FILTER:${CMAKE_CXX_FLAGS_DEBUG},EXCLUDE,/Zc:inline>)
88+
else()
89+
set(WARPCTC_C_FLAGS ${CMAKE_C_FLAGS})
90+
set(WARPCTC_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
91+
set(WARPCTC_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
92+
set(WARPCTC_CXX_FLAGS ${CMAKE_CXX_FLAGS})
93+
set(WARPCTC_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
94+
set(WARPCTC_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
95+
endif()
8196
ExternalProject_Add(
8297
extern_warpctc
8398
${EXTERNAL_PROJECT_LOG_ARGS}
@@ -90,12 +105,12 @@ else()
90105
BUILD_ALWAYS 1
91106
CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
92107
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
93-
-DCMAKE_C_FLAGS=$<FILTER:${CMAKE_C_FLAGS},EXCLUDE,/Zc:inline>
94-
-DCMAKE_C_FLAGS_DEBUG=$<FILTER:${CMAKE_C_FLAGS_DEBUG},EXCLUDE,/Zc:inline>
95-
-DCMAKE_C_FLAGS_RELEASE=$<FILTER:${CMAKE_C_FLAGS_RELEASE},EXCLUDE,/Zc:inline>
96-
-DCMAKE_CXX_FLAGS=$<FILTER:${CMAKE_CXX_FLAGS},EXCLUDE,/Zc:inline>
97-
-DCMAKE_CXX_FLAGS_RELEASE=$<FILTER:${CMAKE_CXX_FLAGS_RELEASE},EXCLUDE,/Zc:inline>
98-
-DCMAKE_CXX_FLAGS_DEBUG=$<FILTER:${CMAKE_CXX_FLAGS_DEBUG},EXCLUDE,/Zc:inline>
108+
-DCMAKE_C_FLAGS=${WARPCTC_C_FLAGS}
109+
-DCMAKE_C_FLAGS_DEBUG=${WARPCTC_C_FLAGS_DEBUG}
110+
-DCMAKE_C_FLAGS_RELEASE=${WARPCTC_C_FLAGS_RELEASE}
111+
-DCMAKE_CXX_FLAGS=${WARPCTC_CXX_FLAGS}
112+
-DCMAKE_CXX_FLAGS_RELEASE=${WARPCTC_CXX_FLAGS_RELEASE}
113+
-DCMAKE_CXX_FLAGS_DEBUG=${WARPCTC_CXX_FLAGS_DEBUG}
99114
-DCMAKE_INSTALL_PREFIX=${WARPCTC_INSTALL_DIR}
100115
-DWITH_GPU=${WITH_GPU}
101116
-DWITH_ROCM=${WITH_ROCM}

‎cmake/external/xpu.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if(NOT XPU_SDK_ROOT)
1313
elseif(WITH_SUNWAY)
1414
SET(XPU_URL "https://baidu-kunlun-public.su.bcebos.com/paddle_depence/sunway/xpu_2021_01_13.tar.gz" CACHE STRING "" FORCE)
1515
else()
16-
SET(XPU_URL "https://baidu-kunlun-public.su.bcebos.com/paddle_depence/xpu_2021_04_09.tar.gz" CACHE STRING "" FORCE)
16+
SET(XPU_URL "https://baidu-kunlun-public.su.bcebos.com/paddle_depence/xpu_2021_04_09_2.tar.gz" CACHE STRING "" FORCE)
1717
endif()
1818

1919
SET(XPU_SOURCE_DIR "${THIRD_PARTY_PATH}/xpu")

‎cmake/init.cmake‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,16 @@ if(NOT WIN32)
1818
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG")
1919
set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG")
2020
else()
21+
set(CMAKE_C_FLAGS_DEBUG "/Zi /DEBUG")
22+
set(CMAKE_C_FLAGS_RELEASE "/O2 /DNDEBUG")
23+
set(CMAKE_C_FLAGS_RELWITHDEBINFO "/O2 /DNDEBUG")
24+
set(CMAKE_C_FLAGS_MINSIZEREL "/Os /DNDEBUG")
25+
26+
set(CMAKE_CXX_FLAGS_DEBUG "/Zi /DEBUG")
27+
set(CMAKE_CXX_FLAGS_RELEASE "/O2 /DNDEBUG")
28+
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/O2 /DNDEBUG")
29+
set(CMAKE_CXX_FLAGS_MINSIZEREL "/Os /DNDEBUG")
30+
2131
# It can specify CUDA compile flag manualy,
2232
# its use is to remvoe /Zi to reduce GPU static library size. But it's dangerous
2333
# because CUDA will update by nvidia, then error will occur.

‎cmake/operators.cmake‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ function(op_library TARGET)
4444
if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${TARGET}.cu)
4545
list(APPEND cu_srcs ${TARGET}.cu)
4646
endif()
47+
if (WITH_NV_JETSON)
48+
list(REMOVE_ITEM cu_srcs "decode_jpeg_op.cu")
49+
endif()
4750
if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${TARGET}.part.cu)
4851
set(PART_CUDA_KERNEL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${TARGET}.part.cu
4952
${PART_CUDA_KERNEL_FILES} PARENT_SCOPE)
@@ -180,8 +183,8 @@ function(op_library TARGET)
180183
list(REMOVE_ITEM miopen_cu_cc_srcs "affine_grid_cudnn_op.cu.cc")
181184
list(REMOVE_ITEM miopen_cu_cc_srcs "grid_sampler_cudnn_op.cu.cc")
182185
list(REMOVE_ITEM hip_srcs "cholesky_op.cu")
183-
list(REMOVE_ITEM hip_srcs "correlation_op.cu")
184186
list(REMOVE_ITEM hip_srcs "multinomial_op.cu")
187+
list(REMOVE_ITEM hip_srcs "decode_jpeg_op.cu")
185188
hip_library(${TARGET} SRCS ${cc_srcs} ${hip_cc_srcs} ${miopen_cu_cc_srcs} ${miopen_cu_srcs} ${mkldnn_cc_srcs} ${hip_srcs} DEPS ${op_library_DEPS}
186189
${op_common_deps})
187190
else()

‎cmake/third_party.cmake‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,14 @@ if(WITH_PSLIB)
261261
if(WITH_PSLIB_BRPC)
262262
include(external/pslib_brpc) # download, build, install pslib_brpc
263263
list(APPEND third_party_deps extern_pslib_brpc)
264+
else()
265+
include(external/snappy)
266+
list(APPEND third_party_deps extern_snappy)
267+
268+
include(external/leveldb)
269+
list(APPEND third_party_deps extern_leveldb)
270+
include(external/brpc)
271+
list(APPEND third_party_deps extern_brpc)
264272
endif()
265273
endif(WITH_PSLIB)
266274

‎paddle/fluid/distributed/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
1111
"${DISTRIBUTE_COMPILE_FLAGS} -faligned-new")
1212
endif()
1313

14-
add_subdirectory(table)
1514
add_subdirectory(service)
15+
add_subdirectory(table)
1616
add_subdirectory(test)
1717
add_subdirectory(index_dataset)
1818

0 commit comments

Comments
 (0)