OSSForks/pytorch
1
0
Fork 0
mirror of https://github.com/zebrajr/pytorch.git synced 2025-12-06 00:20:18 +01:00
Code Issues Actions 38 Packages Projects Releases Wiki Activity

Advance nightly docker to 11.6 (#86941)

Browse Source 
Fixes following:
https://github.com/pytorch/pytorch/actions/runs/3242695506/jobs/5316334351
crash in Docker builds introduced by: #82682

The PR seems to introduce some changes not compatible with cuda 11.3 which is used by our Docker builds

Pull Request resolved: https://github.com/pytorch/pytorch/pull/86941
Approved by: https://github.com/malfet
This commit is contained in:
atalman 2022-10-19 21:26:53 +00:00 committed by PyTorch MergeBot
parent 6eeeb88172
commit c5de535bc0
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/scripts/build_publish_nightly_docker.sh vendored
View File

@ -3,13 +3,14 @@
set -xeuo pipefail set -xeuo pipefail
PYTORCH_DOCKER_TAG=$(git describe --tags --always)-devel PYTORCH_DOCKER_TAG=$(git describe --tags --always)-devel
CUDA_VERSION=11.3.1 CUDA_VERSION=11.6.2
# Build PyTorch nightly docker # Build PyTorch nightly docker
make -f docker.Makefile \ make -f docker.Makefile \
DOCKER_REGISTRY=ghcr.io \ DOCKER_REGISTRY=ghcr.io \
DOCKER_ORG=pytorch \ DOCKER_ORG=pytorch \
CUDA_VERSION=${CUDA_VERSION} \ CUDA_VERSION=${CUDA_VERSION} \
CUDA_VERSION_SHORT="${CUDA_VERSION:0:2}.${CUDA_VERSION:4:1}" \
DOCKER_IMAGE=pytorch-nightly \ DOCKER_IMAGE=pytorch-nightly \
DOCKER_TAG=${PYTORCH_DOCKER_TAG} \ DOCKER_TAG=${PYTORCH_DOCKER_TAG} \
INSTALL_CHANNEL=pytorch-nightly BUILD_TYPE=official devel-image INSTALL_CHANNEL=pytorch-nightly BUILD_TYPE=official devel-image

7
Dockerfile
View File

@ -59,17 +59,18 @@ RUN --mount=type=cache,target=/opt/ccache \
FROM conda as conda-installs FROM conda as conda-installs
ARG PYTHON_VERSION=3.8 ARG PYTHON_VERSION=3.8
ARG CUDA_VERSION=11.3 ARG CUDA_VERSION=11.6
ARG CUDA_CHANNEL=nvidia ARG CUDA_CHANNEL=nvidia
ARG INSTALL_CHANNEL=pytorch-nightly ARG INSTALL_CHANNEL=pytorch-nightly
ENV CONDA_OVERRIDE_CUDA=${CUDA_VERSION}
# Automatically set by buildx # Automatically set by buildx
RUN /opt/conda/bin/conda update -y conda
RUN /opt/conda/bin/conda install -c "${INSTALL_CHANNEL}" -y python=${PYTHON_VERSION} RUN /opt/conda/bin/conda install -c "${INSTALL_CHANNEL}" -y python=${PYTHON_VERSION}
ARG TARGETPLATFORM ARG TARGETPLATFORM
# On arm64 we can only install wheel packages # On arm64 we can only install wheel packages
RUN case ${TARGETPLATFORM} in \ RUN case ${TARGETPLATFORM} in \
"linux/arm64") pip install --extra-index-url https://download.pytorch.org/whl/cpu/ torch torchvision torchtext ;; \ "linux/arm64") pip install --extra-index-url https://download.pytorch.org/whl/cpu/ torch torchvision torchtext ;; \
*) /opt/conda/bin/conda install -c "${INSTALL_CHANNEL}" -c "${CUDA_CHANNEL}" -y "python=${PYTHON_VERSION}" pytorch torchvision torchtext "cudatoolkit=${CUDA_VERSION}" ;; \ *) /opt/conda/bin/conda install -c "${INSTALL_CHANNEL}" -c "${CUDA_CHANNEL}" -y "python=${PYTHON_VERSION}" pytorch torchvision torchtext "pytorch-cuda=$(echo $CUDA_VERSION | cut -d'.' -f 1-2)" ;; \
esac && \ esac && \
/opt/conda/bin/conda clean -ya /opt/conda/bin/conda clean -ya
RUN /opt/conda/bin/pip install torchelastic RUN /opt/conda/bin/pip install torchelastic

4
docker.Makefile
View File

@ -8,7 +8,7 @@ $(warning WARNING: No docker user found using results from whoami)
DOCKER_ORG = $(shell whoami) DOCKER_ORG = $(shell whoami)
endif endif
CUDA_VERSION = 11.3.1 CUDA_VERSION = 11.6.2
CUDNN_VERSION = 8 CUDNN_VERSION = 8
BASE_RUNTIME = ubuntu:18.04 BASE_RUNTIME = ubuntu:18.04
BASE_DEVEL = nvidia/cuda:$(CUDA_VERSION)-cudnn$(CUDNN_VERSION)-devel-ubuntu18.04 BASE_DEVEL = nvidia/cuda:$(CUDA_VERSION)-cudnn$(CUDNN_VERSION)-devel-ubuntu18.04
@ -18,7 +18,7 @@ CUDA_CHANNEL = nvidia
# The conda channel to use to install pytorch / torchvision # The conda channel to use to install pytorch / torchvision
INSTALL_CHANNEL ?= pytorch INSTALL_CHANNEL ?= pytorch
PYTHON_VERSION ?= 3.8 PYTHON_VERSION ?= 3.9
PYTORCH_VERSION ?= $(shell git describe --tags --always) PYTORCH_VERSION ?= $(shell git describe --tags --always)
# Can be either official / dev # Can be either official / dev
BUILD_TYPE ?= dev BUILD_TYPE ?= dev