Skip to content

Commit

Permalink
Switch Docker release to CUDA 11.7 (pytorch#94818)
Browse files Browse the repository at this point in the history
Switch Docker release to CUDA 11.7
Remove `ptxas` installation logic as Trition is now bundled with ptxas
Successful run: https://github.com/pytorch/pytorch/actions/runs/4176843201/jobs/7233661196

Pull Request resolved: pytorch#94818
Approved by: https://github.com/malfet
  • Loading branch information
atalman authored and pytorchmergebot committed Feb 14, 2023
1 parent 98012e4 commit 40cb494
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
9 changes: 2 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,15 @@ RUN --mount=type=cache,target=/opt/ccache \

FROM conda as conda-installs
ARG PYTHON_VERSION=3.8
ARG CUDA_VERSION=11.6
ARG CUDA_VERSION=11.7
ARG CUDA_CHANNEL=nvidia
ARG INSTALL_CHANNEL=pytorch-nightly
# 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}
ARG TARGETPLATFORM

# On arm64 we can only install wheel packages
# On arm64 we can only install wheel packages.
RUN case ${TARGETPLATFORM} in \
"linux/arm64") pip install --extra-index-url https://download.pytorch.org/whl/cpu/ torch torchvision torchaudio torchtext ;; \
*) /opt/conda/bin/conda install -c "${INSTALL_CHANNEL}" -c "${CUDA_CHANNEL}" -y "python=${PYTHON_VERSION}" pytorch torchvision torchaudio torchtext "pytorch-cuda=$(echo $CUDA_VERSION | cut -d'.' -f 1-2)" ;; \
Expand All @@ -89,11 +89,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
COPY --from=conda-installs /opt/conda /opt/conda
RUN if test -n "${TRITON_VERSION}" -a "${TARGETPLATFORM}" != "linux/arm64"; then \
apt install -y --no-install-recommends gcc; \
CU_VER=$(echo $CUDA_VERSION | cut -d'.' -f 1-2) && \
mkdir -p /usr/local/triton-min-cuda-${CU_VER} && \
ln -s /usr/local/triton-min-cuda-${CU_VER} /usr/local/cuda; \
mkdir -p /usr/local/cuda/bin; cp /opt/conda/bin/ptxas /usr/local/cuda/bin; \
mkdir -p /usr/local/cuda/include; cp /opt/conda/include/cuda.h /usr/local/cuda/include; \
fi
RUN rm -rf /var/lib/apt/lists/*
ENV PATH /opt/conda/bin:$PATH
Expand Down
2 changes: 1 addition & 1 deletion docker.Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ $(warning WARNING: No docker user found using results from whoami)
DOCKER_ORG = $(shell whoami)
endif

CUDA_VERSION = 11.6.2
CUDA_VERSION = 11.7.0
CUDNN_VERSION = 8
BASE_RUNTIME = ubuntu:18.04
BASE_DEVEL = nvidia/cuda:$(CUDA_VERSION)-cudnn$(CUDNN_VERSION)-devel-ubuntu18.04
Expand Down

0 comments on commit 40cb494

Please sign in to comment.