未验证 提交 2714fc7e 编写于 作者: P pangyoki 提交者: GitHub

[docker] delete install_trt in release docker (#34266)

* delete install_trt in release docker

* fix whl package path
上级 45fa14f5
...@@ -27,7 +27,6 @@ RUN apt-get update && \ ...@@ -27,7 +27,6 @@ RUN apt-get update && \
# Downgrade gcc&&g++ # Downgrade gcc&&g++
WORKDIR /usr/bin WORKDIR /usr/bin
COPY tools/dockerfile/build_scripts /build_scripts COPY tools/dockerfile/build_scripts /build_scripts
RUN bash /build_scripts/install_trt.sh
RUN bash /build_scripts/install_gcc.sh gcc82 && rm -rf /build_scripts RUN bash /build_scripts/install_gcc.sh gcc82 && rm -rf /build_scripts
RUN cp gcc gcc.bak && cp g++ g++.bak && rm gcc && rm g++ RUN cp gcc gcc.bak && cp g++ g++.bak && rm gcc && rm g++
RUN ln -s /usr/local/gcc-8.2/bin/gcc /usr/local/bin/gcc RUN ln -s /usr/local/gcc-8.2/bin/gcc /usr/local/bin/gcc
......
...@@ -22,7 +22,7 @@ function ref_whl(){ ...@@ -22,7 +22,7 @@ function ref_whl(){
ref_gpu=gpu-cuda${ref_CUDA_MAJOR}-cudnn${CUDNN_MAJOR} ref_gpu=gpu-cuda${ref_CUDA_MAJOR}-cudnn${CUDNN_MAJOR}
install_gpu="_gpu" install_gpu="_gpu"
else else
ref_gpu="cpu-avx" ref_gpu="cpu"
install_gpu="" install_gpu=""
fi fi
...@@ -56,7 +56,7 @@ function ref_whl(){ ...@@ -56,7 +56,7 @@ function ref_whl(){
ref_dev=2.1.0.dev0 ref_dev=2.1.0.dev0
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}/linux/linux-${ref_gpu}-${ref_mkl}${ref_gcc}-avx"
if [[ ${PADDLE_VERSION} == "develop" && ${WITH_GPU} == "ON" ]]; then if [[ ${PADDLE_VERSION} == "develop" && ${WITH_GPU} == "ON" ]]; then
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
...@@ -95,13 +95,6 @@ function install_gcc(){ ...@@ -95,13 +95,6 @@ function install_gcc(){
} }
# function install_jupyter() {
# if [[ ${WITH_NOTEBOOK} == "ON" ]];then
# # install jupyter notebook
# fi
# }
function make_dockerfile(){ function make_dockerfile(){
sed "s/<baseimg>/${docker_name}/g" tools/dockerfile/Dockerfile.release16 >Dockerfile.tmp sed "s/<baseimg>/${docker_name}/g" tools/dockerfile/Dockerfile.release16 >Dockerfile.tmp
} }
...@@ -110,7 +103,6 @@ function make_dockerfile(){ ...@@ -110,7 +103,6 @@ function make_dockerfile(){
function main(){ function main(){
make_dockerfile make_dockerfile
install_gcc install_gcc
# install_jupyter
ref_whl ref_whl
install_whl install_whl
} }
......
...@@ -22,7 +22,7 @@ function ref_whl(){ ...@@ -22,7 +22,7 @@ function ref_whl(){
ref_gpu=gpu-cuda${ref_CUDA_MAJOR}-cudnn${CUDNN_MAJOR} ref_gpu=gpu-cuda${ref_CUDA_MAJOR}-cudnn${CUDNN_MAJOR}
install_gpu="_gpu" install_gpu="_gpu"
else else
ref_gpu="cpu-avx" ref_gpu="cpu"
install_gpu="" install_gpu=""
fi fi
...@@ -56,7 +56,7 @@ function ref_whl(){ ...@@ -56,7 +56,7 @@ function ref_whl(){
ref_dev=2.1.0.dev0 ref_dev=2.1.0.dev0
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}/linux/linux-${ref_gpu}-${ref_mkl}${ref_gcc}-avx"
if [[ ${PADDLE_VERSION} == "develop" && ${WITH_GPU} == "ON" ]]; then if [[ ${PADDLE_VERSION} == "develop" && ${WITH_GPU} == "ON" ]]; then
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
...@@ -80,7 +80,6 @@ function install_gcc(){ ...@@ -80,7 +80,6 @@ function install_gcc(){
if [ "${gcc_version}" == "8.2.0" ];then if [ "${gcc_version}" == "8.2.0" ];then
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_trt.sh \
RUN bash /build_scripts/install_gcc.sh gcc82 \&\& rm -rf /build_scripts \ RUN bash /build_scripts/install_gcc.sh gcc82 \&\& rm -rf /build_scripts \
RUN cp gcc gcc.bak \&\& cp g++ g++.bak \&\& rm gcc \&\& rm g++ \ RUN cp gcc gcc.bak \&\& cp g++ g++.bak \&\& rm gcc \&\& rm g++ \
RUN ln -s /usr/local/gcc-8.2/bin/gcc /usr/local/bin/gcc \ RUN ln -s /usr/local/gcc-8.2/bin/gcc /usr/local/bin/gcc \
...@@ -96,7 +95,6 @@ function install_gcc(){ ...@@ -96,7 +95,6 @@ function install_gcc(){
} }
function make_dockerfile(){ function make_dockerfile(){
sed "s/<baseimg>/${docker_name}/g" tools/dockerfile/Dockerfile.release18 >Dockerfile.tmp sed "s/<baseimg>/${docker_name}/g" tools/dockerfile/Dockerfile.release18 >Dockerfile.tmp
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册