Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update #18

Merged
merged 132 commits into from
Jul 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
132 commits
Select commit Hold shift + click to select a range
5db0c84
transform complex scale to tensor (#33699)
MingMingShangTian Jun 22, 2021
dd4297c
Gpu samplecode test On PR-CPU-Py2 (#33634)
wadefelix Jun 22, 2021
8a5bbae
Fix the save path problem of UT test_pass_builder. (#33717)
wzzju Jun 22, 2021
687571f
fix gpt2 train loss Nan problem (#33658)
zhiboniu Jun 22, 2021
e5a6bb1
adaptive for py3 for ps util;test=develop (#33727)
danleifeng Jun 22, 2021
1cfbcb1
fix exit bug for heterps;test=develop (#33724)
danleifeng Jun 22, 2021
ad10629
[API/OP]Add a new API paddle.diagonal (#33586)
zhangbo9674 Jun 22, 2021
246da75
- Updated of oneDNN to 2.3 + bugfixes (#33702)
jczaja Jun 22, 2021
0722297
modify mkldnn default capacity (#33729)
jiweibo Jun 23, 2021
aa1aac9
fix bug about deallocating None (#33723)
wanghuancoder Jun 23, 2021
5f198a6
add op_compat for the seqpool_cvm_concat_fuse_pass, test=develop (#33…
Shixiaowei02 Jun 23, 2021
1017180
Support Mod in elementwise system (#33052)
JamesLim-sy Jun 23, 2021
d55f3b6
add compat precondition for attention_lstm_fuse_pass, test=develop (#…
winter-wang Jun 23, 2021
f9420e8
add compat precondition for delete_quant_dequant_filter_op_pass, test…
winter-wang Jun 23, 2021
affddfa
Add new operation: BroadcastTensorsOp (#33294)
jim19930609 Jun 23, 2021
9bf00cd
repair npu matmul_grad and comm_init_hccl (#33719)
Baibaifan Jun 23, 2021
899792c
pass enhance (#33710)
Wangzheee Jun 23, 2021
f166a71
update api and api docs tpm reviewers list (#33736)
jzhang533 Jun 23, 2021
9b58cbf
elastic unitest (#33728)
kuizhiqing Jun 23, 2021
2133b45
add aclcheck to c_comm_init (#33739)
Baibaifan Jun 23, 2021
5d2eb67
optimize attr default value (#33357)
wanghuancoder Jun 23, 2021
6810650
Added split op bf16/fp32 oneDNN kernel (#33584)
jakpiase Jun 23, 2021
dfbfbd0
enhance Conv elementwise add2 act fuse pass (#33564)
Jun 23, 2021
ba7e2a9
remove the tricks for `paddle.fluid.layers.ops.func` (#33731)
wadefelix Jun 24, 2021
af9dcb2
supplet several interface of static Variable to consistent with dygra…
CtfGo Jun 24, 2021
57352bc
fix a quantization bug (#33753)
XGZhang11 Jun 24, 2021
b6e9498
[Paddle-TRT] Remove TensorRT deprecated API (#33654)
zlsh80826 Jun 24, 2021
6801b6e
Modify the search order of dynamic library (#33722)
zhwesky2010 Jun 24, 2021
56692f6
fix bug when the cuda kernel config exceeds dims max (#33748)
zhiqiu Jun 24, 2021
49638f2
fix undef var (#33691)
Jiangxinz Jun 24, 2021
68c1fe8
fix undef var (#33692)
Jiangxinz Jun 24, 2021
1def9e0
TestSaveLoadLargeParameters use cpu place. (#33756)
hbwx24 Jun 24, 2021
ae79a56
[Paddle-TRT] TensorRT8 void** compatibility (#33662)
zlsh80826 Jun 24, 2021
c779780
[Dy2Stat]Support Python3 type hint (#33745)
Aurelius84 Jun 24, 2021
049dd85
[oneDNN] Fix to #33282 , added support of X input broadcasting to one…
jczaja Jun 24, 2021
6aea6be
[NPU] support dygraph execution on npu place(#33579)
houj04 Jun 24, 2021
db7b3d1
update_dataset_flowers (#33738)
zzjjay Jun 24, 2021
3946afc
fix unittest can't get cuda error message correctly (#33743)
zhwesky2010 Jun 24, 2021
98d2531
change TensorCopy to ShareDataWith in matmul_grad op (#33755)
pangyoki Jun 24, 2021
2c4cc68
add compat precondition for repeated_fc_relu_fuse_pass,test=develop. …
winter-wang Jun 25, 2021
eb52912
fix the attributes error in transpose.pbtxt,test=develop. (#33770)
winter-wang Jun 25, 2021
58e465a
replace six lib in container file (#33775)
MingMingShangTian Jun 25, 2021
91a0acd
static support mp_layers (#33700)
wangxicoding Jun 25, 2021
3ad6630
Fix wrong scale length for QkvToContext (#33763)
b3602sss Jun 25, 2021
bd68761
[ pass_enhance ]quant_conv2d_dequant_fuse_pass (#33737)
Wangzheee Jun 25, 2021
f99e77c
[Docker] only save Python3.7 in released docker (#32688)
pangyoki Jun 25, 2021
77a880c
fix random probability (#33751)
btobab Jun 25, 2021
249b55c
add pass enhance for map_matmul_to_mul_pass and flatten2_matmul_fuse_…
MissPenguin Jun 25, 2021
7f9b8f0
Update README.md
Jun 27, 2021
0f59d4e
add compat precondition for multihead_matmul_fuse_pass_v2,v3, test=de…
winter-wang Jun 28, 2021
d91352c
[Paddle-TRT]Fix flatten converter when batch_size > 1 (#33768)
cryoco Jun 28, 2021
5e74409
kNCHW is deprecated, should use kLINEAR (#33777)
zlsh80826 Jun 28, 2021
b538c6d
update callback doc, test=document_fix (#33802)
LiuChiachi Jun 28, 2021
6024488
[ROCM] fix RNN miopen as weight need to permuted, test=develop (#33733)
qili93 Jun 28, 2021
921b041
PyNumber_Long only for numpy, test=develop (#33778)
wanghuancoder Jun 28, 2021
87eb929
add gradient accumulate for dygraph
lyuwenyu Jun 17, 2021
ae2b218
update
lyuwenyu Jun 17, 2021
2e93362
update docs
lyuwenyu Jun 17, 2021
c96fe02
add test
lyuwenyu Jun 17, 2021
f9f21a5
update in static mode
lyuwenyu Jun 17, 2021
77eae14
update
lyuwenyu Jun 17, 2021
a8fec66
fix doc, last iter, and test for amp
lyuwenyu Jun 22, 2021
01474d3
update docs
lyuwenyu Jun 22, 2021
9a73283
update docs
lyuwenyu Jun 22, 2021
0f31ed7
add grad unittest
lyuwenyu Jun 22, 2021
1542c60
test=document_fix (#33799)
lelelelelez Jun 28, 2021
9500798
Block 'pyc' File (#33810)
Jiangxinz Jun 28, 2021
621d8a7
mode_c_embeding_bugs (#33801)
Baibaifan Jun 28, 2021
83284c8
fix undef var (#33780)
Jiangxinz Jun 28, 2021
55aea35
add fusepass Reshape2MatmulFusePass AdaptivePool2dConvertGlobalPass …
LDOUBLEV Jun 28, 2021
646eb4f
fix undef var (#33696)
Jiangxinz Jun 29, 2021
43c38c6
support Ninja, establish dependencies relationship between paddle wit…
zhwesky2010 Jun 29, 2021
0d3de8d
[NPU] remove duplicated stream sync in fetch op (#33819)
zhiqiu Jun 29, 2021
4d4fb66
xpu support amp (#33809)
taixiurong Jun 29, 2021
5c514f5
polish avx/no_avx install (#33818)
zhwesky2010 Jun 29, 2021
66c7a07
Remove HeterBox (#33718)
Thunderbrook Jun 29, 2021
f56290a
print_signatures: set callable checkrule along
zhiboniu Jun 29, 2021
07eeb36
Add Returns for BeamSearchDecoder doc (#33721)
FrostML Jun 29, 2021
2e97faf
[ pass_enhance ]transpose_flatten_concat_fuse_pass (#33744)
Wangzheee Jun 29, 2021
ff2a7b3
fix undef var (#33825)
Jiangxinz Jun 29, 2021
0bccd78
Update paddle_build.sh for remove op grad when compile c++ inference …
OliverLPH Jun 29, 2021
e15009e
add compat precondition for reshape_transpose_matmul_mkldnn_fuse_pass…
winter-wang Jun 29, 2021
54eed46
add retry in pull sparse (#33812)
Thunderbrook Jun 29, 2021
f62fce0
del py2 code3 (#33714)
tianshuo78520a Jun 29, 2021
8c4c072
Scale matmul fuse pass (#33803)
Jun 29, 2021
3446691
squeeze2_matmul_fuse_pass init (#33805)
Jun 29, 2021
a863cf7
unsqueeze2_eltwise_fuse_pass_init (#33808)
Jun 29, 2021
1835b72
fix cpu/gpu check approve (#33806)
tianshuo78520a Jun 30, 2021
8225a6a
[NPU] support set_device (#33815)
houj04 Jun 30, 2021
9347df8
fix prelu, softmax if shape containes 0 (#33849)
zhupengyang Jun 30, 2021
97f86d8
[Dy2Stat] Refine PartialProgramLayer logic (#33796)
Aurelius84 Jun 30, 2021
1db3658
[pass_enhance] mul_gru_fuse_pass; fc_gru_fuse_pass (#33793)
Wangzheee Jun 30, 2021
7e96457
[pass_enhance] fc_lstm_fuse_pass; mul_lstm_fuse_pass (#33811)
Wangzheee Jun 30, 2021
560617c
[Dy2stat]Specify gast version in requirements.txt (#33850)
Aurelius84 Jun 30, 2021
defae0e
ConvAffineChannelFusePass and ConvEltwiseAddAffineChannelFusePass, te…
b3602sss Jun 30, 2021
24783c8
Added matmul_v2 BF16/FP32 FWD kernel (#33750)
jakpiase Jun 30, 2021
79e75bc
remove the initialization of saved_mean and saved_variance for batch_…
limin2021 Jun 30, 2021
cc5d4b1
Conv relu mkldnn fuse pass (#33664)
Jul 1, 2021
54af52b
Shuffle channel detect pass (#33814)
Jul 1, 2021
8568734
[AMP] add get() and set() for Grad_scaler (#33835)
zhangbo9674 Jul 1, 2021
e75b692
fix the opt path create error in windows, test=develop (#33853)
winter-wang Jul 1, 2021
cfe3b40
remove unsafty judgement (#33868)
b3602sss Jul 1, 2021
a0a9079
add compat precondition for conv3d_bias_mkldnn_fuse_pass, test=develo…
winter-wang Jul 1, 2021
521dd7e
Add error message when parameter is set to 0 (#33859)
FrostML Jul 1, 2021
3e82a79
fix bug DLTP-31078 (#33877)
taixiurong Jul 1, 2021
f33f244
Dygraph/sharding (#33633)
JZ-LIANG Jul 1, 2021
07fadc4
fix failed_test_lists none (#33884)
tianshuo78520a Jul 1, 2021
3fc56aa
roll optimize (#32880)
SunNy820828449 Jul 1, 2021
57aabba
gradient scale (#33862)
FeixLiu Jul 1, 2021
c522530
fix safe bug of scatter/scatter_nd (#33858)
ForFishes Jul 1, 2021
5c9fce0
add p2p (#33864)
ForFishes Jul 1, 2021
7c4e515
optimize for elastic (#33895)
kuizhiqing Jul 1, 2021
33edb62
pass_enhance_conv_concat_relu_mkldnn (#33867)
Wangzheee Jul 1, 2021
4c35203
update xpu cmake (#33906)
tangzhiyi11 Jul 2, 2021
9b48199
modified reduce_all_op reduce_any_op for higher performance (#33267)
AnnaTrainingG Jul 2, 2021
cf4c6fb
fix shared param grad_add op_device is null (#33875)
wangxicoding Jul 2, 2021
9314743
update readme test=document_fix
TCChenlong Jul 1, 2021
93b53f8
[pass_enhance] depthwise_conv_bn_fuse_pas (#33896)
Wangzheee Jul 2, 2021
d5bdfaf
fix decoding error when clip grad op. (#33919)
jiweibo Jul 2, 2021
4032c2e
Refine QuantizeTranspilerV2 to support distributed training (#33781)
juncaipeng Jul 2, 2021
fcdbc8d
Polish Windows CI, fix CI random fail (#33863)
zhwesky2010 Jul 2, 2021
b9e4aaa
fix trace offset out of shape (#33922)
jeff41404 Jul 2, 2021
edf75e2
Update README.md (#33881)
PaddlePM Jul 2, 2021
61fccf6
Update README_cn.md (#33882)
PaddlePM Jul 2, 2021
15451c6
update of oneDNN to 2.3 final (#33923)
jczaja Jul 2, 2021
a74e01a
Enhance npu/xpu log when kernel fallback to cpu, and fix cmake warnin…
houj04 Jul 2, 2021
4243194
fix bug of p2p (#33929)
ForFishes Jul 2, 2021
17a81df
fix fleet amp get_loss_scaling (#33935)
wangxicoding Jul 2, 2021
e805271
fix the op_def_api.cc include header file error, test=develop (#33921)
winter-wang Jul 2, 2021
4d16724
[NPU] delete useless GELU in gelu grad npu op (#33872)
pangyoki Jul 4, 2021
ea1a0d4
Replace usage of elementwise cuda forward kernel in Compare_all_op (#…
JamesLim-sy Jul 5, 2021
00c85a7
[Dygraph QAT] Save all scales to target ops and Move quant layers to …
juncaipeng Jul 5, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
15 changes: 10 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ PaddlePaddle is originated from industrial practices with dedication and commitm

## Installation

### Latest PaddlePaddle Release: [v2.0](https://github.com/PaddlePaddle/Paddle/tree/release/2.0)
### Latest PaddlePaddle Release: [v2.1](https://github.com/PaddlePaddle/Paddle/tree/release/2.1)

Our vision is to enable deep learning for everyone via PaddlePaddle.
Please refer to our [release announcement](https://github.com/PaddlePaddle/Paddle/releases) to track the latest features of PaddlePaddle.
Expand All @@ -33,9 +33,9 @@ pip install paddlepaddle
pip install paddlepaddle-gpu

```
More infomation about installation, please view [Quick Install](https://www.paddlepaddle.org.cn/install/quick)
For more information about installation, please view [Quick Install](https://www.paddlepaddle.org.cn/install/quick)

Now our developers can acquire Tesla V100 online computing resources for free. If you create a program by AI Studio, you will obtain 10 hours to train models online per day. [Click here to start](https://aistudio.baidu.com/aistudio/index).
Now our developers can acquire Tesla V100 online computing resources for free. If you create a program by AI Studio, you will obtain 8 hours to train models online per day. [Click here to start](https://aistudio.baidu.com/aistudio/index).

## FOUR LEADING TECHNOLOGIES

Expand All @@ -46,13 +46,13 @@ Now our developers can acquire Tesla V100 online computing resources for free. I

- **Support Ultra-Large-Scale Training of Deep Neural Networks**

PaddlePaddle has made breakthroughs in ultra-large-scale deep neural networks training. It launched the world's first large-scale open-source training platform that supports the training of deep networks with 100 billions of features and trillions of parameters using data sources distributed over hundreds of nodes. PaddlePaddle overcomes the online deep learning challenges for ultra-large-scale deep learning models, and further achieved the real-time model updating with more than 1 trillion parameters.
PaddlePaddle has made breakthroughs in ultra-large-scale deep neural networks training. It launched the world's first large-scale open-source training platform that supports the training of deep networks with 100 billion features and trillions of parameters using data sources distributed over hundreds of nodes. PaddlePaddle overcomes the online deep learning challenges for ultra-large-scale deep learning models, and further achieved real-time model updating with more than 1 trillion parameters.
[Click here to learn more](https://github.com/PaddlePaddle/Fleet)


- **High-Performance Inference Engines for Comprehensive Deployment Enviroments**

PaddlePaddle is not only compatible with models trained in 3rd party open-source frameworks , but also offers complete inference products for various production scenarios. Our inference product line includes [Paddle Inference](https://paddle-inference.readthedocs.io/en/latest/product_introduction/summary.html): Native inference library for high performance server and cloud inference; [Paddle Serving](https://github.com/PaddlePaddle/Serving): A service-oriented framework suitable for distributed and pipeline productions; [Paddle Lite](https://github.com/PaddlePaddle/Paddle-Lite): Ultra-Lightweight inference engine for mobile and IoT enviroments; [Paddle.js](https://www.paddlepaddle.org.cn/paddle/paddlejs): A frontend inference engine for browser and mini apps. Futhermore, by great amounts of optimization with leading hardwares in each scenarios, Paddle inference engines outperform most of the other mainstream frameworks.
PaddlePaddle is not only compatible with models trained in 3rd party open-source frameworks , but also offers complete inference products for various production scenarios. Our inference product line includes [Paddle Inference](https://paddle-inference.readthedocs.io/en/latest/product_introduction/summary.html): Native inference library for high-performance server and cloud inference; [Paddle Serving](https://github.com/PaddlePaddle/Serving): A service-oriented framework suitable for distributed and pipeline productions; [Paddle Lite](https://github.com/PaddlePaddle/Paddle-Lite): Ultra-Lightweight inference engine for mobile and IoT environments; [Paddle.js](https://www.paddlepaddle.org.cn/paddle/paddlejs): A frontend inference engine for browser and mini-apps. Furthermore, by great amounts of optimization with leading hardware in each scenario, Paddle inference engines outperform most of the other mainstream frameworks.


- **Industry-Oriented Models and Libraries with Open Source Repositories**
Expand Down Expand Up @@ -87,6 +87,11 @@ We provide [English](https://www.paddlepaddle.org.cn/documentation/docs/en/guide
- [Github Issues](https://github.com/PaddlePaddle/Paddle/issues): bug reports, feature requests, install issues, usage issues, etc.
- QQ discussion group: 793866180 (PaddlePaddle).
- [Forums](https://ai.baidu.com/forum/topic/list/168?pageNo=1): discuss implementations, research, etc.

## Courses

- [Server Deployments](https://aistudio.baidu.com/aistudio/course/introduce/19084): Courses intorducing high performance server deployments via local and remote services.
- [Edge Deployments](https://aistudio.baidu.com/aistudio/course/introduce/22690): Courses intorducing edge deployments from mobile, IoT to web and applets.

## Copyright and License
PaddlePaddle is provided under the [Apache-2.0 license](LICENSE).
9 changes: 7 additions & 2 deletions README_cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

## 安装

### PaddlePaddle最新版本: [v2.0](https://github.com/PaddlePaddle/Paddle/tree/release/2.0)
### PaddlePaddle最新版本: [v2.1](https://github.com/PaddlePaddle/Paddle/tree/release/2.1)

跟进PaddlePaddle最新特性请参考我们的[版本说明](https://github.com/PaddlePaddle/Paddle/releases)

Expand All @@ -32,7 +32,7 @@ pip install paddlepaddle-gpu
```
更多安装信息详见官网 [安装说明](https://www.paddlepaddle.org.cn/install/quick)

PaddlePaddle用户可领取**免费Tesla V100在线算力资源**,训练模型更高效。**每日登陆即送10小时**,[前往使用免费算力](https://aistudio.baidu.com/aistudio/index)。
PaddlePaddle用户可领取**免费Tesla V100在线算力资源**,训练模型更高效。**每日登陆即送8小时**,[前往使用免费算力](https://aistudio.baidu.com/aistudio/index)。

## 四大领先技术

Expand Down Expand Up @@ -84,6 +84,11 @@ PaddlePaddle用户可领取**免费Tesla V100在线算力资源**,训练模型
- 欢迎您通过[Github Issues](https://github.com/PaddlePaddle/Paddle/issues)来提交问题、报告与建议
- QQ群: 793866180 (PaddlePaddle)
- [论坛](https://ai.baidu.com/forum/topic/list/168): 欢迎大家在PaddlePaddle论坛分享在使用PaddlePaddle中遇到的问题和经验, 营造良好的论坛氛围

## 课程

- [服务器部署](https://aistudio.baidu.com/aistudio/course/introduce/19084): 详细介绍高性能服务器端部署实操,包含本地端及服务化Serving部署等
- [端侧部署](https://aistudio.baidu.com/aistudio/course/introduce/22690): 详细介绍端侧多场景部署实操,从移端端设备、IoT、网页到小程序部署

## 版权和许可证
PaddlePaddle由[Apache-2.0 license](LICENSE)提供
3 changes: 3 additions & 0 deletions cmake/external/box_ps.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,10 @@ ExternalProject_Add(
DOWNLOAD_NO_PROGRESS 1
UPDATE_COMMAND ""
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${BOX_PS_INSTALL_ROOT}
-DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${BOX_PS_INSTALL_ROOT}
-DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
BUILD_BYPRODUCTS ${BOX_PS_LIB}
)
ADD_LIBRARY(box_ps SHARED IMPORTED GLOBAL)
SET_PROPERTY(TARGET box_ps PROPERTY IMPORTED_LOCATION ${BOX_PS_LIB})
Expand Down
33 changes: 17 additions & 16 deletions cmake/external/brpc.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -45,23 +45,24 @@ ExternalProject_Add(
PREFIX ${BRPC_SOURCES_DIR}
UPDATE_COMMAND ""
CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${BRPC_INSTALL_DIR}
-DCMAKE_INSTALL_LIBDIR=${BRPC_INSTALL_DIR}/lib
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
-DCMAKE_PREFIX_PATH=${prefix_path}
-DWITH_GLOG=ON
-DIOBUF_WITH_HUGE_BLOCK=ON
-DBRPC_WITH_RDMA=${WITH_BRPC_RDMA}
${EXTERNAL_OPTIONAL_ARGS}
LIST_SEPARATOR |
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${BRPC_INSTALL_DIR}
-DCMAKE_INSTALL_LIBDIR=${BRPC_INSTALL_DIR}/lib
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
-DCMAKE_PREFIX_PATH=${prefix_path}
-DWITH_GLOG=ON
-DIOBUF_WITH_HUGE_BLOCK=ON
-DBRPC_WITH_RDMA=${WITH_BRPC_RDMA}
${EXTERNAL_OPTIONAL_ARGS}
LIST_SEPARATOR |
CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${BRPC_INSTALL_DIR}
-DCMAKE_INSTALL_LIBDIR:PATH=${BRPC_INSTALL_DIR}/lib
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
-DCMAKE_BUILD_TYPE:STRING=${THIRD_PARTY_BUILD_TYPE}
-DCMAKE_INSTALL_LIBDIR:PATH=${BRPC_INSTALL_DIR}/lib
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
-DCMAKE_BUILD_TYPE:STRING=${THIRD_PARTY_BUILD_TYPE}
BUILD_BYPRODUCTS ${BRPC_LIBRARIES}
)
# ADD_DEPENDENCIES(extern_brpc protobuf ssl crypto leveldb gflags glog gtest snappy)
ADD_DEPENDENCIES(extern_brpc protobuf ssl crypto leveldb gflags glog snappy)
Expand Down
1 change: 1 addition & 0 deletions cmake/external/cryptopp.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ ExternalProject_Add(
CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CRYPTOPP_INSTALL_DIR}
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
-DCMAKE_BUILD_TYPE:STRING=${THIRD_PARTY_BUILD_TYPE}
BUILD_BYPRODUCTS ${CRYPTOPP_LIBRARIES}
)

ADD_LIBRARY(cryptopp STATIC IMPORTED GLOBAL)
Expand Down
1 change: 1 addition & 0 deletions cmake/external/dgc.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ ExternalProject_Add(
&& cp ${DGC_SOURCES_DIR}/build/lib/libdgc.a ${DGC_LIBRARIES}
&& cp ${DGC_SOURCES_DIR}/build/include/dgc.h ${DGC_INCLUDE_DIR}/dgc/
BUILD_IN_SOURCE 1
BUILD_BYPRODUCTS ${DGC_LIBRARIES}
)

ADD_LIBRARY(dgc STATIC IMPORTED GLOBAL)
Expand Down
1 change: 1 addition & 0 deletions cmake/external/gflags.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ ExternalProject_Add(
CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${GFLAGS_INSTALL_DIR}
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
-DCMAKE_BUILD_TYPE:STRING=${THIRD_PARTY_BUILD_TYPE}
BUILD_BYPRODUCTS ${GFLAGS_LIBRARIES}
)

ADD_LIBRARY(gflags STATIC IMPORTED GLOBAL)
Expand Down
1 change: 1 addition & 0 deletions cmake/external/glog.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ ExternalProject_Add(
-DCMAKE_INSTALL_LIBDIR:PATH=${GLOG_INSTALL_DIR}/lib
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
-DCMAKE_BUILD_TYPE:STRING=${THIRD_PARTY_BUILD_TYPE}
BUILD_BYPRODUCTS ${GLOG_LIBRARIES}
)

ADD_LIBRARY(glog STATIC IMPORTED GLOBAL)
Expand Down
4 changes: 3 additions & 1 deletion cmake/external/gloo.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ cache_third_party(extern_gloo
TAG ${GLOO_TAG}
DIR GLOO_SOURCE_DIR)

if(WITH_ASCEND OR WITH_ASCEND_CL)
if(WITH_ASCEND OR WITH_ASCEND_CL)
ExternalProject_Add(
extern_gloo
${EXTERNAL_PROJECT_LOG_ARGS}
Expand All @@ -47,6 +47,7 @@ cache_third_party(extern_gloo
&& mkdir -p ${GLOO_LIBRARY_DIR} ${GLOO_INCLUDE_DIR}/gloo
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy ${GLOO_SOURCE_DIR}/build/gloo/libgloo.a ${GLOO_LIBRARY_DIR}
COMMAND ${CMAKE_COMMAND} -E copy_directory "${GLOO_SOURCE_DIR}/gloo/" "${GLOO_INCLUDE_DIR}/gloo"
BUILD_BYPRODUCTS ${GLOO_LIBRARIES}
)
else()
ExternalProject_Add(
Expand All @@ -63,6 +64,7 @@ else()
&& mkdir -p ${GLOO_LIBRARY_DIR} ${GLOO_INCLUDE_DIR}/gloo
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy ${GLOO_SOURCE_DIR}/build/gloo/libgloo.a ${GLOO_LIBRARY_DIR}
COMMAND ${CMAKE_COMMAND} -E copy_directory "${GLOO_SOURCE_DIR}/gloo/" "${GLOO_INCLUDE_DIR}/gloo"
BUILD_BYPRODUCTS ${GLOO_LIBRARIES}
)
endif()

Expand Down
2 changes: 2 additions & 0 deletions cmake/external/gtest.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ ExternalProject_Add(
CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${GTEST_INSTALL_DIR}
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
-DCMAKE_BUILD_TYPE:STRING=${THIRD_PARTY_BUILD_TYPE}
BUILD_BYPRODUCTS ${GTEST_LIBRARIES}
BUILD_BYPRODUCTS ${GTEST_MAIN_LIBRARIES}
)

ADD_LIBRARY(gtest STATIC IMPORTED GLOBAL)
Expand Down
1 change: 1 addition & 0 deletions cmake/external/leveldb.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ ExternalProject_Add(
&& cp ${LEVELDB_SOURCES_DIR}/src/extern_leveldb/libleveldb.a ${LEVELDB_LIBRARIES}
&& cp -r ${LEVELDB_SOURCES_DIR}/src/extern_leveldb/include ${LEVELDB_INSTALL_DIR}/
BUILD_IN_SOURCE 1
BUILD_BYPRODUCTS ${LEVELDB_LIBRARIES}
)

ADD_DEPENDENCIES(extern_leveldb snappy)
Expand Down
2 changes: 2 additions & 0 deletions cmake/external/libmct.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ ExternalProject_Add(
DOWNLOAD_NO_PROGRESS 1
UPDATE_COMMAND ""
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBMCT_INSTALL_ROOT}
-DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${LIBMCT_INSTALL_ROOT}
-DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
)

add_library(libmct INTERFACE)
Expand Down
10 changes: 6 additions & 4 deletions cmake/external/libxsmm.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ SET(LIBXSMM_SOURCES_DIR ${THIRD_PARTY_PATH}/libxsmm)
SET(LIBXSMM_INSTALL_DIR ${THIRD_PARTY_PATH}/install/libxsmm)
SET(LIBXSMM_INCLUDE_DIR "${LIBXSMM_INSTALL_DIR}/include" CACHE PATH "LIBXSMM include directory." FORCE)
SET(LIBXSMM_LIBRARY_DIR "${LIBXSMM_INSTALL_DIR}/lib" CACHE PATH "LIBXSMM library directory." FORCE)
SET(LIBXSMM_LIBS "${LIBXSMM_LIBRARY_DIR}/libxsmm.a"
"${LIBXSMM_LIBRARY_DIR}/libxsmmnoblas.a")
SET(LIBXSMM_LIB "${LIBXSMM_LIBRARY_DIR}/libxsmm.a")
SET(LIBXSMMNOBLAS_LIB "${LIBXSMM_LIBRARY_DIR}/libxsmmnoblas.a")

ExternalProject_Add(
extern_libxsmm
Expand All @@ -32,10 +32,12 @@ ExternalProject_Add(
BUILD_IN_SOURCE 1
BUILD_COMMAND $(MAKE) --silent PREFIX=${LIBXSMM_INSTALL_DIR} CXX=g++ CC=gcc WARP=0 install
INSTALL_COMMAND ""
BUILD_BYPRODUCTS ${LIBXSMM_LIB}
BUILD_BYPRODUCTS ${LIBXSMMNOBLAS_LIB}
)
ADD_LIBRARY(libxsmm STATIC IMPORTED GLOBAL)
SET_PROPERTY(TARGET libxsmm PROPERTY IMPORTED_LOCATION "${LIBXSMM_LIBRARY_DIR}/libxsmm.a")
SET_PROPERTY(TARGET libxsmm PROPERTY IMPORTED_LOCATION "${LIBXSMM_LIBRARY_DIR}/libxsmmnoblas.a")
SET_PROPERTY(TARGET libxsmm PROPERTY IMPORTED_LOCATION "${LIBXSMM_LIB}")
SET_PROPERTY(TARGET libxsmm PROPERTY IMPORTED_LOCATION "${LIBXSMMNOBLAS_LIB}")

MESSAGE(STATUS "Libxsmm library: ${LIBXSMM_LIBS}")
include_directories(${LIBXSMM_INCLUDE_DIR})
Expand Down
10 changes: 4 additions & 6 deletions cmake/external/mkldnn.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ SET(MKLDNN_SOURCE_DIR ${THIRD_PARTY_PATH}/mkldnn/src/extern_mkldnn)
SET(MKLDNN_INSTALL_DIR ${THIRD_PARTY_PATH}/install/mkldnn)
SET(MKLDNN_INC_DIR "${MKLDNN_INSTALL_DIR}/include" CACHE PATH "mkldnn include directory." FORCE)
SET(MKLDNN_REPOSITORY ${GIT_URL}/oneapi-src/oneDNN.git)
SET(MKLDNN_TAG 748528a2d3204b5f401c14a9aacdec16accd5ead)
SET(MKLDNN_TAG 593e0de6267d2575f3e4c9e9818f0f11253d093a)


# Introduce variables:
Expand All @@ -43,8 +43,10 @@ IF(NOT WIN32)
SET(MKLDNN_FLAG "${MKLDNN_FLAG} -Wno-unused-result -Wno-unused-value")
SET(MKLDNN_CFLAG "${CMAKE_C_FLAGS} ${MKLDNN_FLAG}")
SET(MKLDNN_CXXFLAG "${CMAKE_CXX_FLAGS} ${MKLDNN_FLAG}")
SET(MKLDNN_LIB "${MKLDNN_INSTALL_DIR}/${LIBDIR}/libdnnl.so" CACHE FILEPATH "mkldnn library." FORCE)
ELSE()
SET(MKLDNN_CXXFLAG "${CMAKE_CXX_FLAGS} /EHsc")
SET(MKLDNN_LIB "${MKLDNN_INSTALL_DIR}/bin/mkldnn.lib" CACHE FILEPATH "mkldnn library." FORCE)
ENDIF(NOT WIN32)

cache_third_party(${MKLDNN_PROJECT}
Expand Down Expand Up @@ -77,12 +79,8 @@ ExternalProject_Add(
-DCMAKE_CXX_FLAGS=${MKLDNN_CXXFLAG}
-DDNNL_BUILD_TESTS=OFF -DDNNL_BUILD_EXAMPLES=OFF
CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${MKLDNN_INSTALL_DIR}
BUILD_BYPRODUCTS ${MKLDNN_LIB}
)
if(WIN32)
SET(MKLDNN_LIB "${MKLDNN_INSTALL_DIR}/bin/mkldnn.lib" CACHE FILEPATH "mkldnn library." FORCE)
else(WIN32)
SET(MKLDNN_LIB "${MKLDNN_INSTALL_DIR}/${LIBDIR}/libdnnl.so" CACHE FILEPATH "mkldnn library." FORCE)
endif(WIN32)

ADD_LIBRARY(shared_mkldnn SHARED IMPORTED GLOBAL)
SET_PROPERTY(TARGET shared_mkldnn PROPERTY IMPORTED_LOCATION ${MKLDNN_LIB})
Expand Down
8 changes: 7 additions & 1 deletion cmake/external/mklml.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ cache_third_party(${MKLML_PROJECT}
URL ${MKLML_URL}
DIR MKLML_SOURCE_DIR)

# Ninja Generator can not establish the correct dependency relationship between the imported library with target,
# the product file in the ExternalProject need to be specified manually, please refer to
# https://stackoverflow.com/questions/54866067/cmake-and-ninja-missing-and-no-known-rule-to-make-it
# It is the same to all other ExternalProject.
ExternalProject_Add(
${MKLML_PROJECT}
${EXTERNAL_PROJECT_LOG_ARGS}
Expand All @@ -63,7 +67,9 @@ ExternalProject_Add(
BUILD_COMMAND ""
UPDATE_COMMAND ""
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory ${MKLML_SOURCE_DIR}/include ${MKLML_INC_DIR} &&
${CMAKE_COMMAND} -E copy_directory ${MKLML_SOURCE_DIR}/lib ${MKLML_LIB_DIR}
${CMAKE_COMMAND} -E copy_directory ${MKLML_SOURCE_DIR}/lib ${MKLML_LIB_DIR}
BUILD_BYPRODUCTS ${MKLML_LIB}
BUILD_BYPRODUCTS ${MKLML_IOMP_LIB}
)

INCLUDE_DIRECTORIES(${MKLML_INC_DIR})
Expand Down
4 changes: 4 additions & 0 deletions cmake/external/protobuf.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,10 @@ endif()
-DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
${OPTIONAL_CACHE_ARGS}
BUILD_BYPRODUCTS ${PROTOBUF_INSTALL_DIR}/lib/libprotobuf${CMAKE_STATIC_LIBRARY_SUFFIX}
BUILD_BYPRODUCTS ${PROTOBUF_INSTALL_DIR}/lib/libprotobuf-lite${CMAKE_STATIC_LIBRARY_SUFFIX}
BUILD_BYPRODUCTS ${PROTOBUF_INSTALL_DIR}/lib/libprotoc${CMAKE_STATIC_LIBRARY_SUFFIX}
BUILD_BYPRODUCTS ${PROTOBUF_INSTALL_DIR}/bin/protoc${CMAKE_EXECUTABLE_SUFFIX}
)
ENDFUNCTION()

Expand Down
3 changes: 3 additions & 0 deletions cmake/external/pslib.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@ ExternalProject_Add(
DOWNLOAD_NO_PROGRESS 1
UPDATE_COMMAND ""
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PSLIB_INSTALL_ROOT}
-DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${PSLIB_INSTALL_ROOT}
-DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
BUILD_BYPRODUCTS ${PSLIB_LIB}
)

ADD_LIBRARY(pslib SHARED IMPORTED GLOBAL)
Expand Down
3 changes: 3 additions & 0 deletions cmake/external/pslib_brpc.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@ ExternalProject_Add(
DOWNLOAD_NO_PROGRESS 1
UPDATE_COMMAND ""
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PSLIB_BRPC_INSTALL_ROOT}
-DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${PSLIB_BRPC_INSTALL_ROOT}
-DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
BUILD_BYPRODUCTS ${PSLIB_BRPC_LIB}
)

ADD_LIBRARY(pslib_brpc SHARED IMPORTED GLOBAL)
Expand Down
Loading