From 220e8e059a2514567b33cc2614fea0935bd3f631 Mon Sep 17 00:00:00 2001 From: Guangda Lai Date: Thu, 16 May 2019 15:08:11 -0700 Subject: [PATCH] Upgrade TensorRT library to 5.1.5. PiperOrigin-RevId: 248608540 --- tensorflow/tools/ci_build/Dockerfile.gpu | 6 ++---- .../Dockerfile.rbe.cuda10.0-cudnn7-ubuntu14.04 | 4 +--- .../ci_build/Dockerfile.rbe.cuda9.0-cudnn7-ubuntu14.04 | 4 +--- .../dockerfiles/dockerfiles/cpu-jupyter.Dockerfile | 2 +- .../tools/dockerfiles/dockerfiles/cpu.Dockerfile | 2 +- .../dockerfiles/devel-cpu-jupyter.Dockerfile | 2 +- .../tools/dockerfiles/dockerfiles/devel-cpu.Dockerfile | 2 +- .../dockerfiles/devel-gpu-jupyter.Dockerfile | 10 ++++------ .../tools/dockerfiles/dockerfiles/devel-gpu.Dockerfile | 10 ++++------ .../dockerfiles/dockerfiles/gpu-jupyter.Dockerfile | 9 ++++----- .../tools/dockerfiles/dockerfiles/gpu.Dockerfile | 9 ++++----- .../dockerfiles/ppc64le/cpu-ppc64le-jupyter.Dockerfile | 2 +- .../dockerfiles/ppc64le/cpu-ppc64le.Dockerfile | 2 +- .../ppc64le/devel-cpu-ppc64le-jupyter.Dockerfile | 2 +- .../dockerfiles/ppc64le/devel-cpu-ppc64le.Dockerfile | 2 +- .../ppc64le/devel-gpu-ppc64le-jupyter.Dockerfile | 10 ++++------ .../dockerfiles/ppc64le/devel-gpu-ppc64le.Dockerfile | 10 ++++------ .../dockerfiles/ppc64le/gpu-ppc64le-jupyter.Dockerfile | 9 ++++----- .../dockerfiles/ppc64le/gpu-ppc64le.Dockerfile | 9 ++++----- .../partials/ubuntu/devel-nvidia.partial.Dockerfile | 8 +++----- .../partials/ubuntu/nvidia.partial.Dockerfile | 7 +++---- 21 files changed, 50 insertions(+), 71 deletions(-) diff --git a/tensorflow/tools/ci_build/Dockerfile.gpu b/tensorflow/tools/ci_build/Dockerfile.gpu index 2514a9ddd65..4dd2bb4c416 100644 --- a/tensorflow/tools/ci_build/Dockerfile.gpu +++ b/tensorflow/tools/ci_build/Dockerfile.gpu @@ -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/ diff --git a/tensorflow/tools/ci_build/Dockerfile.rbe.cuda10.0-cudnn7-ubuntu14.04 b/tensorflow/tools/ci_build/Dockerfile.rbe.cuda10.0-cudnn7-ubuntu14.04 index c6099c9e451..0101bb299d0 100644 --- a/tensorflow/tools/ci_build/Dockerfile.rbe.cuda10.0-cudnn7-ubuntu14.04 +++ b/tensorflow/tools/ci_build/Dockerfile.rbe.cuda10.0-cudnn7-ubuntu14.04 @@ -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 && \ diff --git a/tensorflow/tools/ci_build/Dockerfile.rbe.cuda9.0-cudnn7-ubuntu14.04 b/tensorflow/tools/ci_build/Dockerfile.rbe.cuda9.0-cudnn7-ubuntu14.04 index 4ce4214065f..4c6a7741bf3 100644 --- a/tensorflow/tools/ci_build/Dockerfile.rbe.cuda9.0-cudnn7-ubuntu14.04 +++ b/tensorflow/tools/ci_build/Dockerfile.rbe.cuda9.0-cudnn7-ubuntu14.04 @@ -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 && \ diff --git a/tensorflow/tools/dockerfiles/dockerfiles/cpu-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/cpu-jupyter.Dockerfile index c806fa4eacd..22b2d51836b 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/cpu-jupyter.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/cpu-jupyter.Dockerfile @@ -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 diff --git a/tensorflow/tools/dockerfiles/dockerfiles/cpu.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/cpu.Dockerfile index a82577b53be..a0bda2e72af 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/cpu.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/cpu.Dockerfile @@ -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 diff --git a/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu-jupyter.Dockerfile index fd3c8078594..294e9e02b85 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu-jupyter.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu-jupyter.Dockerfile @@ -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 diff --git a/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu.Dockerfile index 02816e54078..7f8e7da5994 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/devel-cpu.Dockerfile @@ -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 diff --git a/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu-jupyter.Dockerfile index 0867e22f10b..64721adbe06 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu-jupyter.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu-jupyter.Dockerfile @@ -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/*; } diff --git a/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu.Dockerfile index 3e52a11fd55..275f6db5af5 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/devel-gpu.Dockerfile @@ -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/*; } diff --git a/tensorflow/tools/dockerfiles/dockerfiles/gpu-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/gpu-jupyter.Dockerfile index 85a32fae1b1..b5b11a41c84 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/gpu-jupyter.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/gpu-jupyter.Dockerfile @@ -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/*) diff --git a/tensorflow/tools/dockerfiles/dockerfiles/gpu.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/gpu.Dockerfile index c661341eaee..98b28822f1d 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/gpu.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/gpu.Dockerfile @@ -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/*) diff --git a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/cpu-ppc64le-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/cpu-ppc64le-jupyter.Dockerfile index 63bf205a7ae..e8fe0580a35 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/cpu-ppc64le-jupyter.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/cpu-ppc64le-jupyter.Dockerfile @@ -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 diff --git a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/cpu-ppc64le.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/cpu-ppc64le.Dockerfile index 083d61bf9a2..22016c245ee 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/cpu-ppc64le.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/cpu-ppc64le.Dockerfile @@ -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 diff --git a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le-jupyter.Dockerfile index ab5ea149197..ca636556469 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le-jupyter.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le-jupyter.Dockerfile @@ -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 diff --git a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le.Dockerfile index 54d393b34e7..17cf966ebf3 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-cpu-ppc64le.Dockerfile @@ -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 diff --git a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le-jupyter.Dockerfile index bb331f62052..4e8934fc71b 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le-jupyter.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le-jupyter.Dockerfile @@ -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/*; } diff --git a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le.Dockerfile index 3c7a455a4a6..6fbb18f7751 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/devel-gpu-ppc64le.Dockerfile @@ -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/*; } diff --git a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/gpu-ppc64le-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/gpu-ppc64le-jupyter.Dockerfile index 1e82ca28220..1ffedfbeeda 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/gpu-ppc64le-jupyter.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/gpu-ppc64le-jupyter.Dockerfile @@ -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/*) diff --git a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/gpu-ppc64le.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/gpu-ppc64le.Dockerfile index e9572756e53..315e93158c9 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/gpu-ppc64le.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/gpu-ppc64le.Dockerfile @@ -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/*) diff --git a/tensorflow/tools/dockerfiles/partials/ubuntu/devel-nvidia.partial.Dockerfile b/tensorflow/tools/dockerfiles/partials/ubuntu/devel-nvidia.partial.Dockerfile index ad68e0c8a5f..4d9c9a03d2a 100644 --- a/tensorflow/tools/dockerfiles/partials/ubuntu/devel-nvidia.partial.Dockerfile +++ b/tensorflow/tools/dockerfiles/partials/ubuntu/devel-nvidia.partial.Dockerfile @@ -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/*; } diff --git a/tensorflow/tools/dockerfiles/partials/ubuntu/nvidia.partial.Dockerfile b/tensorflow/tools/dockerfiles/partials/ubuntu/nvidia.partial.Dockerfile index aeee9f7d689..ccacc6471da 100644 --- a/tensorflow/tools/dockerfiles/partials/ubuntu/nvidia.partial.Dockerfile +++ b/tensorflow/tools/dockerfiles/partials/ubuntu/nvidia.partial.Dockerfile @@ -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/*)