Skip to content

Commit 1a4edcb

Browse files
gsq7474741gsq7474741
authored
[CodeStyle][py36] Update dockerfile and some script (#49558)
1 parent fcec564 commit 1a4edcb

File tree

5 files changed

+22
-123
lines changed

5 files changed

+22
-123
lines changed

‎paddle/scripts/conda_build.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,16 +90,16 @@ def __init__(self):
9090
self.blt_const = r"""
9191
"""
9292

93-
self.python36 = r" - python>=3.6, <3.7"
9493
self.python37 = r" - python>=3.7, <3.8"
9594
self.python38 = r" - python>=3.8, <3.9"
9695
self.python39 = r" - python>=3.9, <3.10"
96+
self.python310 = r" - python>=3.10, <3.11"
9797

9898
self.python_version = [
99-
self.python36,
10099
self.python37,
101100
self.python38,
102101
self.python39,
102+
self.python310,
103103
]
104104

105105
self.cuda101 = r"""
@@ -120,29 +120,29 @@ def __init__(self):
120120
(self.cuda102, "cuda10.2", ""),
121121
(self.cuda112, "cuda11.2", ".post112"),
122122
]
123-
self.py_str = ["py36", "py37", "py38", "py39"]
123+
self.py_str = ["py37", "py38", "py39", "py310"]
124124
self.pip_end = ".whl --no-deps"
125125
self.pip_prefix_linux = "pip install /package/paddlepaddle"
126126
self.pip_prefix_windows = r"pip install C:\package\paddlepaddle"
127127
self.pip_gpu = "_gpu-"
128128
self.pip_cpu = "-"
129129
self.mac_pip = [
130-
"-cp36-cp36m-macosx_10_6_intel",
131130
"-cp37-cp37m-macosx_10_6_intel",
132131
"-cp38-cp38-macosx_10_14_x86_64",
133132
"-cp39-cp39-macosx_10_14_x86_64",
133+
"-cp310-cp310-macosx_10_14_x86_64",
134134
]
135135
self.linux_pip = [
136-
"-cp36-cp36m-linux_x86_64",
137136
"-cp37-cp37m-linux_x86_64",
138137
"-cp38-cp38-linux_x86_64",
139138
"-cp39-cp39-linux_x86_64",
139+
"-cp310-cp310-linux_x86_64",
140140
]
141141
self.windows_pip = [
142-
"-cp36-cp36m-win_amd64",
143142
"-cp37-cp37m-win_amd64",
144143
"-cp38-cp38-win_amd64",
145144
"-cp39-cp39-win_amd64",
145+
"-cp310-cp310-win_amd64",
146146
]
147147

148148

‎paddle/scripts/paddle_build.sh‎

Lines changed: 15 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -77,19 +77,7 @@ function cmake_base() {
7777
SYSTEM=`uname -s`
7878
if [ "$SYSTEM" == "Darwin" ]; then
7979
echo "Using python abi: $1"
80-
if [ "$1" == "cp36-cp36m" ] || [ "$1" == "" ]; then
81-
if [ -d "/Library/Frameworks/Python.framework/Versions/3.6" ]; then
82-
export LD_LIBRARY_PATH=/Library/Frameworks/Python.framework/Versions/3.6/lib/
83-
export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:/Library/Frameworks/Python.framework/Versions/3.6/lib/
84-
export PATH=/Library/Frameworks/Python.framework/Versions/3.6/bin/:${PATH}
85-
PYTHON_FLAGS="-DPYTHON_EXECUTABLE:FILEPATH=/Library/Frameworks/Python.framework/Versions/3.6/bin/python3
86-
-DPYTHON_INCLUDE_DIR:PATH=/Library/Frameworks/Python.framework/Versions/3.6/include/python3.6m/
87-
-DPYTHON_LIBRARY:FILEPATH=/Library/Frameworks/Python.framework/Versions/3.6/lib/libpython3.6m.dylib"
88-
pip3.6 install --user -r ${PADDLE_ROOT}/python/requirements.txt
89-
else
90-
exit 1
91-
fi
92-
elif [ "$1" == "cp37-cp37m" ]; then
80+
if [ "$1" == "cp37-cp37m" ] || [ "$1" == "" ]; then
9381
if [ -d "/Library/Frameworks/Python.framework/Versions/3.7" ]; then
9482
export LD_LIBRARY_PATH=/Library/Frameworks/Python.framework/Versions/3.7/lib/
9583
export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:/Library/Frameworks/Python.framework/Versions/3.7/lib/
@@ -141,14 +129,7 @@ function cmake_base() {
141129
else
142130
if [ "$1" != "" ]; then
143131
echo "using python abi: $1"
144-
if [ "$1" == "cp36-cp36m" ]; then
145-
export LD_LIBRARY_PATH=/opt/_internal/cpython-3.6.0/lib/:${LD_LIBRARY_PATH}
146-
export PATH=/opt/_internal/cpython-3.6.0/bin/:${PATH}
147-
export PYTHON_FLAGS="-DPYTHON_EXECUTABLE:FILEPATH=/opt/_internal/cpython-3.6.0/bin/python3
148-
-DPYTHON_INCLUDE_DIR:PATH=/opt/_internal/cpython-3.6.0/include/python3.6m
149-
-DPYTHON_LIBRARIES:FILEPATH=/opt/_internal/cpython-3.6.0/lib/libpython3.so"
150-
pip3.6 install -r ${PADDLE_ROOT}/python/requirements.txt
151-
elif [ "$1" == "cp37-cp37m" ]; then
132+
if [ "$1" == "cp37-cp37m" ]; then
152133
export LD_LIBRARY_PATH=/opt/_internal/cpython-3.7.0/lib/:${LD_LIBRARY_PATH}
153134
export PATH=/opt/_internal/cpython-3.7.0/bin/:${PATH}
154135
export PYTHON_FLAGS="-DPYTHON_EXECUTABLE:FILEPATH=/opt/_internal/cpython-3.7.0/bin/python3.7
@@ -645,9 +626,7 @@ EOF
645626
set -x
646627

647628
set +ex
648-
if [ "$1" == "cp36-cp36m" ]; then
649-
pip3.6 uninstall -y paddlepaddle
650-
elif [ "$1" == "cp37-cp37m" ]; then
629+
if [ "$1" == "cp37-cp37m" ]; then
651630
pip3.7 uninstall -y paddlepaddle
652631
elif [ "$1" == "cp38-cp38" ]; then
653632
pip3.8 uninstall -y paddlepaddle
@@ -658,10 +637,7 @@ EOF
658637
fi
659638
set -ex
660639

661-
if [ "$1" == "cp36-cp36m" ]; then
662-
pip3.6 install --user ${PADDLE_ROOT}/dist/*.whl
663-
pip3.6 install --user hypothesis
664-
elif [ "$1" == "cp37-cp37m" ]; then
640+
if [ "$1" == "cp37-cp37m" ]; then
665641
pip3.7 install --user ${PADDLE_ROOT}/dist/*.whl
666642
pip3.7 install --user hypothesis
667643
elif [ "$1" == "cp38-cp38" ]; then
@@ -3024,44 +3000,27 @@ EOF
30243000

30253001
ref_web=https://paddle-wheel.bj.bcebos.com/${PADDLE_BRANCH}-${ref_gpu}-${ref_mkl}
30263002

3027-
ref_paddle36=paddlepaddle${install_gpu}-${PADDLE_BRANCH}-cp36-cp36m-linux_x86_64.whl
30283003
ref_paddle37=paddlepaddle${install_gpu}-${PADDLE_BRANCH}-cp37-cp37m-linux_x86_64.whl
30293004
ref_paddle38=paddlepaddle${install_gpu}-${PADDLE_BRANCH}-cp38-cp38-linux_x86_64.whl
30303005
ref_paddle39=paddlepaddle${install_gpu}-${PADDLE_BRANCH}-cp39-cp39-linux_x86_64.whl
30313006
ref_paddle310=paddlepaddle${install_gpu}-${PADDLE_BRANCH}-cp310-cp310-linux_x86_64.whl
30323007

3033-
ref_paddle36_whl=paddlepaddle${install_gpu}-${PADDLE_BRANCH}-cp36-cp36m-linux_x86_64.whl
30343008
ref_paddle37_whl=paddlepaddle${install_gpu}-${PADDLE_BRANCH}-cp37-cp37m-linux_x86_64.whl
30353009
ref_paddle38_whl=paddlepaddle${install_gpu}-${PADDLE_BRANCH}-cp38-cp38-linux_x86_64.whl
30363010
ref_paddle39_whl=paddlepaddle${install_gpu}-${PADDLE_BRANCH}-cp39-cp39-linux_x86_64.whl
30373011
ref_paddle310_whl=paddlepaddle${install_gpu}-${PADDLE_BRANCH}-cp310-cp310-linux_x86_64.whl
30383012

30393013
if [[ ${PADDLE_BRANCH} != "0.0.0" && ${WITH_MKL} == "ON" && ${WITH_GPU} == "ON" ]]; then
3040-
ref_paddle36=paddlepaddle${install_gpu}-${PADDLE_BRANCH}.post${ref_CUDA_MAJOR}${CUDNN_MAJOR}-cp36-cp36m-linux_x86_64.whl
30413014
ref_paddle37=paddlepaddle${install_gpu}-${PADDLE_BRANCH}.post${ref_CUDA_MAJOR}${CUDNN_MAJOR}-cp37-cp37m-linux_x86_64.whl
30423015
ref_paddle38=paddlepaddle${install_gpu}-${PADDLE_BRANCH}.post${ref_CUDA_MAJOR}${CUDNN_MAJOR}-cp38-cp38-linux_x86_64.whl
30433016
ref_paddle39=paddlepaddle${install_gpu}-${PADDLE_BRANCH}.post${ref_CUDA_MAJOR}${CUDNN_MAJOR}-cp39-cp39-linux_x86_64.whl
30443017
ref_paddle310=paddlepaddle${install_gpu}-${PADDLE_BRANCH}.post${ref_CUDA_MAJOR}${CUDNN_MAJOR}-cp310-cp310-linux_x86_64.whl
3045-
ref_paddle36_whl=paddlepaddle${install_gpu}-${PADDLE_BRANCH}.post${ref_CUDA_MAJOR}${CUDNN_MAJOR}-cp36-cp36m-linux_x86_64.whl
30463018
ref_paddle37_whl=paddlepaddle${install_gpu}-${PADDLE_BRANCH}.post${ref_CUDA_MAJOR}${CUDNN_MAJOR}-cp37-cp37m-linux_x86_64.whl
30473019
ref_paddle38_whl=paddlepaddle${install_gpu}-${PADDLE_BRANCH}.post${ref_CUDA_MAJOR}${CUDNN_MAJOR}-cp38-cp38-linux_x86_64.whl
30483020
ref_paddle39_whl=paddlepaddle${install_gpu}-${PADDLE_BRANCH}.post${ref_CUDA_MAJOR}${CUDNN_MAJOR}-cp39-cp39-linux_x86_64.whl
30493021
ref_paddle310_whl=paddlepaddle${install_gpu}-${PADDLE_BRANCH}.post${ref_CUDA_MAJOR}${CUDNN_MAJOR}-cp310-cp310-linux_x86_64.whl
30503022
fi
30513023

3052-
ref_paddle36_mv1=""
3053-
ref_paddle36_mv2=""
3054-
if [[ ${PADDLE_BRANCH} == "0.0.0" && ${WITH_GPU} == "ON" ]]; then
3055-
ref_paddle36_whl=paddlepaddle_gpu-1.5.1-cp36-cp36m-linux_x86_64.whl
3056-
ref_paddle36_mv1="mv ${ref_paddle36} ${ref_paddle36_whl} &&"
3057-
ref_paddle36_mv2="&& mv ${ref_paddle36_whl} ${ref_paddle36}"
3058-
fi
3059-
if [[ ${PADDLE_BRANCH} == "0.0.0" && ${WITH_GPU} != "ON" ]]; then
3060-
ref_paddle36_whl=paddlepaddle-1.5.1-cp36-cp36m-linux_x86_64.whl
3061-
ref_paddle36_mv1="mv ${ref_paddle36} ${ref_paddle36_whl} &&"
3062-
ref_paddle36_mv2="&& mv ${ref_paddle36_whl} ${ref_paddle36}"
3063-
fi
3064-
30653024
cat > ${PADDLE_ROOT}/build/Dockerfile <<EOF
30663025
FROM ${BASE_IMAGE}
30673026
MAINTAINER PaddlePaddle Authors <[email protected]>
@@ -3092,25 +3051,6 @@ EOF
30923051
${DOCKERFILE_CUBLAS_DSO}
30933052
${DOCKERFILE_CUBLASLT_DSO}
30943053
${DOCKERFILE_GPU_ENV}
3095-
EOF
3096-
cat >> ${PADDLE_ROOT}/build/Dockerfile <<EOF
3097-
# run paddle version to install python packages first
3098-
RUN apt-get update && ${NCCL_DEPS}
3099-
RUN apt-get install -y make build-essential libssl-dev zlib1g-dev libbz2-dev \
3100-
libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev libncursesw5-dev \
3101-
xz-utils tk-dev libffi-dev liblzma-dev
3102-
RUN mkdir -p /root/python_build/ && wget -q https://www.sqlite.org/2018/sqlite-autoconf-3250300.tar.gz && \
3103-
tar -zxf sqlite-autoconf-3250300.tar.gz && cd sqlite-autoconf-3250300 && \
3104-
./configure -prefix=/usr/local && make install -j8 && cd ../ && rm sqlite-autoconf-3250300.tar.gz && \
3105-
wget -q https://www.python.org/ftp/python/3.6.0/Python-3.6.0.tgz && \
3106-
tar -xzf Python-3.6.0.tgz && cd Python-3.6.0 && \
3107-
CFLAGS="-Wformat" ./configure --prefix=/usr/local/ --enable-shared > /dev/null && \
3108-
make -j8 > /dev/null && make altinstall > /dev/null && cd ../ && rm Python-3.6.0.tgz
3109-
RUN apt-get install -y libgtk2.0-dev dmidecode python3-tk && ldconfig && \
3110-
wget ${ref_web}/${ref_paddle36} && ${ref_paddle36_mv1} pip3.6 install ${ref_paddle36_whl} ${ref_paddle36_mv2}; apt-get install -f -y && \
3111-
apt-get clean -y && \
3112-
rm -f ${ref_paddle36} && \
3113-
ldconfig
31143054
EOF
31153055
cat >> ${PADDLE_ROOT}/build/Dockerfile <<EOF
31163056
# run paddle version to install python packages first
@@ -3471,9 +3411,9 @@ function trt_convert_test() {
34713411
}
34723412

34733413
function build_pr_and_develop() {
3474-
run_setup ${PYTHON_ABI:-""} bdist_wheel ${parallel_number}
3414+
run_setup ${PYTHON_ABI:-""} bdist_wheel ${parallel_number}
34753415
if [ ! -d "${PADDLE_ROOT}/build/python/dist/" ]; then
3476-
mkdir ${PADDLE_ROOT}/build/python/dist/
3416+
mkdir ${PADDLE_ROOT}/build/python/dist/
34773417
fi
34783418
mv ${PADDLE_ROOT}/dist/*.whl ${PADDLE_ROOT}/build/python/dist/
34793419
cmake_change=`git diff --name-only upstream/$BRANCH | grep "cmake/external" || true`
@@ -3497,9 +3437,9 @@ function build_pr_and_develop() {
34973437
rm -rf ${PADDLE_ROOT}/build/third_party
34983438
fi
34993439
git checkout -b develop_base_pr upstream/$BRANCH
3500-
run_setup ${PYTHON_ABI:-""} bdist_wheel ${parallel_number}
3440+
run_setup ${PYTHON_ABI:-""} bdist_wheel ${parallel_number}
35013441
if [ ! -d "${PADDLE_ROOT}/build/python/dist/" ]; then
3502-
mkdir ${PADDLE_ROOT}/build/python/dist/
3442+
mkdir ${PADDLE_ROOT}/build/python/dist/
35033443
fi
35043444
mv ${PADDLE_ROOT}/dist/*.whl ${PADDLE_ROOT}/build/python/dist/
35053445
generate_api_spec "$1" "DEV"
@@ -3685,7 +3625,7 @@ function run_setup(){
36853625
export WITH_MKL=${WITH_MKL:-ON}
36863626
export WITH_AVX=${WITH_AVX:-OFF}
36873627
export CUDA_ARCH_NAME=${CUDA_ARCH_NAME:-All}
3688-
export NEW_RELEASE_PYPI=${NEW_RELEASE_PYPI:-OFF}
3628+
export NEW_RELEASE_PYPI=${NEW_RELEASE_PYPI:-OFF}
36893629
export NEW_RELEASE_ALL=${NEW_RELEASE_ALL:-OFF}
36903630
export NEW_RELEASE_JIT=${NEW_RELEASE_JIT:-OFF}
36913631
export WITH_PYTHON=${WITH_PYTHON:-ON}
@@ -3756,7 +3696,7 @@ function run_setup(){
37563696
python setup.py $2;build_error=$?
37573697
fi
37583698
fi
3759-
3699+
37603700
# ci will collect ccache hit rate
37613701
collect_ccache_hits
37623702

@@ -3981,7 +3921,7 @@ function run_setup_mac(){
39813921
if [ "$build_error" != 0 ];then
39823922
exit 7;
39833923
fi
3984-
3924+
39853925
build_size
39863926

39873927
endTime_s=`date +%s`
@@ -4169,7 +4109,7 @@ function main() {
41694109
if [ "${WITH_PYTHON}" == "OFF" ] ; then
41704110
python ${PADDLE_ROOT}/tools/remove_grad_op_and_kernel.py
41714111
fi
4172-
gen_fluid_lib_by_setup ${parallel_number}
4112+
gen_fluid_lib_by_setup ${parallel_number}
41734113
;;
41744114
gpu_inference)
41754115
test_fluid_lib
@@ -4191,28 +4131,22 @@ function main() {
41914131
run_mac_test ${PYTHON_ABI:-""} ${PROC_RUN:-1}
41924132
;;
41934133
maccheck_py3)
4194-
run_setup_mac ${PYTHON_ABI:-""} bdist_wheel
4134+
run_setup_mac ${PYTHON_ABI:-""} bdist_wheel
41954135
run_mac_test ${PYTHON_ABI:-""} ${PROC_RUN:-1}
41964136
;;
41974137
macbuild)
41984138
cmake_gen ${PYTHON_ABI:-""}
41994139
build_mac
42004140
;;
42014141
cicheck_py37)
4202-
run_setup ${PYTHON_ABI:-""} bdist_wheel ${parallel_number}
4142+
run_setup ${PYTHON_ABI:-""} bdist_wheel ${parallel_number}
42034143
run_linux_cpu_test ${PYTHON_ABI:-""} ${PROC_RUN:-1}
42044144
;;
42054145
test_cicheck_py37)
42064146
run_linux_cpu_test ${PYTHON_ABI:-""} ${PROC_RUN:-1}
42074147
;;
4208-
cpu_cicheck_py35)
4209-
cmake_gen_and_build ${PYTHON_ABI:-""} ${parallel_number}
4210-
;;
4211-
gpu_cicheck_py35)
4212-
parallel_test
4213-
;;
42144148
build_gpubox)
4215-
run_setup ${PYTHON_ABI:-""} install ${parallel_number}
4149+
run_setup ${PYTHON_ABI:-""} install ${parallel_number}
42164150
;;
42174151
check_xpu)
42184152
cmake_gen_and_build ${PYTHON_ABI:-""} ${parallel_number}
@@ -4243,10 +4177,6 @@ function main() {
42434177
parallel_test
42444178
check_coverage
42454179
;;
4246-
reuse_so_cicheck_py35)
4247-
reuse_so_cache
4248-
parallel_test
4249-
;;
42504180
cmake_gen)
42514181
cmake_gen ${PYTHON_ABI:-""}
42524182
;;

‎tools/dockerfile/ci_dockerfile.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,10 @@ function make_ubuntu_trt7_dockerfile(){
7676
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}
7777
}
7878

79-
8079
function make_centos_dockerfile(){
8180
dockerfile_name="Dockerfile.cuda9_cudnn7_gcc48_py35_centos6"
8281
sed "s/<baseimg>/11.0-cudnn8-devel-centos7/g" Dockerfile.centos >${dockerfile_name}
83-
sed -i "s#COPY build_scripts /build_scripts#COPY tools/dockerfile/build_scripts ./build_scripts#g" ${dockerfile_name}
82+
sed -i "s#COPY build_scripts /build_scripts#COPY tools/dockerfile/build_scripts ./build_scripts#g" ${dockerfile_name}
8483
dockerfile_line=$(wc -l ${dockerfile_name}|awk '{print $1}')
8584
sed -i "${dockerfile_line}i RUN yum install -y pigz graphviz zstd libsndfile ninja-build" ${dockerfile_name}
8685
sed -i "${dockerfile_line}i RUN pip3.7 install distro" ${dockerfile_name}

‎tools/dockerfile/ubuntu16_dev.sh‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -59,27 +59,15 @@ function ref_whl(){
5959
ref_web="https://paddle-wheel.bj.bcebos.com/${PADDLE_BRANCH}-${ref_gpu}-${ref_mkl}${ref_gcc}"
6060

6161
if [[ ${PADDLE_VERSION} == "develop" && ${WITH_GPU} == "ON" ]]; then
62-
ref_paddle_whl=paddlepaddle${install_gpu}-${ref_dev}${ref_version}-cp27-cp27mu-linux_x86_64.whl
63-
ref_paddle3_whl=paddlepaddle${install_gpu}-${ref_dev}${ref_version}-cp35-cp35m-linux_x86_64.whl
64-
ref_paddle36_whl=paddlepaddle${install_gpu}-${ref_dev}${ref_version}-cp36-cp36m-linux_x86_64.whl
6562
ref_paddle37_whl=paddlepaddle${install_gpu}-${ref_dev}${ref_version}-cp37-cp37m-linux_x86_64.whl
6663
ref_paddle38_whl=paddlepaddle${install_gpu}-${ref_dev}${ref_version}-cp38-cp38-linux_x86_64.whl
6764
elif [[ ${PADDLE_VERSION} == "develop" && ${WITH_GPU} != "ON" ]]; then
68-
ref_paddle_whl=paddlepaddle${install_gpu}-${ref_dev}-cp27-cp27mu-linux_x86_64.whl
69-
ref_paddle3_whl=paddlepaddle${install_gpu}-${ref_dev}-cp35-cp35m-linux_x86_64.whl
70-
ref_paddle36_whl=paddlepaddle${install_gpu}-${ref_dev}-cp36-cp36m-linux_x86_64.whl
7165
ref_paddle37_whl=paddlepaddle${install_gpu}-${ref_dev}-cp37-cp37m-linux_x86_64.whl
7266
ref_paddle38_whl=paddlepaddle${install_gpu}-${ref_dev}-cp38-cp38-linux_x86_64.whl
7367
elif [[ ${PADDLE_VERSION} != "develop" && ${WITH_GPU} == "ON" ]]; then
74-
ref_paddle_whl=paddlepaddle${install_gpu}-${PADDLE_VERSION}${ref_version}-cp27-cp27mu-linux_x86_64.whl
75-
ref_paddle3_whl=paddlepaddle${install_gpu}-${PADDLE_VERSION}${ref_version}-cp35-cp35m-linux_x86_64.whl
76-
ref_paddle36_whl=paddlepaddle${install_gpu}-${PADDLE_VERSION}${ref_version}-cp36-cp36m-linux_x86_64.whl
7768
ref_paddle37_whl=paddlepaddle${install_gpu}-${PADDLE_VERSION}${ref_version}-cp37-cp37m-linux_x86_64.whl
7869
ref_paddle38_whl=paddlepaddle${install_gpu}-${PADDLE_VERSION}${ref_version}-cp38-cp38-linux_x86_64.whl
7970
else
80-
ref_paddle_whl=paddlepaddle${install_gpu}-${PADDLE_VERSION}-cp27-cp27mu-linux_x86_64.whl
81-
ref_paddle3_whl=paddlepaddle${install_gpu}-${PADDLE_VERSION}-cp35-cp35m-linux_x86_64.whl
82-
ref_paddle36_whl=paddlepaddle${install_gpu}-${PADDLE_VERSION}-cp36-cp36m-linux_x86_64.whl
8371
ref_paddle37_whl=paddlepaddle${install_gpu}-${PADDLE_VERSION}-cp37-cp37m-linux_x86_64.whl
8472
ref_paddle38_whl=paddlepaddle${install_gpu}-${PADDLE_VERSION}-cp38-cp38-linux_x86_64.whl
8573
fi
@@ -88,9 +76,6 @@ function ref_whl(){
8876

8977
function install_whl(){
9078
dockerfile_line=`wc -l Dockerfile.tmp|awk '{print $1}'`
91-
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
92-
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
93-
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
9479
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
9580
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
9681
}

0 commit comments

Comments
 (0)