Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
1a4edcb0
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 2 年 前同步成功
通知
2325
Star
20933
Fork
5424
代码
文件
提交
分支
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看板
未验证
提交
1a4edcb0
编写于
2月 06, 2023
作者:
M
Matsumoto Ruko
提交者:
GitHub
2月 06, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[CodeStyle][py36] Update dockerfile and some script (#49558)
上级
fcec564c
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
22 addition
and
123 deletion
+22
-123
paddle/scripts/conda_build.py
paddle/scripts/conda_build.py
+6
-6
paddle/scripts/paddle_build.sh
paddle/scripts/paddle_build.sh
+15
-85
tools/dockerfile/ci_dockerfile.sh
tools/dockerfile/ci_dockerfile.sh
+1
-2
tools/dockerfile/ubuntu16_dev.sh
tools/dockerfile/ubuntu16_dev.sh
+0
-15
tools/dockerfile/ubuntu18_dev.sh
tools/dockerfile/ubuntu18_dev.sh
+0
-15
未找到文件。
paddle/scripts/conda_build.py
浏览文件 @
1a4edcb0
...
@@ -90,16 +90,16 @@ about:
...
@@ -90,16 +90,16 @@ about:
self
.
blt_const
=
r
"""
self
.
blt_const
=
r
"""
"""
"""
self
.
python36
=
r
" - python>=3.6, <3.7"
self
.
python37
=
r
" - python>=3.7, <3.8"
self
.
python37
=
r
" - python>=3.7, <3.8"
self
.
python38
=
r
" - python>=3.8, <3.9"
self
.
python38
=
r
" - python>=3.8, <3.9"
self
.
python39
=
r
" - python>=3.9, <3.10"
self
.
python39
=
r
" - python>=3.9, <3.10"
self
.
python310
=
r
" - python>=3.10, <3.11"
self
.
python_version
=
[
self
.
python_version
=
[
self
.
python36
,
self
.
python37
,
self
.
python37
,
self
.
python38
,
self
.
python38
,
self
.
python39
,
self
.
python39
,
self
.
python310
,
]
]
self
.
cuda101
=
r
"""
self
.
cuda101
=
r
"""
...
@@ -120,29 +120,29 @@ about:
...
@@ -120,29 +120,29 @@ about:
(
self
.
cuda102
,
"cuda10.2"
,
""
),
(
self
.
cuda102
,
"cuda10.2"
,
""
),
(
self
.
cuda112
,
"cuda11.2"
,
".post112"
),
(
self
.
cuda112
,
"cuda11.2"
,
".post112"
),
]
]
self
.
py_str
=
[
"py3
6"
,
"py37"
,
"py38"
,
"py39
"
]
self
.
py_str
=
[
"py3
7"
,
"py38"
,
"py39"
,
"py310
"
]
self
.
pip_end
=
".whl --no-deps"
self
.
pip_end
=
".whl --no-deps"
self
.
pip_prefix_linux
=
"pip install /package/paddlepaddle"
self
.
pip_prefix_linux
=
"pip install /package/paddlepaddle"
self
.
pip_prefix_windows
=
r
"pip install C:\package\paddlepaddle"
self
.
pip_prefix_windows
=
r
"pip install C:\package\paddlepaddle"
self
.
pip_gpu
=
"_gpu-"
self
.
pip_gpu
=
"_gpu-"
self
.
pip_cpu
=
"-"
self
.
pip_cpu
=
"-"
self
.
mac_pip
=
[
self
.
mac_pip
=
[
"-cp36-cp36m-macosx_10_6_intel"
,
"-cp37-cp37m-macosx_10_6_intel"
,
"-cp37-cp37m-macosx_10_6_intel"
,
"-cp38-cp38-macosx_10_14_x86_64"
,
"-cp38-cp38-macosx_10_14_x86_64"
,
"-cp39-cp39-macosx_10_14_x86_64"
,
"-cp39-cp39-macosx_10_14_x86_64"
,
"-cp310-cp310-macosx_10_14_x86_64"
,
]
]
self
.
linux_pip
=
[
self
.
linux_pip
=
[
"-cp36-cp36m-linux_x86_64"
,
"-cp37-cp37m-linux_x86_64"
,
"-cp37-cp37m-linux_x86_64"
,
"-cp38-cp38-linux_x86_64"
,
"-cp38-cp38-linux_x86_64"
,
"-cp39-cp39-linux_x86_64"
,
"-cp39-cp39-linux_x86_64"
,
"-cp310-cp310-linux_x86_64"
,
]
]
self
.
windows_pip
=
[
self
.
windows_pip
=
[
"-cp36-cp36m-win_amd64"
,
"-cp37-cp37m-win_amd64"
,
"-cp37-cp37m-win_amd64"
,
"-cp38-cp38-win_amd64"
,
"-cp38-cp38-win_amd64"
,
"-cp39-cp39-win_amd64"
,
"-cp39-cp39-win_amd64"
,
"-cp310-cp310-win_amd64"
,
]
]
...
...
paddle/scripts/paddle_build.sh
浏览文件 @
1a4edcb0
...
@@ -77,19 +77,7 @@ function cmake_base() {
...
@@ -77,19 +77,7 @@ function cmake_base() {
SYSTEM
=
`
uname
-s
`
SYSTEM
=
`
uname
-s
`
if
[
"
$SYSTEM
"
==
"Darwin"
]
;
then
if
[
"
$SYSTEM
"
==
"Darwin"
]
;
then
echo
"Using python abi:
$1
"
echo
"Using python abi:
$1
"
if
[
"
$1
"
==
"cp36-cp36m"
]
||
[
"
$1
"
==
""
]
;
then
if
[
"
$1
"
==
"cp37-cp37m"
]
||
[
"
$1
"
==
""
]
;
then
if
[
-d
"/Library/Frameworks/Python.framework/Versions/3.6"
]
;
then
export
LD_LIBRARY_PATH
=
/Library/Frameworks/Python.framework/Versions/3.6/lib/
export
DYLD_LIBRARY_PATH
=
${
DYLD_LIBRARY_PATH
}
:/Library/Frameworks/Python.framework/Versions/3.6/lib/
export
PATH
=
/Library/Frameworks/Python.framework/Versions/3.6/bin/:
${
PATH
}
PYTHON_FLAGS
=
"-DPYTHON_EXECUTABLE:FILEPATH=/Library/Frameworks/Python.framework/Versions/3.6/bin/python3
-DPYTHON_INCLUDE_DIR:PATH=/Library/Frameworks/Python.framework/Versions/3.6/include/python3.6m/
-DPYTHON_LIBRARY:FILEPATH=/Library/Frameworks/Python.framework/Versions/3.6/lib/libpython3.6m.dylib"
pip3.6
install
--user
-r
${
PADDLE_ROOT
}
/python/requirements.txt
else
exit
1
fi
elif
[
"
$1
"
==
"cp37-cp37m"
]
;
then
if
[
-d
"/Library/Frameworks/Python.framework/Versions/3.7"
]
;
then
if
[
-d
"/Library/Frameworks/Python.framework/Versions/3.7"
]
;
then
export
LD_LIBRARY_PATH
=
/Library/Frameworks/Python.framework/Versions/3.7/lib/
export
LD_LIBRARY_PATH
=
/Library/Frameworks/Python.framework/Versions/3.7/lib/
export
DYLD_LIBRARY_PATH
=
${
DYLD_LIBRARY_PATH
}
:/Library/Frameworks/Python.framework/Versions/3.7/lib/
export
DYLD_LIBRARY_PATH
=
${
DYLD_LIBRARY_PATH
}
:/Library/Frameworks/Python.framework/Versions/3.7/lib/
...
@@ -141,14 +129,7 @@ function cmake_base() {
...
@@ -141,14 +129,7 @@ function cmake_base() {
else
else
if
[
"
$1
"
!=
""
]
;
then
if
[
"
$1
"
!=
""
]
;
then
echo
"using python abi:
$1
"
echo
"using python abi:
$1
"
if
[
"
$1
"
==
"cp36-cp36m"
]
;
then
if
[
"
$1
"
==
"cp37-cp37m"
]
;
then
export
LD_LIBRARY_PATH
=
/opt/_internal/cpython-3.6.0/lib/:
${
LD_LIBRARY_PATH
}
export
PATH
=
/opt/_internal/cpython-3.6.0/bin/:
${
PATH
}
export
PYTHON_FLAGS
=
"-DPYTHON_EXECUTABLE:FILEPATH=/opt/_internal/cpython-3.6.0/bin/python3
-DPYTHON_INCLUDE_DIR:PATH=/opt/_internal/cpython-3.6.0/include/python3.6m
-DPYTHON_LIBRARIES:FILEPATH=/opt/_internal/cpython-3.6.0/lib/libpython3.so"
pip3.6
install
-r
${
PADDLE_ROOT
}
/python/requirements.txt
elif
[
"
$1
"
==
"cp37-cp37m"
]
;
then
export
LD_LIBRARY_PATH
=
/opt/_internal/cpython-3.7.0/lib/:
${
LD_LIBRARY_PATH
}
export
LD_LIBRARY_PATH
=
/opt/_internal/cpython-3.7.0/lib/:
${
LD_LIBRARY_PATH
}
export
PATH
=
/opt/_internal/cpython-3.7.0/bin/:
${
PATH
}
export
PATH
=
/opt/_internal/cpython-3.7.0/bin/:
${
PATH
}
export
PYTHON_FLAGS
=
"-DPYTHON_EXECUTABLE:FILEPATH=/opt/_internal/cpython-3.7.0/bin/python3.7
export
PYTHON_FLAGS
=
"-DPYTHON_EXECUTABLE:FILEPATH=/opt/_internal/cpython-3.7.0/bin/python3.7
...
@@ -645,9 +626,7 @@ EOF
...
@@ -645,9 +626,7 @@ EOF
set
-x
set
-x
set
+ex
set
+ex
if
[
"
$1
"
==
"cp36-cp36m"
]
;
then
if
[
"
$1
"
==
"cp37-cp37m"
]
;
then
pip3.6 uninstall
-y
paddlepaddle
elif
[
"
$1
"
==
"cp37-cp37m"
]
;
then
pip3.7 uninstall
-y
paddlepaddle
pip3.7 uninstall
-y
paddlepaddle
elif
[
"
$1
"
==
"cp38-cp38"
]
;
then
elif
[
"
$1
"
==
"cp38-cp38"
]
;
then
pip3.8 uninstall
-y
paddlepaddle
pip3.8 uninstall
-y
paddlepaddle
...
@@ -658,10 +637,7 @@ EOF
...
@@ -658,10 +637,7 @@ EOF
fi
fi
set
-ex
set
-ex
if
[
"
$1
"
==
"cp36-cp36m"
]
;
then
if
[
"
$1
"
==
"cp37-cp37m"
]
;
then
pip3.6
install
--user
${
PADDLE_ROOT
}
/dist/
*
.whl
pip3.6
install
--user
hypothesis
elif
[
"
$1
"
==
"cp37-cp37m"
]
;
then
pip3.7
install
--user
${
PADDLE_ROOT
}
/dist/
*
.whl
pip3.7
install
--user
${
PADDLE_ROOT
}
/dist/
*
.whl
pip3.7
install
--user
hypothesis
pip3.7
install
--user
hypothesis
elif
[
"
$1
"
==
"cp38-cp38"
]
;
then
elif
[
"
$1
"
==
"cp38-cp38"
]
;
then
...
@@ -3024,44 +3000,27 @@ EOF
...
@@ -3024,44 +3000,27 @@ EOF
ref_web
=
https://paddle-wheel.bj.bcebos.com/
${
PADDLE_BRANCH
}
-
${
ref_gpu
}
-
${
ref_mkl
}
ref_web
=
https://paddle-wheel.bj.bcebos.com/
${
PADDLE_BRANCH
}
-
${
ref_gpu
}
-
${
ref_mkl
}
ref_paddle36
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp36-cp36m-linux_x86_64
.whl
ref_paddle37
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle37
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle38
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp38-cp38-linux_x86_64
.whl
ref_paddle38
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp38-cp38-linux_x86_64
.whl
ref_paddle39
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp39-cp39-linux_x86_64
.whl
ref_paddle39
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp39-cp39-linux_x86_64
.whl
ref_paddle310
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp310-cp310-linux_x86_64
.whl
ref_paddle310
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp310-cp310-linux_x86_64
.whl
ref_paddle36_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp36-cp36m-linux_x86_64
.whl
ref_paddle37_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle37_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle38_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp38-cp38-linux_x86_64
.whl
ref_paddle38_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp38-cp38-linux_x86_64
.whl
ref_paddle39_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp39-cp39-linux_x86_64
.whl
ref_paddle39_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp39-cp39-linux_x86_64
.whl
ref_paddle310_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp310-cp310-linux_x86_64
.whl
ref_paddle310_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
-cp310-cp310-linux_x86_64
.whl
if
[[
${
PADDLE_BRANCH
}
!=
"0.0.0"
&&
${
WITH_MKL
}
==
"ON"
&&
${
WITH_GPU
}
==
"ON"
]]
;
then
if
[[
${
PADDLE_BRANCH
}
!=
"0.0.0"
&&
${
WITH_MKL
}
==
"ON"
&&
${
WITH_GPU
}
==
"ON"
]]
;
then
ref_paddle36
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
.post
${
ref_CUDA_MAJOR
}${
CUDNN_MAJOR
}
-cp36-cp36m-linux_x86_64
.whl
ref_paddle37
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
.post
${
ref_CUDA_MAJOR
}${
CUDNN_MAJOR
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle37
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
.post
${
ref_CUDA_MAJOR
}${
CUDNN_MAJOR
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle38
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
.post
${
ref_CUDA_MAJOR
}${
CUDNN_MAJOR
}
-cp38-cp38-linux_x86_64
.whl
ref_paddle38
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
.post
${
ref_CUDA_MAJOR
}${
CUDNN_MAJOR
}
-cp38-cp38-linux_x86_64
.whl
ref_paddle39
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
.post
${
ref_CUDA_MAJOR
}${
CUDNN_MAJOR
}
-cp39-cp39-linux_x86_64
.whl
ref_paddle39
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
.post
${
ref_CUDA_MAJOR
}${
CUDNN_MAJOR
}
-cp39-cp39-linux_x86_64
.whl
ref_paddle310
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
.post
${
ref_CUDA_MAJOR
}${
CUDNN_MAJOR
}
-cp310-cp310-linux_x86_64
.whl
ref_paddle310
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
.post
${
ref_CUDA_MAJOR
}${
CUDNN_MAJOR
}
-cp310-cp310-linux_x86_64
.whl
ref_paddle36_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
.post
${
ref_CUDA_MAJOR
}${
CUDNN_MAJOR
}
-cp36-cp36m-linux_x86_64
.whl
ref_paddle37_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
.post
${
ref_CUDA_MAJOR
}${
CUDNN_MAJOR
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle37_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
.post
${
ref_CUDA_MAJOR
}${
CUDNN_MAJOR
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle38_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
.post
${
ref_CUDA_MAJOR
}${
CUDNN_MAJOR
}
-cp38-cp38-linux_x86_64
.whl
ref_paddle38_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
.post
${
ref_CUDA_MAJOR
}${
CUDNN_MAJOR
}
-cp38-cp38-linux_x86_64
.whl
ref_paddle39_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
.post
${
ref_CUDA_MAJOR
}${
CUDNN_MAJOR
}
-cp39-cp39-linux_x86_64
.whl
ref_paddle39_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
.post
${
ref_CUDA_MAJOR
}${
CUDNN_MAJOR
}
-cp39-cp39-linux_x86_64
.whl
ref_paddle310_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
.post
${
ref_CUDA_MAJOR
}${
CUDNN_MAJOR
}
-cp310-cp310-linux_x86_64
.whl
ref_paddle310_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_BRANCH
}
.post
${
ref_CUDA_MAJOR
}${
CUDNN_MAJOR
}
-cp310-cp310-linux_x86_64
.whl
fi
fi
ref_paddle36_mv1
=
""
ref_paddle36_mv2
=
""
if
[[
${
PADDLE_BRANCH
}
==
"0.0.0"
&&
${
WITH_GPU
}
==
"ON"
]]
;
then
ref_paddle36_whl
=
paddlepaddle_gpu-1.5.1-cp36-cp36m-linux_x86_64.whl
ref_paddle36_mv1
=
"mv
${
ref_paddle36
}
${
ref_paddle36_whl
}
&&"
ref_paddle36_mv2
=
"&& mv
${
ref_paddle36_whl
}
${
ref_paddle36
}
"
fi
if
[[
${
PADDLE_BRANCH
}
==
"0.0.0"
&&
${
WITH_GPU
}
!=
"ON"
]]
;
then
ref_paddle36_whl
=
paddlepaddle-1.5.1-cp36-cp36m-linux_x86_64.whl
ref_paddle36_mv1
=
"mv
${
ref_paddle36
}
${
ref_paddle36_whl
}
&&"
ref_paddle36_mv2
=
"&& mv
${
ref_paddle36_whl
}
${
ref_paddle36
}
"
fi
cat
>
${
PADDLE_ROOT
}
/build/Dockerfile
<<
EOF
cat
>
${
PADDLE_ROOT
}
/build/Dockerfile
<<
EOF
FROM
${
BASE_IMAGE
}
FROM
${
BASE_IMAGE
}
MAINTAINER PaddlePaddle Authors <paddle-dev@baidu.com>
MAINTAINER PaddlePaddle Authors <paddle-dev@baidu.com>
...
@@ -3092,25 +3051,6 @@ EOF
...
@@ -3092,25 +3051,6 @@ EOF
${
DOCKERFILE_CUBLAS_DSO
}
${
DOCKERFILE_CUBLAS_DSO
}
${
DOCKERFILE_CUBLASLT_DSO
}
${
DOCKERFILE_CUBLASLT_DSO
}
${
DOCKERFILE_GPU_ENV
}
${
DOCKERFILE_GPU_ENV
}
EOF
cat
>>
${
PADDLE_ROOT
}
/build/Dockerfile
<<
EOF
# run paddle version to install python packages first
RUN apt-get update &&
${
NCCL_DEPS
}
RUN apt-get install -y make build-essential libssl-dev zlib1g-dev libbz2-dev
\
libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev libncursesw5-dev
\
xz-utils tk-dev libffi-dev liblzma-dev
RUN mkdir -p /root/python_build/ && wget -q https://www.sqlite.org/2018/sqlite-autoconf-3250300.tar.gz &&
\
tar -zxf sqlite-autoconf-3250300.tar.gz && cd sqlite-autoconf-3250300 &&
\
./configure -prefix=/usr/local && make install -j8 && cd ../ && rm sqlite-autoconf-3250300.tar.gz &&
\
wget -q https://www.python.org/ftp/python/3.6.0/Python-3.6.0.tgz &&
\
tar -xzf Python-3.6.0.tgz && cd Python-3.6.0 &&
\
CFLAGS="-Wformat" ./configure --prefix=/usr/local/ --enable-shared > /dev/null &&
\
make -j8 > /dev/null && make altinstall > /dev/null && cd ../ && rm Python-3.6.0.tgz
RUN apt-get install -y libgtk2.0-dev dmidecode python3-tk && ldconfig &&
\
wget
${
ref_web
}
/
${
ref_paddle36
}
&&
${
ref_paddle36_mv1
}
pip3.6 install
${
ref_paddle36_whl
}
${
ref_paddle36_mv2
}
; apt-get install -f -y &&
\
apt-get clean -y &&
\
rm -f
${
ref_paddle36
}
&&
\
ldconfig
EOF
EOF
cat
>>
${
PADDLE_ROOT
}
/build/Dockerfile
<<
EOF
cat
>>
${
PADDLE_ROOT
}
/build/Dockerfile
<<
EOF
# run paddle version to install python packages first
# run paddle version to install python packages first
...
@@ -4205,12 +4145,6 @@ function main() {
...
@@ -4205,12 +4145,6 @@ function main() {
test_cicheck_py37
)
test_cicheck_py37
)
run_linux_cpu_test
${
PYTHON_ABI
:-
""
}
${
PROC_RUN
:-
1
}
run_linux_cpu_test
${
PYTHON_ABI
:-
""
}
${
PROC_RUN
:-
1
}
;;
;;
cpu_cicheck_py35
)
cmake_gen_and_build
${
PYTHON_ABI
:-
""
}
${
parallel_number
}
;;
gpu_cicheck_py35
)
parallel_test
;;
build_gpubox
)
build_gpubox
)
run_setup
${
PYTHON_ABI
:-
""
}
install
${
parallel_number
}
run_setup
${
PYTHON_ABI
:-
""
}
install
${
parallel_number
}
;;
;;
...
@@ -4243,10 +4177,6 @@ function main() {
...
@@ -4243,10 +4177,6 @@ function main() {
parallel_test
parallel_test
check_coverage
check_coverage
;;
;;
reuse_so_cicheck_py35
)
reuse_so_cache
parallel_test
;;
cmake_gen
)
cmake_gen
)
cmake_gen
${
PYTHON_ABI
:-
""
}
cmake_gen
${
PYTHON_ABI
:-
""
}
;;
;;
...
...
tools/dockerfile/ci_dockerfile.sh
浏览文件 @
1a4edcb0
...
@@ -76,7 +76,6 @@ function make_ubuntu_trt7_dockerfile(){
...
@@ -76,7 +76,6 @@ function make_ubuntu_trt7_dockerfile(){
RUN apt remove -y libnccl* --allow-change-held-packages
\&\&
apt-get install -y libsndfile1 libnccl2=2.7.8-1+cuda10.1 libnccl-dev=2.7.8-1+cuda10.1 zstd pigz --allow-change-held-packages #g"
${
dockerfile_name
}
RUN apt remove -y libnccl* --allow-change-held-packages
\&\&
apt-get install -y libsndfile1 libnccl2=2.7.8-1+cuda10.1 libnccl-dev=2.7.8-1+cuda10.1 zstd pigz --allow-change-held-packages #g"
${
dockerfile_name
}
}
}
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>/11.0-cudnn8-devel-centos7/g"
Dockerfile.centos
>
${
dockerfile_name
}
sed
"s/<baseimg>/11.0-cudnn8-devel-centos7/g"
Dockerfile.centos
>
${
dockerfile_name
}
...
...
tools/dockerfile/ubuntu16_dev.sh
浏览文件 @
1a4edcb0
...
@@ -59,27 +59,15 @@ function ref_whl(){
...
@@ -59,27 +59,15 @@ function ref_whl(){
ref_web
=
"https://paddle-wheel.bj.bcebos.com/
${
PADDLE_BRANCH
}
-
${
ref_gpu
}
-
${
ref_mkl
}${
ref_gcc
}
"
ref_web
=
"https://paddle-wheel.bj.bcebos.com/
${
PADDLE_BRANCH
}
-
${
ref_gpu
}
-
${
ref_mkl
}${
ref_gcc
}
"
if
[[
${
PADDLE_VERSION
}
==
"develop"
&&
${
WITH_GPU
}
==
"ON"
]]
;
then
if
[[
${
PADDLE_VERSION
}
==
"develop"
&&
${
WITH_GPU
}
==
"ON"
]]
;
then
ref_paddle_whl
=
paddlepaddle
${
install_gpu
}
-
${
ref_dev
}${
ref_version
}
-cp27-cp27mu-linux_x86_64
.whl
ref_paddle3_whl
=
paddlepaddle
${
install_gpu
}
-
${
ref_dev
}${
ref_version
}
-cp35-cp35m-linux_x86_64
.whl
ref_paddle36_whl
=
paddlepaddle
${
install_gpu
}
-
${
ref_dev
}${
ref_version
}
-cp36-cp36m-linux_x86_64
.whl
ref_paddle37_whl
=
paddlepaddle
${
install_gpu
}
-
${
ref_dev
}${
ref_version
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle37_whl
=
paddlepaddle
${
install_gpu
}
-
${
ref_dev
}${
ref_version
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle38_whl
=
paddlepaddle
${
install_gpu
}
-
${
ref_dev
}${
ref_version
}
-cp38-cp38-linux_x86_64
.whl
ref_paddle38_whl
=
paddlepaddle
${
install_gpu
}
-
${
ref_dev
}${
ref_version
}
-cp38-cp38-linux_x86_64
.whl
elif
[[
${
PADDLE_VERSION
}
==
"develop"
&&
${
WITH_GPU
}
!=
"ON"
]]
;
then
elif
[[
${
PADDLE_VERSION
}
==
"develop"
&&
${
WITH_GPU
}
!=
"ON"
]]
;
then
ref_paddle_whl
=
paddlepaddle
${
install_gpu
}
-
${
ref_dev
}
-cp27-cp27mu-linux_x86_64
.whl
ref_paddle3_whl
=
paddlepaddle
${
install_gpu
}
-
${
ref_dev
}
-cp35-cp35m-linux_x86_64
.whl
ref_paddle36_whl
=
paddlepaddle
${
install_gpu
}
-
${
ref_dev
}
-cp36-cp36m-linux_x86_64
.whl
ref_paddle37_whl
=
paddlepaddle
${
install_gpu
}
-
${
ref_dev
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle37_whl
=
paddlepaddle
${
install_gpu
}
-
${
ref_dev
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle38_whl
=
paddlepaddle
${
install_gpu
}
-
${
ref_dev
}
-cp38-cp38-linux_x86_64
.whl
ref_paddle38_whl
=
paddlepaddle
${
install_gpu
}
-
${
ref_dev
}
-cp38-cp38-linux_x86_64
.whl
elif
[[
${
PADDLE_VERSION
}
!=
"develop"
&&
${
WITH_GPU
}
==
"ON"
]]
;
then
elif
[[
${
PADDLE_VERSION
}
!=
"develop"
&&
${
WITH_GPU
}
==
"ON"
]]
;
then
ref_paddle_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_VERSION
}${
ref_version
}
-cp27-cp27mu-linux_x86_64
.whl
ref_paddle3_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_VERSION
}${
ref_version
}
-cp35-cp35m-linux_x86_64
.whl
ref_paddle36_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_VERSION
}${
ref_version
}
-cp36-cp36m-linux_x86_64
.whl
ref_paddle37_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_VERSION
}${
ref_version
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle37_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_VERSION
}${
ref_version
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle38_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_VERSION
}${
ref_version
}
-cp38-cp38-linux_x86_64
.whl
ref_paddle38_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_VERSION
}${
ref_version
}
-cp38-cp38-linux_x86_64
.whl
else
else
ref_paddle_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_VERSION
}
-cp27-cp27mu-linux_x86_64
.whl
ref_paddle3_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_VERSION
}
-cp35-cp35m-linux_x86_64
.whl
ref_paddle36_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_VERSION
}
-cp36-cp36m-linux_x86_64
.whl
ref_paddle37_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_VERSION
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle37_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_VERSION
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle38_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_VERSION
}
-cp38-cp38-linux_x86_64
.whl
ref_paddle38_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_VERSION
}
-cp38-cp38-linux_x86_64
.whl
fi
fi
...
@@ -88,9 +76,6 @@ function ref_whl(){
...
@@ -88,9 +76,6 @@ function ref_whl(){
function
install_whl
(){
function
install_whl
(){
dockerfile_line
=
`
wc
-l
Dockerfile.tmp|awk
'{print $1}'
`
dockerfile_line
=
`
wc
-l
Dockerfile.tmp|awk
'{print $1}'
`
sed
-i
"
${
dockerfile_line
}
i RUN wget -q
${
ref_web
}
/
${
ref_paddle_whl
}
&& pip install
${
ref_paddle_whl
}
&& rm -f
${
ref_paddle_whl
}
"
Dockerfile.tmp
sed
-i
"
${
dockerfile_line
}
i RUN wget -q
${
ref_web
}
/
${
ref_paddle3_whl
}
&& pip3.5 install
${
ref_paddle3_whl
}
&& rm -f
${
ref_paddle3_whl
}
"
Dockerfile.tmp
sed
-i
"
${
dockerfile_line
}
i RUN wget -q
${
ref_web
}
/
${
ref_paddle36_whl
}
&& pip3.6 install
${
ref_paddle36_whl
}
&& rm -f
${
ref_paddle36_whl
}
"
Dockerfile.tmp
sed
-i
"
${
dockerfile_line
}
i RUN wget -q
${
ref_web
}
/
${
ref_paddle37_whl
}
&& pip3.7 install
${
ref_paddle37_whl
}
&& rm -f
${
ref_paddle37_whl
}
"
Dockerfile.tmp
sed
-i
"
${
dockerfile_line
}
i RUN wget -q
${
ref_web
}
/
${
ref_paddle37_whl
}
&& pip3.7 install
${
ref_paddle37_whl
}
&& rm -f
${
ref_paddle37_whl
}
"
Dockerfile.tmp
sed
-i
"
${
dockerfile_line
}
i RUN wget -q
${
ref_web
}
/
${
ref_paddle38_whl
}
&& pip3.8 install
${
ref_paddle38_whl
}
&& rm -f
${
ref_paddle38_whl
}
"
Dockerfile.tmp
sed
-i
"
${
dockerfile_line
}
i RUN wget -q
${
ref_web
}
/
${
ref_paddle38_whl
}
&& pip3.8 install
${
ref_paddle38_whl
}
&& rm -f
${
ref_paddle38_whl
}
"
Dockerfile.tmp
}
}
...
...
tools/dockerfile/ubuntu18_dev.sh
浏览文件 @
1a4edcb0
...
@@ -61,27 +61,15 @@ function ref_whl(){
...
@@ -61,27 +61,15 @@ function ref_whl(){
ref_web
=
"https://paddle-wheel.bj.bcebos.com/
${
PADDLE_BRANCH
}
-
${
ref_gpu
}
-
${
ref_mkl
}${
ref_gcc
}
"
ref_web
=
"https://paddle-wheel.bj.bcebos.com/
${
PADDLE_BRANCH
}
-
${
ref_gpu
}
-
${
ref_mkl
}${
ref_gcc
}
"
if
[[
${
PADDLE_VERSION
}
==
"develop"
&&
${
WITH_GPU
}
==
"ON"
]]
;
then
if
[[
${
PADDLE_VERSION
}
==
"develop"
&&
${
WITH_GPU
}
==
"ON"
]]
;
then
ref_paddle_whl
=
paddlepaddle
${
install_gpu
}
-
${
ref_dev
}${
ref_version
}
-cp27-cp27mu-linux_x86_64
.whl
ref_paddle3_whl
=
paddlepaddle
${
install_gpu
}
-
${
ref_dev
}${
ref_version
}
-cp35-cp35m-linux_x86_64
.whl
ref_paddle36_whl
=
paddlepaddle
${
install_gpu
}
-
${
ref_dev
}${
ref_version
}
-cp36-cp36m-linux_x86_64
.whl
ref_paddle37_whl
=
paddlepaddle
${
install_gpu
}
-
${
ref_dev
}${
ref_version
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle37_whl
=
paddlepaddle
${
install_gpu
}
-
${
ref_dev
}${
ref_version
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle38_whl
=
paddlepaddle
${
install_gpu
}
-
${
ref_dev
}${
ref_version
}
-cp38-cp38-linux_x86_64
.whl
ref_paddle38_whl
=
paddlepaddle
${
install_gpu
}
-
${
ref_dev
}${
ref_version
}
-cp38-cp38-linux_x86_64
.whl
elif
[[
${
PADDLE_VERSION
}
==
"develop"
&&
${
WITH_GPU
}
!=
"ON"
]]
;
then
elif
[[
${
PADDLE_VERSION
}
==
"develop"
&&
${
WITH_GPU
}
!=
"ON"
]]
;
then
ref_paddle_whl
=
paddlepaddle
${
install_gpu
}
-
${
ref_dev
}
-cp27-cp27mu-linux_x86_64
.whl
ref_paddle3_whl
=
paddlepaddle
${
install_gpu
}
-
${
ref_dev
}
-cp35-cp35m-linux_x86_64
.whl
ref_paddle36_whl
=
paddlepaddle
${
install_gpu
}
-
${
ref_dev
}
-cp36-cp36m-linux_x86_64
.whl
ref_paddle37_whl
=
paddlepaddle
${
install_gpu
}
-
${
ref_dev
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle37_whl
=
paddlepaddle
${
install_gpu
}
-
${
ref_dev
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle38_whl
=
paddlepaddle
${
install_gpu
}
-
${
ref_dev
}
-cp38-cp38-linux_x86_64
.whl
ref_paddle38_whl
=
paddlepaddle
${
install_gpu
}
-
${
ref_dev
}
-cp38-cp38-linux_x86_64
.whl
elif
[[
${
PADDLE_VERSION
}
!=
"develop"
&&
${
WITH_GPU
}
==
"ON"
]]
;
then
elif
[[
${
PADDLE_VERSION
}
!=
"develop"
&&
${
WITH_GPU
}
==
"ON"
]]
;
then
ref_paddle_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_VERSION
}${
ref_version
}
-cp27-cp27mu-linux_x86_64
.whl
ref_paddle3_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_VERSION
}${
ref_version
}
-cp35-cp35m-linux_x86_64
.whl
ref_paddle36_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_VERSION
}${
ref_version
}
-cp36-cp36m-linux_x86_64
.whl
ref_paddle37_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_VERSION
}${
ref_version
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle37_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_VERSION
}${
ref_version
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle38_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_VERSION
}${
ref_version
}
-cp38-cp38-linux_x86_64
.whl
ref_paddle38_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_VERSION
}${
ref_version
}
-cp38-cp38-linux_x86_64
.whl
else
else
ref_paddle_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_VERSION
}
-cp27-cp27mu-linux_x86_64
.whl
ref_paddle3_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_VERSION
}
-cp35-cp35m-linux_x86_64
.whl
ref_paddle36_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_VERSION
}
-cp36-cp36m-linux_x86_64
.whl
ref_paddle37_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_VERSION
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle37_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_VERSION
}
-cp37-cp37m-linux_x86_64
.whl
ref_paddle38_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_VERSION
}
-cp38-cp38-linux_x86_64
.whl
ref_paddle38_whl
=
paddlepaddle
${
install_gpu
}
-
${
PADDLE_VERSION
}
-cp38-cp38-linux_x86_64
.whl
fi
fi
...
@@ -90,9 +78,6 @@ function ref_whl(){
...
@@ -90,9 +78,6 @@ function ref_whl(){
function
install_whl
(){
function
install_whl
(){
dockerfile_line
=
`
wc
-l
Dockerfile.tmp|awk
'{print $1}'
`
dockerfile_line
=
`
wc
-l
Dockerfile.tmp|awk
'{print $1}'
`
sed
-i
"
${
dockerfile_line
}
i RUN wget -q
${
ref_web
}
/
${
ref_paddle_whl
}
&& pip install
${
ref_paddle_whl
}
&& rm -f
${
ref_paddle_whl
}
"
Dockerfile.tmp
sed
-i
"
${
dockerfile_line
}
i RUN wget -q
${
ref_web
}
/
${
ref_paddle3_whl
}
&& pip3.5 install
${
ref_paddle3_whl
}
&& rm -f
${
ref_paddle3_whl
}
"
Dockerfile.tmp
sed
-i
"
${
dockerfile_line
}
i RUN wget -q
${
ref_web
}
/
${
ref_paddle36_whl
}
&& pip3.6 install
${
ref_paddle36_whl
}
&& rm -f
${
ref_paddle36_whl
}
"
Dockerfile.tmp
sed
-i
"
${
dockerfile_line
}
i RUN wget -q
${
ref_web
}
/
${
ref_paddle37_whl
}
&& pip3.7 install
${
ref_paddle37_whl
}
&& rm -f
${
ref_paddle37_whl
}
"
Dockerfile.tmp
sed
-i
"
${
dockerfile_line
}
i RUN wget -q
${
ref_web
}
/
${
ref_paddle37_whl
}
&& pip3.7 install
${
ref_paddle37_whl
}
&& rm -f
${
ref_paddle37_whl
}
"
Dockerfile.tmp
sed
-i
"
${
dockerfile_line
}
i RUN wget -q
${
ref_web
}
/
${
ref_paddle38_whl
}
&& pip3.8 install
${
ref_paddle38_whl
}
&& rm -f
${
ref_paddle38_whl
}
"
Dockerfile.tmp
sed
-i
"
${
dockerfile_line
}
i RUN wget -q
${
ref_web
}
/
${
ref_paddle38_whl
}
&& pip3.8 install
${
ref_paddle38_whl
}
&& rm -f
${
ref_paddle38_whl
}
"
Dockerfile.tmp
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录