Upgrade TensorRT library to 5.1.5.

PiperOrigin-RevId: 248608540
This commit is contained in:
Guangda Lai 2019-05-16 15:08:11 -07:00 committed by TensorFlower Gardener
parent 580ae4b25a
commit 220e8e059a
21 changed files with 50 additions and 71 deletions

View File

@ -8,10 +8,8 @@ RUN cp -P /usr/include/cudnn.h /usr/local/cuda/include
RUN cp -P /usr/lib/x86_64-linux-gnu/libcudnn* /usr/local/cuda/lib64
# Installs TensorRT, which is not included in NVIDIA Docker containers.
RUN apt-get update \
&& apt-get install nvinfer-runtime-trt-repo-ubuntu1604-5.0.2-ga-cuda10.0 \
&& apt-get update \
&& apt-get install -y --no-install-recommends libnvinfer5=5.0.2-1+cuda10.0 libnvinfer-dev=5.0.2-1+cuda10.0
RUN apt-get update && apt-get install -y --no-install-recommends \
libnvinfer5=5.1.5-1+cuda10.0 libnvinfer-dev=5.1.5-1+cuda10.0
# Copy and run the install scripts.
COPY install/*.sh /install/

View File

@ -19,7 +19,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates
ENV CUDA_VERSION 10.0.130
ENV CUDA_PKG_VERSION 10-0=$CUDA_VERSION-1
ENV CUDNN_VERSION 7.3.1.20
ENV TENSORRT_VERSION 5.0.2
ENV TENSORRT_VERSION 5.1.5
ENV NVIDIA_DRIVER_CAPABILITIES compute,utility
ENV NVIDIA_REQUIRE_CUDA "cuda>=10.0,driver>=410"
ENV NVIDIA_VISIBLE_DEVICES all
@ -47,8 +47,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libcudnn7=$CUDNN_VERSION-1+cuda10.0 \
libcudnn7=$CUDNN_VERSION-1+cuda10.0 \
libcudnn7-dev=$CUDNN_VERSION-1+cuda10.0 \
nvinfer-runtime-trt-repo-ubuntu1604-$TENSORRT_VERSION-ga-cuda10.0 && \
apt-get update && apt-get install -y --no-install-recommends \
libnvinfer5=$TENSORRT_VERSION-1+cuda10.0 \
libnvinfer-dev=$TENSORRT_VERSION-1+cuda10.0 && \
ln -s cuda-10.0 /usr/local/cuda && \

View File

@ -25,7 +25,7 @@ ENV PATH /usr/local/nvidia/bin:/usr/local/cuda/bin:${PATH}
ENV NVIDIA_VISIBLE_DEVICES all
ENV NVIDIA_DRIVER_CAPABILITIES compute,utility
ENV NVIDIA_REQUIRE_CUDA "cuda>=9.0"
ENV TENSORRT_VERSION 5.0.2
ENV TENSORRT_VERSION 5.1.5
ENV CUDNN_VERSION 7.1.4.18
# TODO(b/110903506): /usr/loca/cuda/lib64/stubs should not be needed in
@ -52,8 +52,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
cuda-cublas-dev-9-0=9.0.176.4-1 \
libcudnn7-dev=$CUDNN_VERSION-1+cuda9.0 \
libcudnn7=$CUDNN_VERSION-1+cuda9.0 \
nvinfer-runtime-trt-repo-ubuntu1604-$TENSORRT_VERSION-ga-cuda9.0 && \
apt-get update && apt-get install -y --no-install-recommends \
libnvinfer5=$TENSORRT_VERSION-1+cuda9.0 \
libnvinfer-dev=$TENSORRT_VERSION-1+cuda9.0 && \
ln -s cuda-9.0 /usr/local/cuda && \

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
FROM ubuntu:${UBUNTU_VERSION} as base

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
FROM ubuntu:${UBUNTU_VERSION} as base

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
FROM ubuntu:${UBUNTU_VERSION} AS base

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
FROM ubuntu:${UBUNTU_VERSION} AS base

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
ARG ARCH=
ARG CUDA=10.0
@ -61,12 +61,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
find /usr/local/cuda-${CUDA}/lib64/ -type f -name 'lib*_static.a' -not -name 'libcudart_static.a' -delete && \
rm /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libcudnn_static_v7.a
RUN [[ "${ARCH}" = "ppc64le" ]] || { apt-get update && \
apt-get install nvinfer-runtime-trt-repo-ubuntu1604-5.0.2-ga-cuda${CUDA} \
&& apt-get update \
RUN [[ "${ARCH}" = "ppc64le" ]] || { apt-get update \
&& apt-get install -y --no-install-recommends \
libnvinfer5=5.0.2-1+cuda${CUDA} \
libnvinfer-dev=5.0.2-1+cuda${CUDA} \
libnvinfer5=5.1.5-1+cuda${CUDA} \
libnvinfer-dev=5.1.5-1+cuda${CUDA} \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*; }

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
ARG ARCH=
ARG CUDA=10.0
@ -61,12 +61,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
find /usr/local/cuda-${CUDA}/lib64/ -type f -name 'lib*_static.a' -not -name 'libcudart_static.a' -delete && \
rm /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libcudnn_static_v7.a
RUN [[ "${ARCH}" = "ppc64le" ]] || { apt-get update && \
apt-get install nvinfer-runtime-trt-repo-ubuntu1604-5.0.2-ga-cuda${CUDA} \
&& apt-get update \
RUN [[ "${ARCH}" = "ppc64le" ]] || { apt-get update \
&& apt-get install -y --no-install-recommends \
libnvinfer5=5.0.2-1+cuda${CUDA} \
libnvinfer-dev=5.0.2-1+cuda${CUDA} \
libnvinfer5=5.1.5-1+cuda${CUDA} \
libnvinfer-dev=5.1.5-1+cuda${CUDA} \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*; }

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
ARG ARCH=
ARG CUDA=10.0
@ -50,10 +50,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
software-properties-common \
unzip
RUN [ ${ARCH} = ppc64le ] || (apt-get update && \
apt-get install nvinfer-runtime-trt-repo-ubuntu1604-5.0.2-ga-cuda${CUDA} \
&& apt-get update \
&& apt-get install -y --no-install-recommends libnvinfer5=5.0.2-1+cuda${CUDA} \
RUN [ ${ARCH} = ppc64le ] || (apt-get update \
&& apt-get install -y --no-install-recommends \
libnvinfer5=5.1.5-1+cuda${CUDA} \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*)

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
ARG ARCH=
ARG CUDA=10.0
@ -50,10 +50,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
software-properties-common \
unzip
RUN [ ${ARCH} = ppc64le ] || (apt-get update && \
apt-get install nvinfer-runtime-trt-repo-ubuntu1604-5.0.2-ga-cuda${CUDA} \
&& apt-get update \
&& apt-get install -y --no-install-recommends libnvinfer5=5.0.2-1+cuda${CUDA} \
RUN [ ${ARCH} = ppc64le ] || (apt-get update \
&& apt-get install -y --no-install-recommends \
libnvinfer5=5.1.5-1+cuda${CUDA} \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*)

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
FROM ubuntu:${UBUNTU_VERSION} as base

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
FROM ubuntu:${UBUNTU_VERSION} as base

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
FROM ubuntu:${UBUNTU_VERSION} AS base

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
FROM ubuntu:${UBUNTU_VERSION} AS base

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
ARG ARCH=
ARG CUDA=10.0
@ -61,12 +61,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
find /usr/local/cuda-${CUDA}/lib64/ -type f -name 'lib*_static.a' -not -name 'libcudart_static.a' -delete && \
rm /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libcudnn_static_v7.a
RUN [[ "${ARCH}" = "ppc64le" ]] || { apt-get update && \
apt-get install nvinfer-runtime-trt-repo-ubuntu1604-5.0.2-ga-cuda${CUDA} \
&& apt-get update \
RUN [[ "${ARCH}" = "ppc64le" ]] || { apt-get update \
&& apt-get install -y --no-install-recommends \
libnvinfer5=5.0.2-1+cuda${CUDA} \
libnvinfer-dev=5.0.2-1+cuda${CUDA} \
libnvinfer5=5.1.5-1+cuda${CUDA} \
libnvinfer-dev=5.1.5-1+cuda${CUDA} \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*; }

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
ARG ARCH=
ARG CUDA=10.0
@ -61,12 +61,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
find /usr/local/cuda-${CUDA}/lib64/ -type f -name 'lib*_static.a' -not -name 'libcudart_static.a' -delete && \
rm /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libcudnn_static_v7.a
RUN [[ "${ARCH}" = "ppc64le" ]] || { apt-get update && \
apt-get install nvinfer-runtime-trt-repo-ubuntu1604-5.0.2-ga-cuda${CUDA} \
&& apt-get update \
RUN [[ "${ARCH}" = "ppc64le" ]] || { apt-get update \
&& apt-get install -y --no-install-recommends \
libnvinfer5=5.0.2-1+cuda${CUDA} \
libnvinfer-dev=5.0.2-1+cuda${CUDA} \
libnvinfer5=5.1.5-1+cuda${CUDA} \
libnvinfer-dev=5.1.5-1+cuda${CUDA} \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*; }

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
ARG ARCH=
ARG CUDA=10.0
@ -50,10 +50,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
software-properties-common \
unzip
RUN [ ${ARCH} = ppc64le ] || (apt-get update && \
apt-get install nvinfer-runtime-trt-repo-ubuntu1604-5.0.2-ga-cuda${CUDA} \
&& apt-get update \
&& apt-get install -y --no-install-recommends libnvinfer5=5.0.2-1+cuda${CUDA} \
RUN [ ${ARCH} = ppc64le ] || (apt-get update \
&& apt-get install -y --no-install-recommends \
libnvinfer5=5.1.5-1+cuda${CUDA} \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*)

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
ARG ARCH=
ARG CUDA=10.0
@ -50,10 +50,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
software-properties-common \
unzip
RUN [ ${ARCH} = ppc64le ] || (apt-get update && \
apt-get install nvinfer-runtime-trt-repo-ubuntu1604-5.0.2-ga-cuda${CUDA} \
&& apt-get update \
&& apt-get install -y --no-install-recommends libnvinfer5=5.0.2-1+cuda${CUDA} \
RUN [ ${ARCH} = ppc64le ] || (apt-get update \
&& apt-get install -y --no-install-recommends \
libnvinfer5=5.1.5-1+cuda${CUDA} \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*)

View File

@ -38,12 +38,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
find /usr/local/cuda-${CUDA}/lib64/ -type f -name 'lib*_static.a' -not -name 'libcudart_static.a' -delete && \
rm /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libcudnn_static_v7.a
RUN [[ "${ARCH}" = "ppc64le" ]] || { apt-get update && \
apt-get install nvinfer-runtime-trt-repo-ubuntu1804-5.0.2-ga-cuda${CUDA} \
&& apt-get update \
RUN [[ "${ARCH}" = "ppc64le" ]] || { apt-get update \
&& apt-get install -y --no-install-recommends \
libnvinfer5=5.0.2-1+cuda${CUDA} \
libnvinfer-dev=5.0.2-1+cuda${CUDA} \
libnvinfer5=5.1.5-1+cuda${CUDA} \
libnvinfer-dev=5.1.5-1+cuda${CUDA} \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*; }

View File

@ -27,10 +27,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
software-properties-common \
unzip
RUN [ ${ARCH} = ppc64le ] || (apt-get update && \
apt-get install nvinfer-runtime-trt-repo-ubuntu1804-5.0.2-ga-cuda${CUDA} \
&& apt-get update \
&& apt-get install -y --no-install-recommends libnvinfer5=5.0.2-1+cuda${CUDA} \
RUN [ ${ARCH} = ppc64le ] || (apt-get update \
&& apt-get install -y --no-install-recommends \
libnvinfer5=5.1.5-1+cuda${CUDA} \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*)