Merge pull request #45491 from angerson:master
PiperOrigin-RevId: 346560844 Change-Id: I31f8d5404564503240b7420fec91a4dfab02c5c3
This commit is contained in:
commit
f9ab869fcf
@ -62,7 +62,7 @@ RUN apt-get update && apt-get install -y \
|
||||
python3-pip
|
||||
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
"pip<20.3" \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
|
@ -62,7 +62,7 @@ RUN apt-get update && apt-get install -y \
|
||||
python3-pip
|
||||
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
"pip<20.3" \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
|
@ -33,7 +33,7 @@ RUN apt-get update && apt-get install -y \
|
||||
python3-pip
|
||||
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
"pip<20.3" \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
|
@ -33,7 +33,7 @@ RUN apt-get update && apt-get install -y \
|
||||
python3-pip
|
||||
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
"pip<20.3" \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
|
@ -62,7 +62,7 @@ RUN apt-get update && apt-get install -y \
|
||||
python3-pip
|
||||
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
"pip<20.3" \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
|
@ -62,7 +62,7 @@ RUN apt-get update && apt-get install -y \
|
||||
python3-pip
|
||||
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
"pip<20.3" \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
|
@ -101,7 +101,7 @@ RUN apt-get update && apt-get install -y \
|
||||
python3-pip
|
||||
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
"pip<20.3" \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
|
@ -101,7 +101,7 @@ RUN apt-get update && apt-get install -y \
|
||||
python3-pip
|
||||
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
"pip<20.3" \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
|
@ -79,7 +79,7 @@ RUN apt-get update && apt-get install -y \
|
||||
python3-pip
|
||||
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
"pip<20.3" \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
|
@ -79,7 +79,7 @@ RUN apt-get update && apt-get install -y \
|
||||
python3-pip
|
||||
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
"pip<20.3" \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
|
||||
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -33,7 +33,7 @@ RUN apt-get update && apt-get install -y \
|
||||
python3-pip
|
||||
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
"pip<20.3" \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
|
@ -33,7 +33,7 @@ RUN apt-get update && apt-get install -y \
|
||||
python3-pip
|
||||
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
"pip<20.3" \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
|
@ -62,7 +62,7 @@ RUN apt-get update && apt-get install -y \
|
||||
python3-pip
|
||||
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
"pip<20.3" \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
|
@ -62,7 +62,7 @@ RUN apt-get update && apt-get install -y \
|
||||
python3-pip
|
||||
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
"pip<20.3" \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
|
@ -22,37 +22,34 @@
|
||||
ARG UBUNTU_VERSION=18.04
|
||||
|
||||
ARG ARCH=
|
||||
ARG CUDA=10.1
|
||||
ARG CUDA=11.0
|
||||
FROM nvidia/cuda${ARCH:+-$ARCH}:${CUDA}-base-ubuntu${UBUNTU_VERSION} as base
|
||||
# ARCH and CUDA are specified again because the FROM directive resets ARGs
|
||||
# (but their default value is retained if set previously)
|
||||
ARG ARCH
|
||||
ARG CUDA
|
||||
ARG CUDNN=7.6.4.38-1
|
||||
ARG CUDNN_MAJOR_VERSION=7
|
||||
ARG CUDNN=8.0.4.30-1
|
||||
ARG CUDNN_MAJOR_VERSION=8
|
||||
ARG LIB_DIR_PREFIX=x86_64
|
||||
ARG LIBNVINFER=6.0.1-1
|
||||
ARG LIBNVINFER_MAJOR_VERSION=6
|
||||
ARG LIBNVINFER=7.1.3-1
|
||||
ARG LIBNVINFER_MAJOR_VERSION=7
|
||||
|
||||
# Needed for string substitution
|
||||
SHELL ["/bin/bash", "-c"]
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
build-essential \
|
||||
cuda-command-line-tools-${CUDA/./-} \
|
||||
# There appears to be a regression in libcublas10=10.2.2.89-1 which
|
||||
# prevents cublas from initializing in TF. See
|
||||
# https://github.com/tensorflow/tensorflow/issues/9489#issuecomment-562394257
|
||||
libcublas10=10.2.1.243-1 \
|
||||
libcublas-dev=10.2.1.243-1 \
|
||||
libcublas-${CUDA/./-} \
|
||||
libcublas-dev-${CUDA/./-} \
|
||||
cuda-nvrtc-${CUDA/./-} \
|
||||
cuda-nvrtc-dev-${CUDA/./-} \
|
||||
cuda-cudart-dev-${CUDA/./-} \
|
||||
cuda-cufft-dev-${CUDA/./-} \
|
||||
cuda-curand-dev-${CUDA/./-} \
|
||||
cuda-cusolver-dev-${CUDA/./-} \
|
||||
cuda-cusparse-dev-${CUDA/./-} \
|
||||
libcudnn7=${CUDNN}+cuda${CUDA} \
|
||||
libcudnn7-dev=${CUDNN}+cuda${CUDA} \
|
||||
libcufft-dev-${CUDA/./-} \
|
||||
libcurand-dev-${CUDA/./-} \
|
||||
libcusolver-dev-${CUDA/./-} \
|
||||
libcusparse-dev-${CUDA/./-} \
|
||||
libcudnn8=${CUDNN}+cuda${CUDA} \
|
||||
libcudnn8-dev=${CUDNN}+cuda${CUDA} \
|
||||
libcurl3-dev \
|
||||
libfreetype6-dev \
|
||||
libhdf5-serial-dev \
|
||||
@ -67,7 +64,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
git \
|
||||
&& \
|
||||
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
|
||||
rm /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libcudnn_static_v8.a
|
||||
|
||||
# Install TensorRT if not building for PowerPC
|
||||
RUN [[ "${ARCH}" = "ppc64le" ]] || { apt-get update && \
|
||||
@ -104,7 +101,7 @@ RUN apt-get update && apt-get install -y \
|
||||
python3-pip
|
||||
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
"pip<20.3" \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
|
@ -22,37 +22,34 @@
|
||||
ARG UBUNTU_VERSION=18.04
|
||||
|
||||
ARG ARCH=
|
||||
ARG CUDA=10.1
|
||||
ARG CUDA=11.0
|
||||
FROM nvidia/cuda${ARCH:+-$ARCH}:${CUDA}-base-ubuntu${UBUNTU_VERSION} as base
|
||||
# ARCH and CUDA are specified again because the FROM directive resets ARGs
|
||||
# (but their default value is retained if set previously)
|
||||
ARG ARCH
|
||||
ARG CUDA
|
||||
ARG CUDNN=7.6.4.38-1
|
||||
ARG CUDNN_MAJOR_VERSION=7
|
||||
ARG CUDNN=8.0.4.30-1
|
||||
ARG CUDNN_MAJOR_VERSION=8
|
||||
ARG LIB_DIR_PREFIX=x86_64
|
||||
ARG LIBNVINFER=6.0.1-1
|
||||
ARG LIBNVINFER_MAJOR_VERSION=6
|
||||
ARG LIBNVINFER=7.1.3-1
|
||||
ARG LIBNVINFER_MAJOR_VERSION=7
|
||||
|
||||
# Needed for string substitution
|
||||
SHELL ["/bin/bash", "-c"]
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
build-essential \
|
||||
cuda-command-line-tools-${CUDA/./-} \
|
||||
# There appears to be a regression in libcublas10=10.2.2.89-1 which
|
||||
# prevents cublas from initializing in TF. See
|
||||
# https://github.com/tensorflow/tensorflow/issues/9489#issuecomment-562394257
|
||||
libcublas10=10.2.1.243-1 \
|
||||
libcublas-dev=10.2.1.243-1 \
|
||||
libcublas-${CUDA/./-} \
|
||||
libcublas-dev-${CUDA/./-} \
|
||||
cuda-nvrtc-${CUDA/./-} \
|
||||
cuda-nvrtc-dev-${CUDA/./-} \
|
||||
cuda-cudart-dev-${CUDA/./-} \
|
||||
cuda-cufft-dev-${CUDA/./-} \
|
||||
cuda-curand-dev-${CUDA/./-} \
|
||||
cuda-cusolver-dev-${CUDA/./-} \
|
||||
cuda-cusparse-dev-${CUDA/./-} \
|
||||
libcudnn7=${CUDNN}+cuda${CUDA} \
|
||||
libcudnn7-dev=${CUDNN}+cuda${CUDA} \
|
||||
libcufft-dev-${CUDA/./-} \
|
||||
libcurand-dev-${CUDA/./-} \
|
||||
libcusolver-dev-${CUDA/./-} \
|
||||
libcusparse-dev-${CUDA/./-} \
|
||||
libcudnn8=${CUDNN}+cuda${CUDA} \
|
||||
libcudnn8-dev=${CUDNN}+cuda${CUDA} \
|
||||
libcurl3-dev \
|
||||
libfreetype6-dev \
|
||||
libhdf5-serial-dev \
|
||||
@ -67,7 +64,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
git \
|
||||
&& \
|
||||
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
|
||||
rm /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libcudnn_static_v8.a
|
||||
|
||||
# Install TensorRT if not building for PowerPC
|
||||
RUN [[ "${ARCH}" = "ppc64le" ]] || { apt-get update && \
|
||||
@ -104,7 +101,7 @@ RUN apt-get update && apt-get install -y \
|
||||
python3-pip
|
||||
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
"pip<20.3" \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
|
@ -22,17 +22,17 @@
|
||||
ARG UBUNTU_VERSION=18.04
|
||||
|
||||
ARG ARCH=
|
||||
ARG CUDA=10.1
|
||||
ARG CUDA=11.0
|
||||
FROM nvidia/cuda${ARCH:+-$ARCH}:${CUDA}-base-ubuntu${UBUNTU_VERSION} as base
|
||||
# ARCH and CUDA are specified again because the FROM directive resets ARGs
|
||||
# (but their default value is retained if set previously)
|
||||
ARG ARCH
|
||||
ARG CUDA
|
||||
ARG CUDNN=7.6.4.38-1
|
||||
ARG CUDNN_MAJOR_VERSION=7
|
||||
ARG CUDNN=8.0.4.30-1
|
||||
ARG CUDNN_MAJOR_VERSION=8
|
||||
ARG LIB_DIR_PREFIX=x86_64
|
||||
ARG LIBNVINFER=6.0.1-1
|
||||
ARG LIBNVINFER_MAJOR_VERSION=6
|
||||
ARG LIBNVINFER=7.1.3-1
|
||||
ARG LIBNVINFER_MAJOR_VERSION=7
|
||||
|
||||
# Needed for string substitution
|
||||
SHELL ["/bin/bash", "-c"]
|
||||
@ -40,17 +40,14 @@ SHELL ["/bin/bash", "-c"]
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
build-essential \
|
||||
cuda-command-line-tools-${CUDA/./-} \
|
||||
# There appears to be a regression in libcublas10=10.2.2.89-1 which
|
||||
# prevents cublas from initializing in TF. See
|
||||
# https://github.com/tensorflow/tensorflow/issues/9489#issuecomment-562394257
|
||||
libcublas10=10.2.1.243-1 \
|
||||
libcublas-${CUDA/./-} \
|
||||
cuda-nvrtc-${CUDA/./-} \
|
||||
cuda-cufft-${CUDA/./-} \
|
||||
cuda-curand-${CUDA/./-} \
|
||||
cuda-cusolver-${CUDA/./-} \
|
||||
cuda-cusparse-${CUDA/./-} \
|
||||
libcufft-${CUDA/./-} \
|
||||
libcurand-${CUDA/./-} \
|
||||
libcusolver-${CUDA/./-} \
|
||||
libcusparse-${CUDA/./-} \
|
||||
curl \
|
||||
libcudnn7=${CUDNN}+cuda${CUDA} \
|
||||
libcudnn8=${CUDNN}+cuda${CUDA} \
|
||||
libfreetype6-dev \
|
||||
libhdf5-serial-dev \
|
||||
libzmq3-dev \
|
||||
@ -82,7 +79,7 @@ RUN apt-get update && apt-get install -y \
|
||||
python3-pip
|
||||
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
"pip<20.3" \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
|
@ -22,17 +22,17 @@
|
||||
ARG UBUNTU_VERSION=18.04
|
||||
|
||||
ARG ARCH=
|
||||
ARG CUDA=10.1
|
||||
ARG CUDA=11.0
|
||||
FROM nvidia/cuda${ARCH:+-$ARCH}:${CUDA}-base-ubuntu${UBUNTU_VERSION} as base
|
||||
# ARCH and CUDA are specified again because the FROM directive resets ARGs
|
||||
# (but their default value is retained if set previously)
|
||||
ARG ARCH
|
||||
ARG CUDA
|
||||
ARG CUDNN=7.6.4.38-1
|
||||
ARG CUDNN_MAJOR_VERSION=7
|
||||
ARG CUDNN=8.0.4.30-1
|
||||
ARG CUDNN_MAJOR_VERSION=8
|
||||
ARG LIB_DIR_PREFIX=x86_64
|
||||
ARG LIBNVINFER=6.0.1-1
|
||||
ARG LIBNVINFER_MAJOR_VERSION=6
|
||||
ARG LIBNVINFER=7.1.3-1
|
||||
ARG LIBNVINFER_MAJOR_VERSION=7
|
||||
|
||||
# Needed for string substitution
|
||||
SHELL ["/bin/bash", "-c"]
|
||||
@ -40,17 +40,14 @@ SHELL ["/bin/bash", "-c"]
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
build-essential \
|
||||
cuda-command-line-tools-${CUDA/./-} \
|
||||
# There appears to be a regression in libcublas10=10.2.2.89-1 which
|
||||
# prevents cublas from initializing in TF. See
|
||||
# https://github.com/tensorflow/tensorflow/issues/9489#issuecomment-562394257
|
||||
libcublas10=10.2.1.243-1 \
|
||||
libcublas-${CUDA/./-} \
|
||||
cuda-nvrtc-${CUDA/./-} \
|
||||
cuda-cufft-${CUDA/./-} \
|
||||
cuda-curand-${CUDA/./-} \
|
||||
cuda-cusolver-${CUDA/./-} \
|
||||
cuda-cusparse-${CUDA/./-} \
|
||||
libcufft-${CUDA/./-} \
|
||||
libcurand-${CUDA/./-} \
|
||||
libcusolver-${CUDA/./-} \
|
||||
libcusparse-${CUDA/./-} \
|
||||
curl \
|
||||
libcudnn7=${CUDNN}+cuda${CUDA} \
|
||||
libcudnn8=${CUDNN}+cuda${CUDA} \
|
||||
libfreetype6-dev \
|
||||
libhdf5-serial-dev \
|
||||
libzmq3-dev \
|
||||
@ -82,7 +79,7 @@ RUN apt-get update && apt-get install -y \
|
||||
python3-pip
|
||||
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
"pip<20.3" \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
|
@ -6,7 +6,7 @@ RUN apt-get update && apt-get install -y \
|
||||
python3-pip
|
||||
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
"pip<20.3" \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
|
Loading…
x
Reference in New Issue
Block a user