From fe8f5038217b353d331448914a257d8d232f5212 Mon Sep 17 00:00:00 2001 From: Jiawei Wang Date: Fri, 22 Oct 2021 10:44:18 +0800 Subject: [PATCH] Merge pull request #1434 from bjjwwang/develop fix dockerfile for v0.7 --- ...devel => Dockerfile.cuda10.2-cudnn7.devel} | 4 +-- tools/Dockerfile.cuda10.2-cudnn8.devel | 2 +- .../dockerfiles/build_scripts/install_trt.sh | 26 ++++++++++++------- .../dockerfiles/build_scripts/install_whl.sh | 8 +++--- 4 files changed, 24 insertions(+), 16 deletions(-) rename tools/{Dockerfile.cuda11-cudnn8.devel => Dockerfile.cuda10.2-cudnn7.devel} (98%) diff --git a/tools/Dockerfile.cuda11-cudnn8.devel b/tools/Dockerfile.cuda10.2-cudnn7.devel similarity index 98% rename from tools/Dockerfile.cuda11-cudnn8.devel rename to tools/Dockerfile.cuda10.2-cudnn7.devel index 2b4e75c7..6425a7a3 100644 --- a/tools/Dockerfile.cuda11-cudnn8.devel +++ b/tools/Dockerfile.cuda10.2-cudnn7.devel @@ -1,7 +1,7 @@ # A image for building paddle binaries # Use cuda devel base image for both cpu and gpu environment # When you modify it, please be aware of cudnn-runtime version -FROM nvidia/cuda:11.0.3-cudnn8-devel-ubuntu16.04 +FROM nvidia/cuda:10.2-cudnn7-devel-ubuntu16.04 MAINTAINER PaddlePaddle Authors # ENV variables @@ -104,7 +104,7 @@ ENV PATH=usr/local/go/bin:/root/go/bin:${PATH} # Downgrade TensorRT COPY tools/dockerfiles/build_scripts /build_scripts -RUN bash /build_scripts/install_trt.sh cuda11 +RUN bash /build_scripts/install_trt.sh cuda10.2 cudnn7 RUN rm -rf /build_scripts # git credential to skip password typing diff --git a/tools/Dockerfile.cuda10.2-cudnn8.devel b/tools/Dockerfile.cuda10.2-cudnn8.devel index 0b1f4f1c..d0773134 100644 --- a/tools/Dockerfile.cuda10.2-cudnn8.devel +++ b/tools/Dockerfile.cuda10.2-cudnn8.devel @@ -104,7 +104,7 @@ ENV PATH=usr/local/go/bin:/root/go/bin:${PATH} # Downgrade TensorRT COPY tools/dockerfiles/build_scripts /build_scripts -RUN bash /build_scripts/install_trt.sh cuda10.2 +RUN bash /build_scripts/install_trt.sh cuda10.2 cudnn8 RUN rm -rf /build_scripts # git credential to skip password typing diff --git a/tools/dockerfiles/build_scripts/install_trt.sh b/tools/dockerfiles/build_scripts/install_trt.sh index 559a5552..b882bd21 100644 --- a/tools/dockerfiles/build_scripts/install_trt.sh +++ b/tools/dockerfiles/build_scripts/install_trt.sh @@ -15,20 +15,28 @@ # limitations under the License. VERSION=$1 +CUDNN=$2 if [[ "$VERSION" == "cuda10.1" ]];then wget -q https://paddle-ci.gz.bcebos.com/TRT/TensorRT6-cuda10.1-cudnn7.tar.gz --no-check-certificate tar -zxf TensorRT6-cuda10.1-cudnn7.tar.gz -C /usr/local cp -rf /usr/local/TensorRT6-cuda10.1-cudnn7/include/* /usr/include/ && cp -rf /usr/local/TensorRT6-cuda10.1-cudnn7/lib/* /usr/lib/ echo "cuda10.1 trt install ==============>>>>>>>>>>>>" rm TensorRT6-cuda10.1-cudnn7.tar.gz -elif [[ "$VERSION" == "cuda11" ]];then - wget -q https://paddle-ci.cdn.bcebos.com/TRT/TensorRT-7.1.3.4.Ubuntu-16.04.x86_64-gnu.cuda-11.0.cudnn8.0.tar.gz --no-check-certificate - tar -zxf TensorRT-7.1.3.4.Ubuntu-16.04.x86_64-gnu.cuda-11.0.cudnn8.0.tar.gz -C /usr/local - cp -rf /usr/local/TensorRT-7.1.3.4/include/* /usr/include/ && cp -rf /usr/local/TensorRT-7.1.3.4/lib/* /usr/lib/ - rm TensorRT-7.1.3.4.Ubuntu-16.04.x86_64-gnu.cuda-11.0.cudnn8.0.tar.gz +elif [[ "$VERSION" == "cuda11.2" ]];then + wget https://paddle-ci.gz.bcebos.com/TRT/TensorRT-8.0.3.4.Linux.x86_64-gnu.cuda-11.3.cudnn8.2.tar.gz --no-check-certificate + tar -zxf TensorRT-8.0.3.4.Linux.x86_64-gnu.cuda-11.3.cudnn8.2.tar.gz + cp -rf /usr/local/TensorRT-8.0.3.4/include/* /usr/include/ && cp -rf /usr/local/TensorRT-8.0.3.4/lib/* /usr/lib/ + rm -rf TensorRT-8.0.3.4.Linux.x86_64-gnu.cuda-11.3.cudnn8.2.tar.gz elif [[ "$VERSION" == "cuda10.2" ]];then - wget https://paddle-ci.gz.bcebos.com/TRT/TensorRT7-cuda10.2-cudnn8.tar.gz --no-check-certificate - tar -zxf TensorRT7-cuda10.2-cudnn8.tar.gz -C /usr/local - cp -rf /usr/local/TensorRT-7.1.3.4/include/* /usr/include/ && cp -rf /usr/local/TensorRT-7.1.3.4/lib/* /usr/lib/ - rm TensorRT7-cuda10.2-cudnn8.tar.gz + if [[ "$CUDNN" == "cudnn8" ]];then + wget https://paddle-ci.gz.bcebos.com/TRT/TensorRT7-cuda10.2-cudnn8.tar.gz --no-check-certificate + tar -zxf TensorRT7-cuda10.2-cudnn8.tar.gz -C /usr/local + cp -rf /usr/local/TensorRT-7.1.3.4/include/* /usr/include/ && cp -rf /usr/local/TensorRT-7.1.3.4/lib/* /usr/lib/ + rm TensorRT7-cuda10.2-cudnn8.tar.gz + elif [[ "$CUDNN" == "cudnn7" ]];then + wget https://paddle-ci.gz.bcebos.com/TRT/TensorRT6-cuda10.2-cudnn7.tar.gz --no-check-certificate + tar -zxf TensorRT6-cuda10.2-cudnn7.tar.gz -C /usr/local + cp -rf /usr/local/TensorRT-6.0.1.8/include/* /usr/include/ && cp -rf /usr/local/TensorRT-6.0.1.8/lib/* /usr/lib/ + rm -rf TensorRT6-cuda10.2-cudnn7.tar.gz + fi fi diff --git a/tools/dockerfiles/build_scripts/install_whl.sh b/tools/dockerfiles/build_scripts/install_whl.sh index 2eb95db8..f937cf2a 100644 --- a/tools/dockerfiles/build_scripts/install_whl.sh +++ b/tools/dockerfiles/build_scripts/install_whl.sh @@ -53,7 +53,7 @@ if [[ $SERVING_VERSION == "0.5.0" ]]; then fi client_release="paddle-serving-client==$SERVING_VERSION" app_release="paddle-serving-app==0.3.1" -elif [[ $SERVING_VERSION == "0.6.0" ]]; then +else if [[ "$RUN_ENV" == "cpu" ]];then server_release="https://paddle-serving.bj.bcebos.com/test-dev/whl/paddle_serving_server-$SERVING_VERSION-py3-none-any.whl" serving_bin="https://paddle-serving.bj.bcebos.com/test-dev/bin/serving-cpu-avx-mkl-$SERVING_VERSION.tar.gz" @@ -80,10 +80,10 @@ if [[ "$RUN_ENV" == "cpu" ]];then python$PYTHON_VERSION -m pip install $paddle_whl cd /usr/local/ wget $serving_bin - tar xf serving-cpu-noavx-openblas-${SERVING_VERSION}.tar.gz - mv $PWD/serving-cpu-noavx-openblas-${SERVING_VERSION} $PWD/serving_bin + tar xf serving-cpu-avx-mkl-${SERVING_VERSION}.tar.gz + mv $PWD/serving-cpu-avx-mkl-${SERVING_VERSION} $PWD/serving_bin echo "export SERVING_BIN=$PWD/serving_bin/serving">>/root/.bashrc - rm -rf serving-cpu-noavx-openblas-${SERVING_VERSION}.tar.gz + rm -rf serving-cpu-avx-mkl-${SERVING_VERSION}.tar.gz cd - elif [[ "$RUN_ENV" == "cuda10.1" ]];then python$PYTHON_VERSION -m pip install $client_release $app_release $server_release -- GitLab