Skip to content

Commit 36cd18b

Browse files
wopeizlwopeizl
committed
Merge remote-tracking branch 'upstream/develop' into windows/build
2 parents b2f8d41 + 39ec80d commit 36cd18b

File tree

78 files changed

+1959
-347
lines changed

Some content is hidden

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

78 files changed

+1959
-347
lines changed

‎.github/ISSUE_TEMPLATE/---feature-request-.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
---
2+
name: 建议(Feature request)
3+
about: 您可以提出您的建议。 You could use this template for reporting a suggestion  issue.
4+
5+
---
6+
7+
欢迎您对PaddlePaddle提出建议，非常感谢您对PaddlePaddle的贡献！
8+
在留下您的建议时，辛苦您同步提供如下信息：
9+
- 版本、环境信息
10+
1）PaddlePaddle版本：请提供您的PaddlePaddle版本号，例如1.1
11+
2）CPU/GPU：您是否使用GPU进行训练，如是，请提供您的CUDA和cuDNN版本号
12+
3）系统环境：请您描述系统类型、版本，例如Mac OS 10.14
13+
- 复现信息：如为报错，请给出复现环境、复现步骤
14+
- 建议描述：请您详细描述，您认为需优化的功能
15+
16+
Thank you for contributing to PaddlePaddle.
17+
Before submitting the issue, you could search issue in the github in case that there was a similar issue submitted or resolved before.
18+
Please make sure that this is a feature request.
19+
**System information**
20+
-PaddlePaddle version （eg.1.1）or CommitID
21+
-CPU: including CPUMKL/OpenBlas/MKLDNN version
22+
-GPU: including CUDA/CUDNN version
23+
-OS Platform (eg.Mac OS 10.14)
24+
**To Reproduce**
25+
Steps to reproduce the behavior
26+
**Describe the feature and the current behavior/state.**
27+
**Any Other info.**

‎.github/ISSUE_TEMPLATE/---inference-issue-.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
---
2+
name: 预测（Inference Issue）
3+
about: 您可以提问预测中报错、应用等问题。 You could use this template for reporting an inference issue.
4+
5+
---
6+
7+
为使您的问题得到快速解决，在建立Issue前，请您先通过如下方式搜索是否有相似问题:【搜索issue关键字】【使用labels筛选】【官方文档】
8+
9+
如果您没有查询到相似问题，为快速解决您的提问，建立issue时请提供如下细节信息：
10+
- 标题：简洁、精准描述您的问题，例如“最新预测库的API文档在哪儿 ”
11+
- 版本、环境信息：
12+
   1）PaddlePaddle版本：请提供您的PaddlePaddle版本号（如1.1）或CommitID
13+
   2）CPU：预测若用CPU，请提供CPU型号，MKL/OpenBlas/MKLDNN/等数学库使用情况
14+
   3）GPU：预测若用GPU，请提供GPU型号、CUDA和CUDNN版本号
15+
   4）系统环境：请您描述系统类型、版本（如Mac OS 10.14），Python版本
16+
-预测信息
17+
   1）C++预测：请您提供预测库安装包的版本信息，及其中的version.txt文件
18+
   2）CMake包含路径的完整命令
19+
   3）API信息（如调用请提供）
20+
   4）预测库来源：官网下载/特殊环境（如BCLOUD编译）
21+
- 复现信息：如为报错，请给出复现环境、复现步骤
22+
- 问题描述：请详细描述您的问题，同步贴出报错信息、日志/代码关键片段
23+
24+
Thank you for contributing to PaddlePaddle.
25+
Before submitting the issue, you could search issue in the github in case that th
26+
If there is no solution,please make sure that this is an inference issue including the following details :
27+
**System information**
28+
-PaddlePaddle version （eg.1.1）or CommitID
29+
-CPU: including CPUMKL/OpenBlas/MKLDNN version
30+
-GPU: including CUDA/CUDNN version
31+
-OS Platform (eg.Mac OS 10.14)
32+
-Python version
33+
-Cmake orders
34+
-C++version.txt
35+
-API information
36+
**To Reproduce**
37+
Steps to reproduce the behavior
38+
**Describe your current behavior**
39+
**Code to reproduce the issue**
40+
**Other info / logs**

