Skip to content

Commit efb6ba3

Browse files
XrekiXreki
committed
Merge branch 'develop' into core_refine_inference
2 parents 2d74b5f + ed1a053 commit efb6ba3

File tree

1,784 files changed

+7460
-5141
lines changed

Some content is hidden

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

1,784 files changed

+7460
-5141
lines changed

‎CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.
1+
# Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -60,6 +60,7 @@ option(USE_NNPACK "Compile PaddlePaddle with NNPACK library" OFF)
6060
option(WITH_DISTRIBUTE "Compile with grpc distributed support" OFF)
6161
option(USE_EIGEN_FOR_BLAS "Use matrix multiplication in Eigen" OFF)
6262
option(WITH_ARM_FP16 "Use half precision support on armv8.2-a cpu" OFF)
63+
option(WITH_FAST_BUNDLE_TEST "Bundle tests that can be run in a single process together to reduce launch overhead" ON)
6364

6465
# CMAKE_BUILD_TYPE
6566
if(NOT CMAKE_BUILD_TYPE)
@@ -141,7 +142,6 @@ include(external/boost) # download boost
141142
include(external/any) # download libn::any
142143
include(external/eigen) # download eigen3
143144
include(external/pybind11) # download pybind11
144-
include(external/nccl)
145145
include(external/cares)
146146
include(external/grpc)
147147

‎Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ COPY ./paddle/scripts/docker/root/ /root/
2222

2323
RUN apt-get update && \
2424
apt-get install -y \
25-
git python-pip python-dev openssh-server bison libnccl-dev \
25+
git python-pip python-dev openssh-server bison \
26+
libnccl2=2.1.2-1+cuda8.0 libnccl-dev=2.1.2-1+cuda8.0 \
2627
wget unzip unrar tar xz-utils bzip2 gzip coreutils ntp \
2728
curl sed grep graphviz libjpeg-dev zlib1g-dev \
2829
python-matplotlib gcc-4.8 g++-4.8 \

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved
188188
same "printed page" as the copyright notice for easier
189189
identification within third-party archives.
190190

191-
Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.
191+
Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved.
192192

193193
Licensed under the Apache License, Version 2.0 (the "License");
194194
you may not use this file except in compliance with the License.

‎benchmark/cluster/vgg16/README.md

Lines changed: 5 additions & 4 deletions

‎benchmark/cluster/vgg16/vgg16_fluid.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserve.
1+
# Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎benchmark/cluster/vgg16/vgg16_v2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserve.
1+
# Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
22
#
33
#Licensed under the Apache License, Version 2.0 (the "License");
44
#you may not use this file except in compliance with the License.

‎benchmark/paddle/image/alexnet.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserve.
1+
# Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎benchmark/paddle/image/provider.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserve.
1+
# Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎benchmark/paddle/rnn/imdb.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserve.
1+
# Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎benchmark/paddle/rnn/provider.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserve.
1+
# Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)