From 2f968b91b07af3c92d7fe25b59384485a7c1b166 Mon Sep 17 00:00:00 2001 From: Nikita Shulga Date: Thu, 6 Jul 2023 03:41:54 +0000 Subject: [PATCH 1/3] Update Docker base images Followup after https://github.com/pytorch/builder/pull/1446 CUDA-10.2 and moreover CUDA-9.2 docker images are gone per [Nvidia's Container Support Policy](https://gitlab.com/nvidia/container-images/cuda/blob/master/doc/support-policy.md): > After a period of Six Months time, the EOL tags WILL BE DELETED from Docker Hub and Nvidia GPU Cloud (NGC). This deletion ensures unsupported tags (and image layers) are not left lying around for customers to continue using after they have long been abandoned. --- conda/Dockerfile | 2 +- conda/build_docker.sh | 8 ++------ libtorch/Dockerfile | 2 +- libtorch/build_docker.sh | 4 ++-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/conda/Dockerfile b/conda/Dockerfile index 95b911c8b..de6abd149 100644 --- a/conda/Dockerfile +++ b/conda/Dockerfile @@ -1,6 +1,6 @@ ARG CUDA_VERSION=10.2 ARG BASE_TARGET=cuda${CUDA_VERSION} -FROM nvidia/cuda:9.2-devel-centos7 as base +FROM nvidia/cuda:11.4.3-devel-centos7 as base ENV LC_ALL en_US.UTF-8 ENV LANG en_US.UTF-8 diff --git a/conda/build_docker.sh b/conda/build_docker.sh index a3385ff38..c15e55a06 100755 --- a/conda/build_docker.sh +++ b/conda/build_docker.sh @@ -5,11 +5,7 @@ set -eou pipefail export DOCKER_BUILDKIT=1 TOPDIR=$(git rev-parse --show-toplevel) -CUDA_VERSION=${CUDA_VERSION:-10.2} -DEVTOOLSET_VERSION="9" -if [[ ${CUDA_VERSION:0:2} == "10" ]]; then - DEVTOOLSET_VERSION="7" -fi +CUDA_VERSION=${CUDA_VERSION:-11.7} case ${CUDA_VERSION} in cpu) @@ -32,7 +28,7 @@ esac --target final \ --build-arg "BASE_TARGET=${BASE_TARGET}" \ --build-arg "CUDA_VERSION=${CUDA_VERSION}" \ - --build-arg "DEVTOOLSET_VERSION=${DEVTOOLSET_VERSION}" \ + --build-arg "DEVTOOLSET_VERSION=9" \ -t "pytorch/conda-builder:${DOCKER_TAG}" \ -f "${TOPDIR}/conda/Dockerfile" \ ${TOPDIR} diff --git a/libtorch/Dockerfile b/libtorch/Dockerfile index 12cc9a421..400cbb69c 100644 --- a/libtorch/Dockerfile +++ b/libtorch/Dockerfile @@ -1,5 +1,5 @@ ARG BASE_TARGET=base -ARG GPU_IMAGE=nvidia/cuda:10.2-devel-ubuntu18.04 +ARG GPU_IMAGE=nvidia/cuda:11.4.3-devel-ubuntu18.04 FROM ${GPU_IMAGE} as base ENV DEBIAN_FRONTEND=noninteractive diff --git a/libtorch/build_docker.sh b/libtorch/build_docker.sh index 299c8ae43..9033258bf 100755 --- a/libtorch/build_docker.sh +++ b/libtorch/build_docker.sh @@ -15,13 +15,13 @@ case ${GPU_ARCH_TYPE} in cpu) BASE_TARGET=cpu DOCKER_TAG=cpu - GPU_IMAGE=nvidia/cuda:10.2-devel-ubuntu18.04 + GPU_IMAGE=nvidia/cuda:11.4.3-devel-ubuntu18.04 DOCKER_GPU_BUILD_ARG="" ;; cuda) BASE_TARGET=cuda${GPU_ARCH_VERSION} DOCKER_TAG=cuda${GPU_ARCH_VERSION} - GPU_IMAGE=nvidia/cuda:10.2-devel-ubuntu18.04 + GPU_IMAGE=nvidia/cuda:11.4.3-devel-ubuntu18.04 DOCKER_GPU_BUILD_ARG="" ;; rocm) From 978fad724b8055392854d7cfbcaaf2df9fe965e3 Mon Sep 17 00:00:00 2001 From: Nikita Shulga Date: Thu, 6 Jul 2023 06:54:56 -0700 Subject: [PATCH 2/3] Just use centos:7 --- conda/Dockerfile | 2 +- libtorch/Dockerfile | 2 +- libtorch/build_docker.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conda/Dockerfile b/conda/Dockerfile index de6abd149..45cc9b3d7 100644 --- a/conda/Dockerfile +++ b/conda/Dockerfile @@ -1,6 +1,6 @@ ARG CUDA_VERSION=10.2 ARG BASE_TARGET=cuda${CUDA_VERSION} -FROM nvidia/cuda:11.4.3-devel-centos7 as base +FROM centos:7 as base ENV LC_ALL en_US.UTF-8 ENV LANG en_US.UTF-8 diff --git a/libtorch/Dockerfile b/libtorch/Dockerfile index 400cbb69c..0899a91ce 100644 --- a/libtorch/Dockerfile +++ b/libtorch/Dockerfile @@ -1,5 +1,5 @@ ARG BASE_TARGET=base -ARG GPU_IMAGE=nvidia/cuda:11.4.3-devel-ubuntu18.04 +ARG GPU_IMAGE=ubuntu:18.04 FROM ${GPU_IMAGE} as base ENV DEBIAN_FRONTEND=noninteractive diff --git a/libtorch/build_docker.sh b/libtorch/build_docker.sh index 9033258bf..c799bb178 100755 --- a/libtorch/build_docker.sh +++ b/libtorch/build_docker.sh @@ -15,13 +15,13 @@ case ${GPU_ARCH_TYPE} in cpu) BASE_TARGET=cpu DOCKER_TAG=cpu - GPU_IMAGE=nvidia/cuda:11.4.3-devel-ubuntu18.04 + GPU_IMAGE=ubuntu:18.04 DOCKER_GPU_BUILD_ARG="" ;; cuda) BASE_TARGET=cuda${GPU_ARCH_VERSION} DOCKER_TAG=cuda${GPU_ARCH_VERSION} - GPU_IMAGE=nvidia/cuda:11.4.3-devel-ubuntu18.04 + GPU_IMAGE=ubuntu:18.04 DOCKER_GPU_BUILD_ARG="" ;; rocm) From b81d539608b514b5e7c67d20b5d4dbf077f2e0d6 Mon Sep 17 00:00:00 2001 From: Nikita Shulga Date: Thu, 6 Jul 2023 09:37:02 -0700 Subject: [PATCH 3/3] Add g++ --- libtorch/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libtorch/Dockerfile b/libtorch/Dockerfile index 0899a91ce..ad3f8aad3 100644 --- a/libtorch/Dockerfile +++ b/libtorch/Dockerfile @@ -5,7 +5,7 @@ FROM ${GPU_IMAGE} as base ENV DEBIAN_FRONTEND=noninteractive RUN apt-get clean && apt-get update -RUN apt-get install -y curl locales git-all autoconf automake make cmake wget unzip +RUN apt-get install -y curl locales g++ git-all autoconf automake make cmake wget unzip # Just add everything as a safe.directory for git since these will be used in multiple places with git RUN git config --global --add safe.directory '*'