‎.github/ISSUE_TEMPLATE/---installation-issue-.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
---
2+
name: 安装（Installation Issue）
3+
about: 您可以提问安装、编译出现报错等问题。 You could use this template for reporting an installation
4+
 issue.
5+
6+
---
7+
8+
为使您的问题得到快速解决，在建立Issue前，请您先通过如下方式搜索是否有相似问题:【搜索issue关键字】【使用labels筛选】【官方文档】
9+
10+
建立issue时，为快速解决问题，请您根据使用情况给出如下信息：
11+
- 标题：请包含关键词“安装错误”/“编译错误”，例如“Mac编译错误”
12+
- 版本、环境信息：
13+
   1）PaddlePaddle版本：请提供您的PaddlePaddle版本号（如1.1）或CommitID
14+
   2）CPU：请提供CPU型号，MKL/OpenBlas/MKLDNN/等数学库的使用情况
15+
   3）GPU：请提供GPU型号，CUDA和CUDNN版本号
16+
   4）系统环境：请说明系统类型、版本（如Mac OS 10.14）、Python版本
17+
- 安装方式信息：
18+
1）pip安装/docker安装
19+
2）本地编译：请提供cmake命令，编译命令
20+
3）docker编译：请提供docker镜像，编译命令           
21+
 特殊环境请注明：如离线安装等
22+
- 复现信息：如为报错，请给出复现环境、复现步骤
23+
- 问题描述：请详细描述您的问题，同步贴出报错信息、日志/代码关键片段
24+
25+
Thank you for contributing to PaddlePaddle.
26+
Before submitting the issue, you could search issue in Github in case that there was a similar issue submitted or resolved before.
27+
If there is no solution,please make sure that this is an installation issue including the following details:
28+
**System information**
29+
-PaddlePaddle version （eg.1.1）or CommitID
30+
-CPU: including CPUMKL/OpenBlas/MKLDNN version
31+
-GPU: including CUDA/CUDNN version
32+
-OS Platform (eg. Mac OS 10.14)
33+
-Python version
34+
- Install method: pip install/install with docker/build from source(without docker)/build within docker
35+
- Other special cases that you think may be related to this problem, eg. offline install, special internet condition  
36+
**To Reproduce**
37+
Steps to reproduce the behavior
38+
**Describe your current behavior**
39+
**Code to reproduce the issue**
40+
**Other info / logs**

‎.github/ISSUE_TEMPLATE/---model-issue-.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
---
2+
name: 模型（Model Issue）
3+
about: 您可以提问模型、算法、数据集方向的使用报错等问题。You could use this template for reporting a model/
4+
algorithm/dataset  issue.
5+
6+
---
7+
8+
为使您的问题得到快速解决，在建立Issue前，请您先通过如下方式搜索是否有相似问题:【搜索issue关键字】【使用labels筛选】【官方文档】
9+
10+
建立issue时，为快速解决问题，请您根据使用情况给出如下信息：
11+
- 标题：简洁、精准描述您的问题，例如“ssd 模型前置lstm报错  ”
12+
- 版本、环境信息：
13+
   1）PaddlePaddle版本：请提供PaddlePaddle版本号，例如1.1或CommitID
14+
   2）CPU：请提供CPU型号，MKL/OpenBlas/MKLDNN/等数学库的使用情况
15+
   3）GPU：请提供GPU型号，CUDA和CUDNN版本号
16+
   4）系统环境：请说明系统类型、版本（例如Mac OS 10.14），Python版本
17+
- 模型信息
18+
   1）模型名称 2）使用数据集名称 3）使用算法名称 4）模型链接
