Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[docker] delete install_trt in release docker #34266

Merged
merged 3 commits into from
Aug 3, 2021
Merged

[docker] delete install_trt in release docker #34266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1cb268e
delete install_trt in release docker
pangyoki Jul 20, 2021
0ed4c51
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
pangyoki Aug 2, 2021
604f9ae
fix whl package path
pangyoki Aug 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion tools/dockerfile/Dockerfile.release18
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 2 additions & 10 deletions tools/dockerfile/ubuntu16_release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -95,13 +95,6 @@ function install_gcc(){
}


# function install_jupyter() {
# if [[ ${WITH_NOTEBOOK} == "ON" ]];then
# # install jupyter notebook
# fi
# }


function make_dockerfile(){
sed "s/<baseimg>/${docker_name}/g" tools/dockerfile/Dockerfile.release16 >Dockerfile.tmp
}
Expand All @@ -110,7 +103,6 @@ function make_dockerfile(){
function main(){
make_dockerfile
install_gcc
# install_jupyter
ref_whl
install_whl
}
Expand Down
6 changes: 2 additions & 4 deletions tools/dockerfile/ubuntu18_release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand All @@ -80,7 +80,6 @@ function install_gcc(){
if [ "${gcc_version}" == "8.2.0" ];then
sed -i 's#<install_gcc>#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 \
Expand All @@ -96,7 +95,6 @@ function install_gcc(){
}



function make_dockerfile(){
sed "s/<baseimg>/${docker_name}/g" tools/dockerfile/Dockerfile.release18 >Dockerfile.tmp
}
Expand Down