Skip to content

Commit 718f154

Browse files
author
Varun Arora
committed
Merge branch 'onnx' of https://github.com/kuke/Paddle into onnx
2 parents 56b8784 + b798e06 commit 718f154

File tree

539 files changed

+21914
-2694
lines changed

Some content is hidden

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

539 files changed

+21914
-2694
lines changed

‎.gitignore

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,3 @@ third_party/
2525

2626
# clion workspace.
2727
cmake-build-*
28-
29-
# generated while compiling
30-
paddle/pybind/pybind.h
31-
CMakeFiles
32-
cmake_install.cmake
33-
paddle/.timestamp
34-
python/paddlepaddle.egg-info/
35-
paddle/fluid/pybind/pybind.h
36-
python/paddle/version.py

‎.pre-commit-config.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
repos:
12
- repo: https://github.com/Lucas-C/pre-commit-hooks.git
23
sha: v1.0.1
34
hooks:
@@ -25,6 +26,14 @@
2526
entry: bash ./.clang_format.hook -i
2627
language: system
2728
files: \.(c|cc|cxx|cpp|cu|h|hpp|hxx|proto)$
29+
- repo: local
30+
hooks:
31+
- id: cpplint-cpp-source
32+
name: cpplint
33+
description: Check C++ code style using cpplint.py.
34+
entry: bash ./tools/codestyle/cpplint_pre_commit.hook
35+
language: system
36+
files: \.(c|cc|cxx|cpp|cu|h|hpp|hxx)$
2837
- repo: https://github.com/PaddlePaddle/pre-commit-golang
2938
sha: 8337620115c25ff8333f1b1a493bd031049bd7c0
3039
hooks:

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ addons:
3434
- automake
3535
- libtool
3636
- ccache
37-
ssh_known_hosts: 52.76.173.135
37+
ssh_known_hosts: 13.229.163.131
3838
before_install:
3939
- if [[ "$JOB" == "check_style" ]]; then sudo ln -s /usr/bin/clang-format-3.8 /usr/bin/clang-format; fi
4040
# Paddle is using protobuf 3.1 currently. Protobuf 3.2 breaks the compatibility. So we specify the python

‎CMakeLists.txt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ include(simd)
3636

3737
################################ Configurations #######################################
3838
option(WITH_GPU "Compile PaddlePaddle with NVIDIA GPU" ${CUDA_FOUND})
39+
option(WITH_AMD_GPU "Compile PaddlePaddle with AMD GPU" OFF)
3940
option(WITH_AVX "Compile PaddlePaddle with AVX intrinsics" ${AVX_FOUND})
4041
option(WITH_MKL "Compile PaddlePaddle with MKL support." ${AVX_FOUND})
4142
option(WITH_DSO "Compile PaddlePaddle with dynamic linked CUDA" ON)
@@ -52,8 +53,7 @@ option(WITH_COVERAGE "Compile PaddlePaddle with code coverage" OFF)
5253
option(COVERALLS_UPLOAD "Package code coverage data to coveralls" OFF)
5354
option(ON_TRAVIS "Exclude special unit test on Travis CI" OFF)
5455
option(WITH_C_API "Compile PaddlePaddle with C-API(Prediction)" OFF)
55-
# TODO: Only compile PaddlePaddle fluid version by WITH_FLUID option.
56-
option(WITH_FLUID "Compile PaddlePaddle fluid only(TODO)" OFF)
56+
option(WITH_FLUID_ONLY "Compile PaddlePaddle fluid only" OFF)
5757
option(WITH_GOLANG "Compile PaddlePaddle with GOLANG" OFF)
5858
option(GLIDE_INSTALL "Download and install go dependencies " ON)
5959
option(USE_NNPACK "Compile PaddlePaddle with NNPACK library" OFF)
@@ -108,7 +108,7 @@ if (WITH_C_API AND WITH_PYTHON)
108108
endif()
109109

110110
if (WITH_C_API)
111-
set(WITH_FLUID OFF CACHE STRING "Disable install fluid when compile the C_API" FORCE)
111+
set(WITH_FLUID_ONLY OFF CACHE STRING "Disable install fluid when compile the C_API" FORCE)
112112
endif()
113113

114114
if(MOBILE_INFERENCE)
@@ -146,6 +146,7 @@ include(external/cares)
146146
include(external/grpc)
147147
include(external/snappy) # download snappy
148148
include(external/snappystream)
149+
include(external/threadpool)
149150

150151
include(cudnn) # set cudnn libraries, must before configure
151152
include(cupti)
@@ -180,6 +181,11 @@ if(WITH_GPU)
180181
include(cuda)
181182
endif(WITH_GPU)
182183

184+
if(WITH_AMD_GPU)
185+
find_package(HIP)
186+
include(hip)
187+
endif(WITH_AMD_GPU)
188+
183189
if(WITH_MKLML)
184190
list(APPEND EXTERNAL_LIBS ${MKLML_IOMP_LIB})
185191
endif()

‎benchmark/cluster/README.md

Lines changed: 133 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,83 @@
3636
- Trainer Count: 100
3737
- Metrics: mini-batch / sec
3838