19+
- 复现信息：如为报错，请给出复现环境、复现步骤
20+
- 问题描述：请详细描述您的问题，同步贴出报错信息、日志/代码关键片段
21+
22+
Thank you for contributing to PaddlePaddle.
23+
Before submitting the issue, you could search issue in the github.Probably there was a similar issue submitted or resolved before.
24+
If there is no solution,please make sure that this is a issue of models including the following details:
25+
**System information**
26+
-PaddlePaddle version （eg.1.1）or CommitID
27+
-CPU: including CPUMKL/OpenBlas/MKLDNN version
28+
-GPU: including CUDA/CUDNN version
29+
-OS Platform (eg.Mac OS 10.14)
30+
-Python version
31+
-Name of Models&Dataset/details of operator
32+
**To Reproduce**
33+
Steps to reproduce the behavior
34+
**Describe your current behavior**
35+
**Code to reproduce the issue**
36+
**Other info / logs**

‎.github/ISSUE_TEMPLATE/---others-.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
name: 其他（Others）
3+
about: 如上述分类未包含您的问题，可在此提出。 You could use this template for reporting other issues
4+
5+
---
6+
7+
为使您的问题得到快速解决，在建立Issues前，请您先通过如下方式搜索是否有相似问题:【搜索issue关键字】【使用labels筛选】【官方文档】
8+
9+
如果您没有查询到相似问题，为快速解决您的提问，建立issue时请提供如下细节信息：
10+
- 标题：简洁、精准概括您的问题
11+
- 版本、环境信息：
12+
   1）PaddlePaddle版本：请提供您的PaddlePaddle版本号，例如1.1或CommitID
13+
   2）CPU/GPU：如果您使用GPU训练，请提供GPU驱动版本、CUDA和cuDNN版本号
14+
   3）系统环境：请您描述系统类型、版本，例如Mac OS 10.14
15+
   4）Python版本号
16+
   5）显存信息
17+
- 复现信息：如为报错，请给出复现环境、复现步骤
18+
- 问题描述：请详细描述您的问题，同步贴出报错信息、日志/代码关键片段
19+
20+
Thank you for contributing to PaddlePaddle.
21+
Before submitting the issue, you could search issue in the github in case that there was a similar issue submitted or resolved before.
22+
If there is no solution,please provide us with the following details :
23+
**System information**
24+
-PaddlePaddle version （eg.1.1）or CommitID
25+
-CPU: including CPUMKL/OpenBlas/MKLDNN version
26+
-GPU: including CUDA/cuDNN version
27+
-OS Platform and Distribution(eg.Mac OS 10.14)
28+
-Python version
29+
**To Reproduce**
30+
Steps to reproduce the behavior
31+
**Describe your current behavior**
32+
**Code to reproduce the issue**
33+
**Other info / logs**

‎.github/ISSUE_TEMPLATE/---training-issue-.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
---
2+
name: 训练（Training issue）
3+
about: 您可以提问训练中报错、应用、出core等问题。 You could use this template for reporting an training
4+
 issue.
5+
6+
---
7+
8+
为使您的问题得到快速解决，在建立Issues前，请您先通过如下方式搜索是否有相似问题:【搜索issue关键字】【使用labels筛选】【官方文档】
9+
10+
如果您没有查询到相似问题，为快速解决您的提问，建立issue时请提供如下细节信息：
11+
- 标题：简洁、精准概括您的问题，例如“Insufficient Memory xxx" ”
12+
- 版本、环境信息：
13+
   1）PaddlePaddle版本：请提供您的PaddlePaddle版本号，例如1.1或CommitID
14+
   2）CPU：预测若用CPU，请提供CPU型号，MKL/OpenBlas/MKLDNN/等数学库使用情况
15+
   3）GPU：预测若用GPU，请提供GPU型号、CUDA和CUDNN版本号
16+
   4）系统环境：请您描述系统类型、版本，例如Mac OS 10.14，Python版本
17+
- 训练信息
18+
   1）单机/多机，单卡/多卡
19+
   2）显存信息
