From 7763bb6cb3395f1cf7f694d6cbd37d2fa74d5df6 Mon Sep 17 00:00:00 2001 From: Xu Zhao Date: Fri, 12 Mar 2021 11:13:49 -0800 Subject: [PATCH] Use the conda channel defined in docker.Makefile to install cudatoolkit (#53316) Summary: Pull Request resolved: https://github.com/pytorch/pytorch/pull/53316 Test Plan: Nightly Docker build CI This is a follow-up PR after docker moved default CUDA => 11.1. Only merge this after https://github.com/pytorch/pytorch/issues/53299 is committed. Reviewed By: albanD Differential Revision: D26996287 Pulled By: xuzhao9 fbshipit-source-id: 0c2e03da41d036d7aada3e07d479a3dede219f58 --- .github/scripts/build_publish_nightly_docker.sh | 3 +-- docker.Makefile | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/scripts/build_publish_nightly_docker.sh b/.github/scripts/build_publish_nightly_docker.sh index e47a3042c6a..55c764596eb 100644 --- a/.github/scripts/build_publish_nightly_docker.sh +++ b/.github/scripts/build_publish_nightly_docker.sh @@ -3,14 +3,13 @@ set -xeuo pipefail PYTORCH_DOCKER_TAG=$(git describe --tags --always)-devel -CUDA_VERSION=11.1.1 +CUDA_VERSION=11.1 # Build PyTorch nightly docker make -f docker.Makefile \ DOCKER_REGISTRY=ghcr.io \ DOCKER_ORG=pytorch \ CUDA_VERSION=${CUDA_VERSION} \ - CUDA_CHANNEL=conda-forge \ DOCKER_IMAGE=pytorch-nightly \ DOCKER_TAG=${PYTORCH_DOCKER_TAG} \ INSTALL_CHANNEL=pytorch-nightly BUILD_TYPE=official devel-image diff --git a/docker.Makefile b/docker.Makefile index 5b45bafc4e3..dc7942518f9 100644 --- a/docker.Makefile +++ b/docker.Makefile @@ -14,7 +14,7 @@ BASE_RUNTIME = ubuntu:18.04 BASE_DEVEL = nvidia/cuda:$(CUDA_VERSION)-cudnn$(CUDNN_VERSION)-devel-ubuntu18.04 # The conda channel to use to install cudatoolkit -CUDA_CHANNEL = defaults +CUDA_CHANNEL = nvidia # The conda channel to use to install pytorch / torchvision INSTALL_CHANNEL = pytorch