39-
| Batch Size | 32 | 64 | 128 | 256 |
40-
| -- | -- | -- | -- | -- |
41-
| PaddlePaddle Fluid | - | - | - | - |
42-
| PaddlePaddle v2 | - | - | - | - |
43-
| TensorFlow | - | - | - | - |
39+
40+
<table>
41+
<thead>
42+
<tr>
43+
<th>Batch Size </th>
44+
<th> 32</th>
45+
<th>64</th>
46+
<th>128 </th>
47+
<th>256</th>
48+
</tr>
49+
</thead>
50+
<tbody>
51+
<tr>
52+
<td> PaddlePaddle Fluid</td>
53+
<td>-</td>
54+
<td>- </td>
55+
<td>- </td>
56+
<td>- </td>
57+
</tr>
58+
<tr>
59+
<td>PaddlePaddle v2 </td>
60+
<td>- </td>
61+
<td>- </td>
62+
<td>- </td>
63+
<td>- </td>
64+
</tr>
65+
<tr>
66+
<td>TensorFlow </td>
67+
<td>- </td>
68+
<td>- </td>
69+
<td>- </td>
70+
<td>- </td>
71+
</tr>
72+
</tbody>
73+
</table>
4474

4575
### Measure the Performance for Different PServer Count
4676

4777
- Trainer Count: 100
4878
- Batch Size: 64
4979
- Metrics: mini-batch / sec
5080

51-
| PServer Count | 10 | 20 | 40 | 60 |
52-
| -- | -- | -- | -- | -- |
53-
| PaddlePaddle Fluid | - | - | - | - |
54-
| PaddlePaddle v2 | - | - | - | - |
55-
| TensorFlow | - | - | - | - |
81+
82+
<table>
83+
<thead>
84+
<tr>
85+
<th>PServer Count </th>
86+
<th>10</th>
87+
<th>20</th>
88+
<th>40 </th>
89+
<th>60</th>
90+
</tr>
91+
</thead>
92+
<tbody>
93+
<tr>
94+
<td> PaddlePaddle Fluid</td>
95+
<td>-</td>
96+
<td>- </td>
97+
<td>- </td>
98+
<td>- </td>
99+
</tr>
100+
<tr>
101+
<td>PaddlePaddle v2 </td>
102+
<td>- </td>
103+
<td>- </td>
104+
<td>- </td>
105+
<td>- </td>
106+
</tr>
107+
<tr>
108+
<td>TensorFlow </td>
109+
<td>- </td>
110+
<td>- </td>
111+
<td>- </td>
112+
<td>- </td>
113+
</tr>
114+
</tbody>
115+
</table>
56116

57117
### Measure Parallel Efficiency By Increasing Trainer Count
58118

@@ -67,11 +127,69 @@ The parallel efficiency is:
67127

68128
$E = \div(S, N)$
69129

70-
| Trainer Counter | 1 | 10 | 20 | 30 | 40 | 50 | 60 | 70 | 80 | 90 | 100 |
71-
| -- | -- | -- | -- | -- | -- | -- | -- | -- | -- | -- | -- |
72-
| PaddlePaddle Fluid | - | - | - | - | - | - | - | - | - | - | - |
73-
| PaddlePaddle v2 | - | - | - | - | - | - | - | - | - | - | - | - |
74-
| TensorFlow | - | - | - | - | - | - | - | - | - | - | - | - | - |
130+
<table>
131+
<thead>
132+
<tr>
133+
<th>Trainer Counter </th>
134+
<th>1</th>
135+
<th>10</th>
136+
<th>20 </th>
137+
<th>30</th>
138+
<th>40</th>
139+
<th>50</th>
140+
<th>60 </th>
141+
<th>70</th>
142+
<th>80</th>
143+
<th>90</th>
144+
<th>100 </th>
145+
</tr>
146+
</thead>
147+
<tbody>
148+
<tr>
149+
<td> PaddlePaddle Fluid</td>
150+
<td>-</td>
151+
<td>- </td>
152+
<td>- </td>
153+
<td>- </td>
154+
<td>-</td>
155+
<td>- </td>
156+
<td>- </td>
157+
<td>- </td>
158+
<td>-</td>
159+
<td>- </td>
160+
<td>- </td>
161+
</tr>
162+
<tr>
163+
<td>PaddlePaddle v2 </td>
164+
<td>- </td>
165+
<td>- </td>
166+
<td>- </td>
167+
<td>- </td>
168+
<td>-</td>
169+
<td>- </td>
170+
<td>- </td>
171+
<td>- </td>
172+
<td>-</td>
173+
<td>- </td>
174+
<td>- </td>
175+
</tr>
176+
<tr>
177+
<td>TensorFlow </td>
178+
<td>- </td>
179+
<td>- </td>
180+
<td>- </td>
181+
<td>- </td>
182+
<td>-</td>
183+
<td>- </td>
184+
<td>- </td>
185+
<td>- </td>
186+
<td>-</td>
187+
<td>- </td>
188+
<td>- </td>
189+
</tr>
190+
</tbody>
191+
</table>
192+
75193

76194
## Reproduce the benchmark
77195

0 commit comments

Comments
 (0)