20+
   3）Operator信息
21+
- 复现信息：如为报错，请给出复现环境、复现步骤
22+
- 问题描述：请详细描述您的问题，同步贴出报错信息、日志、可复现的代码片段
23+
24+
Thank you for contributing to PaddlePaddle.
25+
Before submitting the issue, you could search issue in the github in case that there was a similar issue submitted or resolved before.
26+
If there is no solution,please make sure that this is a training issue including the following details:
27+
**System information**
28+
-PaddlePaddle version （eg.1.1）or CommitID
29+
-CPU: including CPUMKL/OpenBlas/MKLDNN version
30+
-GPU: including CUDA/CUDNN version
31+
-OS Platform (eg.Mac OS 10.14)
32+
-Other imformation: Distriuted training/informantion of operator/
33+
Graphics card storage
34+
**To Reproduce**
35+
Steps to reproduce the behavior
36+
**Describe your current behavior**
37+
**Code to reproduce the issue**
38+
**Other info / logs**

‎CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,9 @@ include(external/eigen) # download eigen3
204204
include(external/pybind11) # download pybind11
205205
include(external/cares)
206206
include(external/cub)
207+
include(external/rocprim)
207208
include(external/xxhash) # download xxhash
209+
include(external/dlpack)
208210
include(external/snappy) # download snappy
209211
include(external/snappystream) # download snappystream
210212

‎Dockerfile

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,27 @@ ENV HOME /root
2222
# Add bash enhancements
2323
COPY ./paddle/scripts/docker/root/ /root/
2424

25+
# Prepare packages for Python
26+
RUN apt-get update && \
27+
apt-get install -y make build-essential libssl-dev zlib1g-dev libbz2-dev \
28+
libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev libncursesw5-dev \
29+
xz-utils tk-dev libffi-dev liblzma-dev
30+
31+
# Install Python3.6
32+
RUN mkdir -p /root/python_build/ && wget -q https://www.sqlite.org/2018/sqlite-autoconf-3250300.tar.gz && \
33+
tar -zxf sqlite-autoconf-3250300.tar.gz && cd sqlite-autoconf-3250300 && \
34+
./configure -prefix=/usr/local && make -j8 && make install && cd ../ && rm sqlite-autoconf-3250300.tar.gz && \
35+
wget -q https://www.python.org/ftp/python/3.6.0/Python-3.6.0.tgz && \
36+
tar -xzf Python-3.6.0.tgz && cd Python-3.6.0 && \
37+
CFLAGS="-Wformat" ./configure --prefix=/usr/local/ --enable-shared > /dev/null && \
38+
make -j8 > /dev/null && make altinstall > /dev/null
39+
40+
# Install Python3.7
41+
RUN wget -q https://www.python.org/ftp/python/3.7.0/Python-3.7.0.tgz && \
42+
tar -xzf Python-3.7.0.tgz && cd Python-3.7.0 && \
43+
CFLAGS="-Wformat" ./configure --prefix=/usr/local/ --enable-shared > /dev/null && \
44+
make -j8 > /dev/null && make altinstall > /dev/null
45+
2546
RUN apt-get update && \
2647
apt-get install -y --allow-downgrades patchelf \
2748
python3 python3-dev python3-pip \
@@ -74,6 +95,12 @@ RUN localedef -i en_US -f UTF-8 en_US.UTF-8
7495
RUN pip3 install -U wheel && \
7596
pip3 install -U docopt PyYAML sphinx==1.5.6 && \
7697
pip3 install sphinx-rtd-theme==0.1.9 recommonmark && \
98+
pip3.6 install -U wheel && \
99+
pip3.6 install -U docopt PyYAML sphinx==1.5.6 && \
100+
pip3.6 install sphinx-rtd-theme==0.1.9 recommonmark && \
101+
pip3.7 install -U wheel && \
102+
pip3.7 install -U docopt PyYAML sphinx==1.5.6 && \
103+
pip3.7 install sphinx-rtd-theme==0.1.9 recommonmark && \
77104
easy_install -U pip && \
78105
pip install -U pip setuptools wheel && \
79106
pip install -U docopt PyYAML sphinx==1.5.6 && \
@@ -82,22 +109,34 @@ RUN pip3 install -U wheel && \
82109
RUN pip3 install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
83110
pip3 install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
84111
pip3 install opencv-python && \
112+
pip3.6 install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
113+
pip3.6 install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
114+
pip3.6 install opencv-python && \
115+
pip3.7 install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
116+
pip3.7 install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
117+
pip3.7 install opencv-python && \
85118
pip install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
86119
pip install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
87120
pip install opencv-python
88121

