Merge cuda 9/10 dockerfile with root dockerfile (#18693)

Also fix a dependency error which may cause compile error

Dockerfile

@@ -54,8 +54,8 @@ RUN wget -q https://www.python.org/ftp/python/3.7.0/Python-3.7.0.tgz && \
 RUN rm -r /root/python_build
 
 RUN apt-get update && \
-    apt-get install -y --allow-downgrades patchelf \
-    python3 python3-dev python3-pip \
+    apt-get install -y --allow-downgrades --allow-change-held-packages \
+    patchelf python3 python3-dev python3-pip \
     git python-pip python-dev python-opencv openssh-server bison \
     libnccl2=2.1.2-1+cuda8.0 libnccl-dev=2.1.2-1+cuda8.0 \
     wget unzip unrar tar xz-utils bzip2 gzip coreutils ntp \
@@ -172,6 +172,11 @@ RUN pip3.6 --no-cache-dir install pylint pytest astroid isort
 RUN pip3.7 --no-cache-dir install pylint pytest astroid isort
 RUN pip --no-cache-dir install pylint pytest astroid isort LinkChecker
 
+RUN pip3 --no-cache-dir install coverage                
+RUN pip3.6 --no-cache-dir install coverage             
+RUN pip3.7 --no-cache-dir install coverage            
+RUN pip --no-cache-dir install coverage
+
 COPY ./python/requirements.txt /root/
 RUN pip3 --no-cache-dir install -r /root/requirements.txt
 RUN pip3.6 --no-cache-dir install -r /root/requirements.txt

paddle/fluid/inference/anakin/CMakeLists.txt

 cc_library(anakin_engine SRCS engine.cc DEPS framework_proto boost)
-cc_library(anakin_op_teller SRCS op_teller.cc DEPS framework_proto boost)
+cc_library(anakin_op_teller SRCS op_teller.cc DEPS framework_proto device_context boost)
 target_link_libraries(anakin_engine anakin anakin_saber_common)
 cc_test(test_anakin_engine SRCS test_anakin_engine.cc DEPS anakin_engine)
 add_subdirectory(convert)

paddle/fluid/inference/tensorrt/CMakeLists.txt

 nv_library(tensorrt_engine SRCS engine.cc trt_int8_calibrator.cc DEPS ${GLOB_OPERATOR_DEPS} framework_proto device_context boost)
-nv_library(tensorrt_op_teller SRCS op_teller.cc DEPS framework_proto boost)
+nv_library(tensorrt_op_teller SRCS op_teller.cc DEPS framework_proto device_context boost)
 nv_test(test_tensorrt SRCS test_tensorrt.cc DEPS dynload_cuda device_context dynamic_loader)
 nv_test(test_tensorrt_engine SRCS test_engine.cc DEPS dynload_cuda tensorrt_engine)
 add_subdirectory(plugin)

paddle/fluid/platform/dynload/CMakeLists.txt

 cc_library(dynamic_loader SRCS dynamic_loader.cc DEPS glog gflags enforce)
+target_link_libraries(dynamic_loader glog gflags enforce)
 
 list(APPEND CUDA_SRCS cublas.cc cudnn.cc curand.cc)
 

paddle/scripts/Dockerfile.tmp

-# 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:<baseimg>
-MAINTAINER PaddlePaddle Authors <paddle-dev@baidu.com>
-
-ARG UBUNTU_MIRROR
-RUN /bin/bash -c 'if [[ -n ${UBUNTU_MIRROR} ]]; then sed -i 's#http://archive.ubuntu.com/ubuntu#${UBUNTU_MIRROR}#g' /etc/apt/sources.list; fi'
-
-# ENV variables
-ARG WITH_GPU
-ARG WITH_AVX
-
-ENV WOBOQ OFF
-ENV WITH_GPU=${WITH_GPU:-ON}
-ENV WITH_AVX=${WITH_AVX:-ON}
-
-ENV HOME /root
-# Add bash enhancements
-COPY ./docker/root/ /root/
-
-# Prepare packages for Python
-RUN apt-get update && \
-    apt-get install -y make build-essential libssl-dev zlib1g-dev libbz2-dev \
-    libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev libncursesw5-dev \
-    xz-utils tk-dev libffi-dev liblzma-dev
-
-# Install Python3.6
-RUN mkdir -p /root/python_build/ && wget -q https://www.sqlite.org/2018/sqlite-autoconf-3250300.tar.gz && \
-    tar -zxf sqlite-autoconf-3250300.tar.gz && cd sqlite-autoconf-3250300 && \
-    ./configure -prefix=/usr/local && make -j8 && make install && cd ../ && rm sqlite-autoconf-3250300.tar.gz && \
-    wget -q https://www.python.org/ftp/python/3.6.0/Python-3.6.0.tgz && \
-    tar -xzf Python-3.6.0.tgz && cd Python-3.6.0 && \
-    CFLAGS="-Wformat" ./configure --prefix=/usr/local/ --enable-shared > /dev/null && \
-    make -j8 > /dev/null && make altinstall > /dev/null
-
-# Install Python3.7
-RUN wget -q https://www.python.org/ftp/python/3.7.0/Python-3.7.0.tgz && \
-    tar -xzf Python-3.7.0.tgz && cd Python-3.7.0 && \
-    CFLAGS="-Wformat" ./configure --prefix=/usr/local/ --enable-shared > /dev/null && \
-    make -j8 > /dev/null && make altinstall > /dev/null
-
-RUN rm -r /root/python_build
-
-RUN apt-get update && \
-    apt-get install -y --allow-downgrades --allow-change-held-packages patchelf \
-    python3 python3-dev python3-pip \
-    git python-pip python-dev python-opencv openssh-server bison \
-    libnccl2=<nccl_version> libnccl-dev=<nccl_version> \
-    wget unzip unrar tar xz-utils bzip2 gzip coreutils ntp \
-    curl sed grep graphviz libjpeg-dev zlib1g-dev  \
-    python-matplotlib gcc-4.8 g++-4.8 \
-    automake locales clang-format swig cmake  \
-    liblapack-dev liblapacke-dev \
-    clang-3.8 llvm-3.8 libclang-3.8-dev \
-    net-tools libtool ccache && \
-    apt-get clean -y
-
-# Install Go and glide
-RUN wget -qO- https://storage.googleapis.com/golang/go1.8.1.linux-amd64.tar.gz | \
-    tar -xz -C /usr/local && \
-    mkdir /root/gopath && \
-    mkdir /root/gopath/bin && \
-    mkdir /root/gopath/src
-ENV GOROOT=/usr/local/go GOPATH=/root/gopath
-# should not be in the same line with GOROOT definition, otherwise docker build could not find GOROOT.
-ENV PATH=${PATH}:${GOROOT}/bin:${GOPATH}/bin
-# install glide
-RUN curl -s -q https://glide.sh/get | sh
-
-# Install TensorRT
-# following TensorRT.tar.gz is not the default official one, we do two miny changes:
-# 1. Remove the unnecessary files to make the library small. TensorRT.tar.gz only contains include and lib now,
-#    and its size is only one-third of the official one.
-# 2. Manually add ~IPluginFactory() in IPluginFactory class of NvInfer.h, otherwise, it couldn't work in paddle.
-#    See https://github.com/PaddlePaddle/Paddle/issues/10129 for details.
-
-RUN wget -q https://paddlepaddledeps.bj.bcebos.com/TensorRT_<tensor_rt_version>.tar.gz --no-check-certificate && \
-    tar -zxf TensorRT_<tensor_rt_version>.tar.gz -C /usr/local && \
-    cp -rf /usr/local/TensorRT_<tensor_rt_version>/include /usr && \
-    cp -rf /usr/local/TensorRT_<tensor_rt_version>/lib /usr
-
-# git credential to skip password typing
-RUN git config --global credential.helper store
-
-# Fix locales to en_US.UTF-8
-RUN localedef -i en_US -f UTF-8 en_US.UTF-8
-
-# FIXME: due to temporary ipykernel dependency issue, specify ipykernel jupyter
-# version util jupyter fixes this issue.
-
-# specify sphinx version as 1.5.6 and remove -U option for [pip install -U
-# sphinx-rtd-theme] since -U option will cause sphinx being updated to newest
-# version(1.7.1 for now), which causes building documentation failed.
-RUN pip3 --no-cache-dir install -U wheel && \
-    pip3 --no-cache-dir install -U docopt PyYAML sphinx==1.5.6 && \
-    pip3 --no-cache-dir install sphinx-rtd-theme==0.1.9 recommonmark && \
-    pip3.6 --no-cache-dir install -U wheel && \
-    pip3.6 --no-cache-dir install -U docopt PyYAML sphinx==1.5.6 && \
-    pip3.6 --no-cache-dir install sphinx-rtd-theme==0.1.9 recommonmark && \
-    pip3.7 --no-cache-dir install -U wheel && \
-    pip3.7 --no-cache-dir install -U docopt PyYAML sphinx==1.5.6 && \
-    pip3.7 --no-cache-dir install sphinx-rtd-theme==0.1.9 recommonmark && \
-    easy_install -U pip && \
-    pip --no-cache-dir install -U pip setuptools wheel && \
-    pip --no-cache-dir install -U docopt PyYAML sphinx==1.5.6 && \
-    pip --no-cache-dir install sphinx-rtd-theme==0.1.9 recommonmark
-
-RUN pip3 --no-cache-dir install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
-    pip3 --no-cache-dir install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
-    pip3 --no-cache-dir install opencv-python && \
-    pip3.6 --no-cache-dir install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
-    pip3.6 --no-cache-dir install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
-    pip3.6 --no-cache-dir install opencv-python && \
-    pip3.7 --no-cache-dir install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
-    pip3.7 --no-cache-dir install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
-    pip3.7 --no-cache-dir install opencv-python && \
-    pip --no-cache-dir install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
-    pip --no-cache-dir install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
-    pip --no-cache-dir install opencv-python
-
-#For docstring checker
-RUN pip3 --no-cache-dir install pylint pytest astroid isort
-RUN pip3.6 --no-cache-dir install pylint pytest astroid isort
-RUN pip3.7 --no-cache-dir install pylint pytest astroid isort
-RUN pip --no-cache-dir install pylint pytest astroid isort LinkChecker
-
-RUN pip3 --no-cache-dir install requests==2.9.2 numpy protobuf \
-    recordio matplotlib==2.2.3 rarfile scipy Pillow \
-    nltk graphviz six funcsigs pyyaml decorator prettytable
-RUN pip3.6 --no-cache-dir install requests==2.9.2 numpy protobuf \
-    recordio matplotlib==2.2.3 rarfile scipy Pillow \
-    nltk graphviz six funcsigs pyyaml decorator prettytable
-RUN pip3.7 --no-cache-dir install requests==2.9.2 numpy protobuf \
-    recordio matplotlib==2.2.3 rarfile scipy Pillow \
-    nltk graphviz six funcsigs pyyaml decorator prettytable
-RUN pip --no-cache-dir install requests==2.9.2 numpy protobuf \
-    recordio matplotlib==2.2.3 rarfile scipy Pillow \
-    nltk graphviz six funcsigs pyyaml decorator prettytable
-
-# for coverage
-RUN pip3 --no-cache-dir install coverage
-RUN pip3.6 --no-cache-dir install coverage
-RUN pip3.7 --no-cache-dir install coverage
-RUN pip --no-cache-dir install coverage
-
-# To fix https://github.com/PaddlePaddle/Paddle/issues/1954, we use
-# the solution in https://urllib3.readthedocs.io/en/latest/user-guide.html#ssl-py2
-RUN apt-get install -y libssl-dev libffi-dev && apt-get clean -y
-RUN pip3 --no-cache-dir install certifi urllib3[secure]
-RUN pip3.6 --no-cache-dir install certifi urllib3[secure]
-RUN pip3.7 --no-cache-dir install certifi urllib3[secure]
-RUN pip --no-cache-dir install certifi urllib3[secure]
-
-
-# Install woboq_codebrowser to /woboq
-RUN git clone https://github.com/woboq/woboq_codebrowser /woboq && \
-    (cd /woboq \
-     cmake -DLLVM_CONFIG_EXECUTABLE=/usr/bin/llvm-config-3.8 \
-           -DCMAKE_BUILD_TYPE=Release . \
-     make)
-
-# ar mishandles 4GB files
-# https://sourceware.org/bugzilla/show_bug.cgi?id=14625
-# remove them when apt-get support 2.27 and higher version
-RUN wget -q https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/binutils/2.27-9ubuntu1/binutils_2.27.orig.tar.gz && \
-    tar -xzf binutils_2.27.orig.tar.gz && \
-    cd binutils-2.27 && \
-    ./configure && make -j && make install && cd .. && rm -rf binutils-2.27 binutils_2.27.orig.tar.gz
-
-# Configure OpenSSH server. c.f. https://docs.docker.com/engine/examples/running_ssh_service
-RUN mkdir /var/run/sshd
-RUN echo 'root:root' | chpasswd
-RUN sed -ri 's/^PermitRootLogin\s+.*/PermitRootLogin yes/' /etc/ssh/sshd_config
-RUN sed -ri 's/UsePAM yes/#UsePAM yes/g' /etc/ssh/sshd_config
-EXPOSE 22
-

paddle/scripts/build_docker_images.sh

-#!/bin/bash
+#!/bin/sh
 set -xe
 
 REPO="${REPO:-paddlepaddle}"
 
-sed 's/<baseimg>/9.0-cudnn7-devel-ubuntu16.04/g' Dockerfile.tmp | 
-sed 's/<tensor_rt_version>/5.1_ga_cuda9_cudnnv7.5/g' |
-sed 's/<nccl_version>/2.4.7-1+cuda9.0/g' > Dockerfile.cuda9.0-cudnn7
+cp -f ../../python/requirements.txt .
+
+sed 's#FROM nvidia/cuda:8.0-cudnn7-devel-ubuntu16.04#FROM nvidia/cuda:9.0-cudnn7-devel-ubuntu16.04#g' ../../Dockerfile |
+sed 's#TensorRT-4.0.1.6-ubuntu14.04.x86_64-gnu.cuda.8.0.cudnn7.0.tar.gz#TensorRT_5.1_ga_cuda9_cudnnv7.5.tar.gz#g' |
+sed 's#/usr/local/TensorRT#/usr/local/TensorRT_5.1_ga_cuda9_cudnnv7.5#g' |
+sed 's#libnccl2=2.1.2-1+cuda8.0 libnccl-dev=2.1.2-1+cuda8.0#libnccl2=2.4.7-1+cuda9.0 libnccl-dev=2.4.7-1+cuda9.0#g' |
+sed 's#COPY ./paddle/scripts/docker/root/#COPY ./docker/root/#g' |
+sed 's#COPY ./python/requirements.txt#COPY ./requirements.txt#' > Dockerfile.cuda9.0-cudnn7
 # docker build -t ${REPO}/paddle:cuda9.0-cudnn7-devel-ubuntu16.04 -f Dockerfile.cuda9.0-cudnn7 .
 
-sed 's/<baseimg>/10.0-cudnn7-devel-ubuntu16.04/g' Dockerfile.tmp | 
-sed 's/<tensor_rt_version>/5.1_ga_cuda10_cudnnv7.5/g' |
-sed 's/<nccl_version>/2.4.7-1+cuda10.0/g' > Dockerfile.cuda10.0-cudnn7
+sed 's#FROM nvidia/cuda:8.0-cudnn7-devel-ubuntu16.04#FROM nvidia/cuda:10.0-cudnn7-devel-ubuntu16.04#g' ../../Dockerfile |
+sed 's#TensorRT-4.0.1.6-ubuntu14.04.x86_64-gnu.cuda.8.0.cudnn7.0.tar.gz#TensorRT_5.1_ga_cuda10_cudnnv7.5.tar.gz#g' |
+sed 's#/usr/local/TensorRT#/usr/local/TensorRT_5.1_ga_cuda10_cudnnv7.5#g' |
+sed 's#libnccl2=2.1.2-1+cuda8.0 libnccl-dev=2.1.2-1+cuda8.0#libnccl2=2.4.7-1+cuda10.0 libnccl-dev=2.4.7-1+cuda10.0#g' |
+sed 's#COPY ./paddle/scripts/docker/root/#COPY ./docker/root/#g' |
+sed 's#COPY ./python/requirements.txt#COPY ./requirements.txt#' > Dockerfile.cuda10.0-cudnn7
 # docker build -t ${REPO}/paddle:cuda10.0-cudnn7-devel-ubuntu16.04 -f Dockerfile.cuda10.0-cudnn7 .