From e8429dc5404108ba9d200f93f6546c544e44b02d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Geron?= Date: Mon, 26 Sep 2022 23:13:07 +1300 Subject: [PATCH] Update Dockerfiles to latest versions --- docker/Dockerfile | 1 + docker/Dockerfile.gpu | 77 +++++++++++++++++++++++-------------------- 2 files changed, 42 insertions(+), 36 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 94d9899..7635199 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,7 @@ FROM continuumio/miniconda3:latest RUN apt-get update && apt-get install -y \ + protobuf-compiler \ sudo \ && apt clean \ && rm -rf /var/lib/apt/lists/* diff --git a/docker/Dockerfile.gpu b/docker/Dockerfile.gpu index a8dc73e..1bc3b57 100644 --- a/docker/Dockerfile.gpu +++ b/docker/Dockerfile.gpu @@ -9,48 +9,35 @@ ############################################### #### FROM tensorflow/tensorflow:latest-gpu #### ############################################### -ARG UBUNTU_VERSION=18.04 +ARG UBUNTU_VERSION=20.04 ARG ARCH= -ARG CUDA=11.0 -FROM nvidia/cuda${ARCH:+-$ARCH}:${CUDA}-base-ubuntu${UBUNTU_VERSION} as base +ARG CUDA=11.2 +FROM nvidia/cuda${ARCH:+-$ARCH}:${CUDA}.1-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=8.0.4.30-1 +ARG CUDNN=8.1.0.77-1 ARG CUDNN_MAJOR_VERSION=8 ARG LIB_DIR_PREFIX=x86_64 -ARG LIBNVINFER=7.1.3-1 +ARG LIBNVINFER=7.2.2-1 ARG LIBNVINFER_MAJOR_VERSION=7 +# Let us install tzdata painlessly +ENV DEBIAN_FRONTEND=noninteractive + # Needed for string substitution SHELL ["/bin/bash", "-c"] # Pick up some TF dependencies -# [HOML2] Tweaked for handson-ml3: added all the libs before build-essentials -# and call apt clean + remove apt cache. -RUN apt-get update -q && apt-get install -q -y --no-install-recommends \ - bzip2 \ - ca-certificates \ - cmake \ - ffmpeg \ +# [HOML3] Tweaked for handson-ml3: added all the libs before build-essentials +# and call apt clean + delete apt cache files. +RUN apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub && \ + apt-get update && apt-get install -y --no-install-recommends \ git \ - libboost-all-dev \ - libglib2.0-0 \ - libjpeg-dev \ - libpq-dev \ - libsdl2-dev \ - libsm6 \ - libxext6 \ - libxrender1 \ - mercurial \ - subversion \ + protobuf-compiler \ sudo \ - swig \ wget \ - xorg-dev \ - zip \ - zlib1g-dev \ build-essential \ cuda-command-line-tools-${CUDA/./-} \ libcublas-${CUDA/./-} \ @@ -71,14 +58,18 @@ RUN apt-get update -q && apt-get install -q -y --no-install-recommends \ && rm -rf /var/lib/apt/lists/* # Install TensorRT if not building for PowerPC +# NOTE: libnvinfer uses cuda11.1 versions RUN [[ "${ARCH}" = "ppc64le" ]] || { apt-get update && \ - apt-get install -y --no-install-recommends libnvinfer${LIBNVINFER_MAJOR_VERSION}=${LIBNVINFER}+cuda${CUDA} \ - libnvinfer-plugin${LIBNVINFER_MAJOR_VERSION}=${LIBNVINFER}+cuda${CUDA} \ + apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1804/x86_64/7fa2af80.pub && \ + echo "deb https://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1804/x86_64 /" > /etc/apt/sources.list.d/tensorRT.list && \ + apt-get update && \ + apt-get install -y --no-install-recommends libnvinfer${LIBNVINFER_MAJOR_VERSION}=${LIBNVINFER}+cuda11.0 \ + libnvinfer-plugin${LIBNVINFER_MAJOR_VERSION}=${LIBNVINFER}+cuda11.0 \ && apt-get clean \ && rm -rf /var/lib/apt/lists/*; } # For CUDA profiling, TensorFlow requires CUPTI. -ENV LD_LIBRARY_PATH /usr/local/cuda/extras/CUPTI/lib64:/usr/local/cuda/lib64:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH /usr/local/cuda-11.0/targets/x86_64-linux/lib:/usr/local/cuda/extras/CUPTI/lib64:/usr/local/cuda/lib64:$LD_LIBRARY_PATH # Link the libcuda stub to the location where tensorflow is searching for it and reconfigure # dynamic linker run-time bindings @@ -86,7 +77,7 @@ RUN ln -s /usr/local/cuda/lib64/stubs/libcuda.so /usr/local/cuda/lib64/stubs/lib && echo "/usr/local/cuda/lib64/stubs" > /etc/ld.so.conf.d/z-cuda-stubs.conf \ && ldconfig -# [HOML2] Tweaked for handson-ml3: removed Python3 & TensorFlow installation using pip +# [HOML3] Tweaked for handson-ml3: removed Python3 & TensorFlow installation using pip ################################################# #### End of tensorflow/tensorflow:latest-gpu #### @@ -105,15 +96,29 @@ ENV PATH /opt/conda/bin:/opt/conda/envs/homl3/bin:$PATH CMD [ "/bin/bash" ] # Leave these args here to better use the Docker build cache -ARG CONDA_VERSION=py38_4.9.2 -ARG CONDA_MD5=122c8c9beb51e124ab32a0fa6426c656 +ARG CONDA_VERSION=py39_4.12.0 -RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-${CONDA_VERSION}-Linux-x86_64.sh -O miniconda.sh && \ - echo "${CONDA_MD5} miniconda.sh" > miniconda.md5 && \ - if ! md5sum --status -c miniconda.md5; then exit 1; fi && \ +RUN set -x && \ + UNAME_M="$(uname -m)" && \ + if [ "${UNAME_M}" = "x86_64" ]; then \ + MINICONDA_URL="https://repo.anaconda.com/miniconda/Miniconda3-${CONDA_VERSION}-Linux-x86_64.sh"; \ + SHA256SUM="78f39f9bae971ec1ae7969f0516017f2413f17796670f7040725dd83fcff5689"; \ + elif [ "${UNAME_M}" = "s390x" ]; then \ + MINICONDA_URL="https://repo.anaconda.com/miniconda/Miniconda3-${CONDA_VERSION}-Linux-s390x.sh"; \ + SHA256SUM="ff6fdad3068ab5b15939c6f422ac329fa005d56ee0876c985e22e622d930e424"; \ + elif [ "${UNAME_M}" = "aarch64" ]; then \ + MINICONDA_URL="https://repo.anaconda.com/miniconda/Miniconda3-${CONDA_VERSION}-Linux-aarch64.sh"; \ + SHA256SUM="5f4f865812101fdc747cea5b820806f678bb50fe0a61f19dc8aa369c52c4e513"; \ + elif [ "${UNAME_M}" = "ppc64le" ]; then \ + MINICONDA_URL="https://repo.anaconda.com/miniconda/Miniconda3-${CONDA_VERSION}-Linux-ppc64le.sh"; \ + SHA256SUM="1fe3305d0ccc9e55b336b051ae12d82f33af408af4b560625674fa7ad915102b"; \ + fi && \ + wget "${MINICONDA_URL}" -O miniconda.sh -q && \ + echo "${SHA256SUM} miniconda.sh" > shasum && \ + if [ "${CONDA_VERSION}" != "latest" ]; then sha256sum --check --status shasum; fi && \ mkdir -p /opt && \ sh miniconda.sh -b -p /opt/conda && \ - rm miniconda.sh miniconda.md5 && \ + rm miniconda.sh shasum && \ ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \ echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc && \ echo "conda activate base" >> ~/.bashrc && \