89122
#For docstring checker
90123
RUN pip3 install pylint pytest astroid isort
124+
RUN pip3.6 install pylint pytest astroid isort
125+
RUN pip3.7 install pylint pytest astroid isort
91126
RUN pip install pylint pytest astroid isort LinkChecker
92127

93128
COPY ./python/requirements.txt /root/
94129
RUN pip3 install -r /root/requirements.txt
130+
RUN pip3.6 install -r /root/requirements.txt
131+
RUN pip3.7 install -r /root/requirements.txt
95132
RUN pip install -r /root/requirements.txt
96133

97134
# To fix https://github.com/PaddlePaddle/Paddle/issues/1954, we use
98135
# the solution in https://urllib3.readthedocs.io/en/latest/user-guide.html#ssl-py2
99136
RUN apt-get install -y libssl-dev libffi-dev
100137
RUN pip3 install certifi urllib3[secure]
138+
RUN pip3.6 install certifi urllib3[secure]
139+
RUN pip3.7 install certifi urllib3[secure]
101140
RUN pip install certifi urllib3[secure]
102141

103142

‎cmake/external/dlpack.cmake

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
include(ExternalProject)
2+
3+
set(DLPACK_SOURCE_DIR ${THIRD_PARTY_PATH}/dlpack)
4+
set(DLPACK_INCLUDE_DIR ${DLPACK_SOURCE_DIR}/src/extern_dlpack/include)
5+
6+
include_directories(${DLPACK_INCLUDE_DIR})
7+
8+
ExternalProject_Add(
9+
extern_dlpack
10+
${EXTERNAL_PROJECT_LOG_ARGS}
11+
GIT_REPOSITORY "https://github.com/dmlc/dlpack.git"
12+
GIT_TAG "v0.2"
13+
PREFIX ${DLPACK_SOURCE_DIR}
14+
UPDATE_COMMAND ""
15+
CONFIGURE_COMMAND ""
16+
BUILD_COMMAND ""
17+
INSTALL_COMMAND ""
18+
TEST_COMMAND ""
19+
)
20+
21+
if(${CMAKE_VERSION} VERSION_LESS "3.3.0")
22+
set(dummyfile ${CMAKE_CURRENT_BINARY_DIR}/dlpack_dummy.c)
23+
file(WRITE ${dummyfile} "const char *dummy = \"${dummyfile}\";")
24+
add_library(dlpack STATIC ${dummyfile})
25+
else()
26+
add_library(dlpack INTERFACE)
27+
endif()
28+
29+
add_dependencies(dlpack extern_dlpack)
30+
31+
LIST(APPEND externl_project_dependencies dlpack)

‎cmake/external/mkldnn.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ ExternalProject_Add(
5353
${EXTERNAL_PROJECT_LOG_ARGS}
5454
DEPENDS ${MKLDNN_DEPENDS}
5555
GIT_REPOSITORY "https://github.com/01org/mkl-dnn.git"
56-
GIT_TAG "21fb5f2af1dd14e132af4f1b79160977ee487818"
56+
GIT_TAG "830a10059a018cd2634d94195140cf2d8790a75a"
5757
PREFIX ${MKLDNN_SOURCES_DIR}
5858
UPDATE_COMMAND ""
5959
CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}

0 commit comments

Comments
 (0)