diff --git a/tools/dockerfile/Dockerfile.release18 b/tools/dockerfile/Dockerfile.release18 index ddae9e1c32aef1c41482431edf3ccf5553508c79..b7e13bb2a3e8693a06865df78e934738ae73dee4 100644 --- a/tools/dockerfile/Dockerfile.release18 +++ b/tools/dockerfile/Dockerfile.release18 @@ -27,7 +27,6 @@ RUN apt-get update && \ # Downgrade gcc&&g++ WORKDIR /usr/bin 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 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 diff --git a/tools/dockerfile/ubuntu16_release.sh b/tools/dockerfile/ubuntu16_release.sh index 9d5d2881ccdd166af87798ece0285bd36a131298..7e93bb34f9e31ef5aa558ba25515e942dfb4aef9 100755 --- a/tools/dockerfile/ubuntu16_release.sh +++ b/tools/dockerfile/ubuntu16_release.sh @@ -22,7 +22,7 @@ function ref_whl(){ ref_gpu=gpu-cuda${ref_CUDA_MAJOR}-cudnn${CUDNN_MAJOR} install_gpu="_gpu" else - ref_gpu="cpu-avx" + ref_gpu="cpu" install_gpu="" fi @@ -56,7 +56,7 @@ function ref_whl(){ 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 ref_paddle37_whl=paddlepaddle${install_gpu}-${ref_dev}${ref_version}-cp37-cp37m-linux_x86_64.whl @@ -95,13 +95,6 @@ function install_gcc(){ } -# function install_jupyter() { -# if [[ ${WITH_NOTEBOOK} == "ON" ]];then -# # install jupyter notebook -# fi -# } - - function make_dockerfile(){ sed "s//${docker_name}/g" tools/dockerfile/Dockerfile.release16 >Dockerfile.tmp } @@ -110,7 +103,6 @@ function make_dockerfile(){ function main(){ make_dockerfile install_gcc - # install_jupyter ref_whl install_whl } diff --git a/tools/dockerfile/ubuntu18_release.sh b/tools/dockerfile/ubuntu18_release.sh index 216d8528200e57ec2e3e9937bd8a6907fd4f4aa7..286cb9c6919a1b2602084888d5abd5c84855d248 100755 --- a/tools/dockerfile/ubuntu18_release.sh +++ b/tools/dockerfile/ubuntu18_release.sh @@ -22,7 +22,7 @@ function ref_whl(){ ref_gpu=gpu-cuda${ref_CUDA_MAJOR}-cudnn${CUDNN_MAJOR} install_gpu="_gpu" else - ref_gpu="cpu-avx" + ref_gpu="cpu" install_gpu="" fi @@ -56,7 +56,7 @@ function ref_whl(){ 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 ref_paddle37_whl=paddlepaddle${install_gpu}-${ref_dev}${ref_version}-cp37-cp37m-linux_x86_64.whl @@ -80,7 +80,6 @@ function install_gcc(){ if [ "${gcc_version}" == "8.2.0" ];then sed -i 's##WORKDIR /usr/bin \ 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 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 \ @@ -96,7 +95,6 @@ function install_gcc(){ } - function make_dockerfile(){ sed "s//${docker_name}/g" tools/dockerfile/Dockerfile.release18 >Dockerfile.tmp }