diff --git a/conda/Dockerfile b/conda/Dockerfile index 95b911c8b..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:9.2-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/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..ad3f8aad3 100644 --- a/libtorch/Dockerfile +++ b/libtorch/Dockerfile @@ -1,11 +1,11 @@ ARG BASE_TARGET=base -ARG GPU_IMAGE=nvidia/cuda:10.2-devel-ubuntu18.04 +ARG GPU_IMAGE=ubuntu:18.04 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 '*' diff --git a/libtorch/build_docker.sh b/libtorch/build_docker.sh index 299c8ae43..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:10.2-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:10.2-devel-ubuntu18.04 + GPU_IMAGE=ubuntu:18.04 DOCKER_GPU_BUILD_ARG="" ;; rocm)