Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
e9acd9c9
P
Paddle
项目概览
PaddlePaddle
/
Paddle
1 年多 前同步成功
通知
2302
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
e9acd9c9
编写于
11月 25, 2020
作者:
T
tianshuo78520a
提交者:
GitHub
11月 25, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update CI Python3 Docker for Cuda11 (#28401)
上级
b04c78ef
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
69 addition
and
18 deletion
+69
-18
python/paddle/fluid/tests/unittests/dygraph_to_static/CMakeLists.txt
...le/fluid/tests/unittests/dygraph_to_static/CMakeLists.txt
+4
-1
tools/dockerfile/build_scripts/build.sh
tools/dockerfile/build_scripts/build.sh
+23
-8
tools/dockerfile/build_scripts/install_gcc.sh
tools/dockerfile/build_scripts/install_gcc.sh
+16
-1
tools/dockerfile/build_scripts/install_nccl2.sh
tools/dockerfile/build_scripts/install_nccl2.sh
+17
-0
tools/dockerfile/centos6_manylinux.sh
tools/dockerfile/centos6_manylinux.sh
+8
-0
tools/dockerfile/ci_dockerfile.sh
tools/dockerfile/ci_dockerfile.sh
+1
-8
未找到文件。
python/paddle/fluid/tests/unittests/dygraph_to_static/CMakeLists.txt
浏览文件 @
e9acd9c9
file
(
GLOB TEST_OPS RELATIVE
"
${
CMAKE_CURRENT_SOURCE_DIR
}
"
"test_*.py"
)
file
(
GLOB TEST_OPS RELATIVE
"
${
CMAKE_CURRENT_SOURCE_DIR
}
"
"test_*.py"
)
string
(
REPLACE
".py"
""
TEST_OPS
"
${
TEST_OPS
}
"
)
string
(
REPLACE
".py"
""
TEST_OPS
"
${
TEST_OPS
}
"
)
# disable for cuda11
list
(
REMOVE_ITEM TEST_OPS test_mnist
)
foreach
(
TEST_OP
${
TEST_OPS
}
)
foreach
(
TEST_OP
${
TEST_OPS
}
)
py_test_modules
(
${
TEST_OP
}
MODULES
${
TEST_OP
}
)
py_test_modules
(
${
TEST_OP
}
MODULES
${
TEST_OP
}
)
endforeach
(
TEST_OP
)
endforeach
(
TEST_OP
)
...
@@ -16,8 +19,8 @@ set_tests_properties(test_bert PROPERTIES TIMEOUT 120)
...
@@ -16,8 +19,8 @@ set_tests_properties(test_bert PROPERTIES TIMEOUT 120)
set_tests_properties
(
test_basic_api_transformation PROPERTIES TIMEOUT 120
)
set_tests_properties
(
test_basic_api_transformation PROPERTIES TIMEOUT 120
)
set_tests_properties
(
test_reinforcement_learning PROPERTIES TIMEOUT 120
)
set_tests_properties
(
test_reinforcement_learning PROPERTIES TIMEOUT 120
)
set_tests_properties
(
test_transformer PROPERTIES TIMEOUT 200
)
set_tests_properties
(
test_transformer PROPERTIES TIMEOUT 200
)
set_tests_properties
(
test_mnist PROPERTIES TIMEOUT 120
)
set_tests_properties
(
test_bmn PROPERTIES TIMEOUT 120
)
set_tests_properties
(
test_bmn PROPERTIES TIMEOUT 120
)
#set_tests_properties(test_mnist PROPERTIES TIMEOUT 120)
if
(
NOT WIN32
)
if
(
NOT WIN32
)
set_tests_properties
(
test_resnet_v2 PROPERTIES TIMEOUT 120
)
set_tests_properties
(
test_resnet_v2 PROPERTIES TIMEOUT 120
)
...
...
tools/dockerfile/build_scripts/build.sh
浏览文件 @
e9acd9c9
#!/bin/bash
#!/bin/bash
# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# Top-level build script called from Dockerfile
# Top-level build script called from Dockerfile
# Stop at any error, show all commands
# Stop at any error, show all commands
...
@@ -35,16 +50,16 @@ MY_DIR=$(dirname "${BASH_SOURCE[0]}")
...
@@ -35,16 +50,16 @@ MY_DIR=$(dirname "${BASH_SOURCE[0]}")
source
$MY_DIR
/build_utils.sh
source
$MY_DIR
/build_utils.sh
# EPEL support
# EPEL support
yum
-y
install
wget curl
yum
-y
install
wget curl
epel-release
curl
-sLO
https://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm
#
curl -sLO https://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm
check_sha256sum epel-release-6-8.noarch.rpm
$EPEL_RPM_HASH
#
check_sha256sum epel-release-6-8.noarch.rpm $EPEL_RPM_HASH
# Dev toolset (for LLVM and other projects requiring C++11 support)
# Dev toolset (for LLVM and other projects requiring C++11 support)
curl
-sLO
http://people.centos.org/tru/devtools-2/devtools-2.repo
#
curl -sLO http://people.centos.org/tru/devtools-2/devtools-2.repo
check_sha256sum devtools-2.repo
$DEVTOOLS_HASH
#
check_sha256sum devtools-2.repo $DEVTOOLS_HASH
mv
devtools-2.repo /etc/yum.repos.d/devtools-2.repo
#
mv devtools-2.repo /etc/yum.repos.d/devtools-2.repo
rpm
-Uvh
--replacepkgs
epel-release-6
*
.rpm
#
rpm -Uvh --replacepkgs epel-release-6*.rpm
rm
-f
epel-release-6
*
.rpm
#
rm -f epel-release-6*.rpm
# Development tools and libraries
# Development tools and libraries
yum
-y
install
bzip2 make git patch unzip bison yasm diffutils
\
yum
-y
install
bzip2 make git patch unzip bison yasm diffutils
\
...
...
tools/dockerfile/build_scripts/install_gcc.sh
浏览文件 @
e9acd9c9
#!/bin/bash
#!/bin/bash
# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# Top-level build script called from Dockerfile
# Top-level build script called from Dockerfile
# Stop at any error, show all commands
# Stop at any error, show all commands
...
@@ -15,7 +30,7 @@ else
...
@@ -15,7 +30,7 @@ else
fi
fi
if
[
"
$1
"
==
"gcc82"
]
;
then
if
[
"
$1
"
==
"gcc82"
]
;
then
wget https://paddle-ci.gz.bcebos.com/gcc-8.2.0.tar.xz
wget
-q
https://paddle-ci.gz.bcebos.com/gcc-8.2.0.tar.xz
tar
-xvf
gcc-8.2.0.tar.xz
&&
\
tar
-xvf
gcc-8.2.0.tar.xz
&&
\
cd
gcc-8.2.0
&&
\
cd
gcc-8.2.0
&&
\
unset
LIBRARY_PATH CPATH C_INCLUDE_PATH PKG_CONFIG_PATH CPLUS_INCLUDE_PATH INCLUDE
&&
\
unset
LIBRARY_PATH CPATH C_INCLUDE_PATH PKG_CONFIG_PATH CPLUS_INCLUDE_PATH INCLUDE
&&
\
...
...
tools/dockerfile/build_scripts/install_nccl2.sh
浏览文件 @
e9acd9c9
#!/bin/bash
#!/bin/bash
# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
VERSION
=
$(
nvcc
--version
|
grep
release |
grep
-oEi
"release ([0-9]+)
\.
([0-9])"
|
sed
"s/release //"
)
VERSION
=
$(
nvcc
--version
|
grep
release |
grep
-oEi
"release ([0-9]+)
\.
([0-9])"
|
sed
"s/release //"
)
if
[
"
$VERSION
"
==
"10.0"
]
;
then
if
[
"
$VERSION
"
==
"10.0"
]
;
then
DEB
=
"nccl-repo-ubuntu1604-2.4.7-ga-cuda10.0_1-1_amd64.deb"
DEB
=
"nccl-repo-ubuntu1604-2.4.7-ga-cuda10.0_1-1_amd64.deb"
elif
[
"
$VERSION
"
==
"11.0"
]
;
then
DEB
=
"nccl-repo-ubuntu1604-2.7.8-ga-cuda11.0_1-1_amd64.deb"
elif
[
"
$VERSION
"
==
"10.2"
]
;
then
elif
[
"
$VERSION
"
==
"10.2"
]
;
then
DEB
=
"nccl-repo-ubuntu1604-2.4.7-ga-cuda10.0_1-1_amd64.deb"
DEB
=
"nccl-repo-ubuntu1604-2.4.7-ga-cuda10.0_1-1_amd64.deb"
elif
[
"
$VERSION
"
==
"10.1"
]
;
then
elif
[
"
$VERSION
"
==
"10.1"
]
;
then
...
...
tools/dockerfile/centos6_manylinux.sh
浏览文件 @
e9acd9c9
...
@@ -38,6 +38,11 @@ function make_cuda102cudnn7() {
...
@@ -38,6 +38,11 @@ function make_cuda102cudnn7() {
sed
-i
"s#COPY build_scripts /build_scripts#COPY build_scripts /build_scripts
\n
RUN bash build_scripts/install_gcc.sh gcc82
\n
ENV PATH=/usr/local/gcc-8.2/bin:
\$
PATH#g"
Dockerfile.tmp
sed
-i
"s#COPY build_scripts /build_scripts#COPY build_scripts /build_scripts
\n
RUN bash build_scripts/install_gcc.sh gcc82
\n
ENV PATH=/usr/local/gcc-8.2/bin:
\$
PATH#g"
Dockerfile.tmp
}
}
function
make_cuda11cudnn8
()
{
sed
's/<baseimg>/11.0-cudnn8-devel-centos7/g'
Dockerfile.centos
>
Dockerfile.tmp
sed
-i
"s#COPY build_scripts /build_scripts#COPY build_scripts /build_scripts
\n
RUN bash build_scripts/install_gcc.sh gcc82
\n
ENV PATH=/usr/local/gcc-8.2/bin:
\$
PATH#g"
Dockerfile.tmp
}
function
main
()
{
function
main
()
{
local
CMD
=
$1
local
CMD
=
$1
...
@@ -54,6 +59,9 @@ function main() {
...
@@ -54,6 +59,9 @@ function main() {
cuda102cudnn7
)
cuda102cudnn7
)
make_cuda102cudnn7
make_cuda102cudnn7
;;
;;
cuda11cudnn8
)
make_cuda11cudnn8
;;
*
)
*
)
echo
"Make dockerfile error, Without this paramet."
echo
"Make dockerfile error, Without this paramet."
exit
1
exit
1
...
...
tools/dockerfile/ci_dockerfile.sh
浏览文件 @
e9acd9c9
...
@@ -38,7 +38,7 @@ function make_ubuntu_dockerfile(){
...
@@ -38,7 +38,7 @@ function make_ubuntu_dockerfile(){
function
make_centos_dockerfile
(){
function
make_centos_dockerfile
(){
dockerfile_name
=
"Dockerfile.cuda9_cudnn7_gcc48_py35_centos6"
dockerfile_name
=
"Dockerfile.cuda9_cudnn7_gcc48_py35_centos6"
sed
"s/<baseimg>/1
0.2-cudnn7-devel-centos6
/g"
Dockerfile.centos
>
${
dockerfile_name
}
sed
"s/<baseimg>/1
1.0-cudnn8-devel-centos7
/g"
Dockerfile.centos
>
${
dockerfile_name
}
sed
-i
"s#COPY build_scripts /build_scripts#COPY tools/dockerfile/build_scripts ./build_scripts#g"
${
dockerfile_name
}
sed
-i
"s#COPY build_scripts /build_scripts#COPY tools/dockerfile/build_scripts ./build_scripts#g"
${
dockerfile_name
}
dockerfile_line
=
$(
wc
-l
${
dockerfile_name
}
|awk
'{print $1}'
)
dockerfile_line
=
$(
wc
-l
${
dockerfile_name
}
|awk
'{print $1}'
)
sed
-i
"
${
dockerfile_line
}
i RUN ln -s /usr/lib64/libz.so /usr/local/lib/libz.so
\\
sed
-i
"
${
dockerfile_line
}
i RUN ln -s /usr/lib64/libz.so /usr/local/lib/libz.so
\\
...
@@ -46,13 +46,6 @@ function make_centos_dockerfile(){
...
@@ -46,13 +46,6 @@ function make_centos_dockerfile(){
RUN rm -rf /usr/include/NvInfer*"
${
dockerfile_name
}
RUN rm -rf /usr/include/NvInfer*"
${
dockerfile_name
}
sed
-i
$"
${
dockerfile_line
}
i RUN wget --no-check-certificate -q https://paddle-edl.bj.bcebos.com/hadoop-2.7.7.tar.gz
\\
sed
-i
$"
${
dockerfile_line
}
i RUN wget --no-check-certificate -q https://paddle-edl.bj.bcebos.com/hadoop-2.7.7.tar.gz
\\
RUN tar -xzf hadoop-2.7.7.tar.gz && mv hadoop-2.7.7 /usr/local/"
${
dockerfile_name
}
RUN tar -xzf hadoop-2.7.7.tar.gz && mv hadoop-2.7.7 /usr/local/"
${
dockerfile_name
}
sed
-i
"s#RUN bash build_scripts/install_nccl2.sh##g"
${
dockerfile_name
}
sed
-i
"
${
dockerfile_line
}
i RUN wget --no-check-certificate -q https://nccl2-deb.cdn.bcebos.com/libnccl-2.7.8-1+cuda10.2.x86_64.rpm
\\
RUN wget --no-check-certificate -q https://nccl2-deb.cdn.bcebos.com/libnccl-devel-2.7.8-1+cuda10.2.x86_64.rpm
\\
RUN wget --no-check-certificate -q https://nccl2-deb.cdn.bcebos.com/libnccl-static-2.7.8-1+cuda10.2.x86_64.rpm
\\
RUN rpm -ivh libnccl-2.7.8-1+cuda10.2.x86_64.rpm
\\
RUN rpm -ivh libnccl-devel-2.7.8-1+cuda10.2.x86_64.rpm
\\
RUN rpm -ivh libnccl-static-2.7.8-1+cuda10.2.x86_64.rpm && rm -f /usr/local/include/nccl.h "
${
dockerfile_name
}
sed
-i
"s#<install_gcc>#WORKDIR /usr/bin
\\
sed
-i
"s#<install_gcc>#WORKDIR /usr/bin
\\
COPY tools/dockerfile/build_scripts /build_scripts
\\
COPY tools/dockerfile/build_scripts /build_scripts
\\
RUN bash /build_scripts/install_gcc.sh gcc82
\&\&
rm -rf /build_scripts
\\
RUN bash /build_scripts/install_gcc.sh gcc82
\&\&
rm -rf /build_scripts
\\
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录