Commit graph

9 commits

Author SHA1 Message Date
Xu Zhao
7763bb6cb3 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
2021-03-12 11:18:05 -08:00
Eli Uriegas
474fe7d976 docker: Update default cuda => 11.1 (#53299)
Summary:
We no longer build binaries for CUDA 11.0 so let's ensure that we have
build for CUDA 11.1 by default instead

Signed-off-by: Eli Uriegas <eliuriegas@fb.com>

Pull Request resolved: https://github.com/pytorch/pytorch/pull/53299

Reviewed By: anjali411

Differential Revision: D26857194

Pulled By: seemethere

fbshipit-source-id: 6094913922c0da832b96e5e49a67369d69d0b8ad
2021-03-05 14:45:57 -08:00
Xu Zhao
03e82f7944 Use CUDA 11.2 for nightly docker build. (#51990)
Summary:
Set CUDA_VERSION to 11.2.0 since Nvidia name their docker image on Ubuntu 18.04 to be nvidia/cuda:11.2.0-cudnn8-devel-ubuntu18.04.

Note that cudatoolkit 11.2.0 is not yet on [conda](https://repo.anaconda.com/pkgs/main/linux-64/), and we need to wait for that before merging this PR.

- https://hub.docker.com/r/nvidia/cuda/

Pull Request resolved: https://github.com/pytorch/pytorch/pull/51990

Reviewed By: samestep

Differential Revision: D26371193

Pulled By: xuzhao9

fbshipit-source-id: 76915490dc30ddb03ceeeadb3c45a6c02b60401e
2021-02-10 10:46:20 -08:00
Xu Zhao
1e70b4bb73 Add GH Actions CI to build nightly Docker and push to GitHub Container Registry (#51755)
Summary:
Currently PyTorch repository provides Dockerfile to build Docker with nightly builds, but it doesn't have CI to actually build those Dockers.
This PR adds a GitHub action workflow to create PyTorch nightly build Docker and publish them to GitHub Container Registry.
Also, add "--always" option to the `git describe --tags` command that generates the Docker image tag.

Pull Request resolved: https://github.com/pytorch/pytorch/pull/51755

Test Plan: Manually trigger the workflow build in the GitHub Actions web UI.

Reviewed By: seemethere

Differential Revision: D26320180

Pulled By: xuzhao9

fbshipit-source-id: e00b472df14f5913cab9b06a41e837014e87f1c7
2021-02-08 14:59:30 -08:00
Felix Abecassis
0c3bae6a89 docker: add environment variable PYTORCH_VERSION (#50154)
Summary:
The aim is being able to inspect a container image and determine immediately
which version of pytorch it contains.

Closes https://github.com/pytorch/pytorch/issues/48324

Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>

seemethere PTAL.
As you requested in https://github.com/pytorch/pytorch/issues/48324#issuecomment-754237156, I'm submitting the patch. But I could only do limited testing as I'm not sure these Makefile/Dockerfile are used for pushing the Docker Hub images (since the Makefile tags the image with a `v` prefix for the version, as in: `pytorch:v1.7.1`, but Docker Hub images don't have this prefix).

Also on the master branch we currently have the following:
```
$ git describe --tags
v1.4.0a0-11171-g68a6e46379
```
So it's a little off, but it behaves as expected on the `release/1.7` branch.

Pull Request resolved: https://github.com/pytorch/pytorch/pull/50154

Reviewed By: walterddr

Differential Revision: D25828491

Pulled By: seemethere

fbshipit-source-id: 500ec96cb5f5da1321610002d5e3678f4b0b94b5
2021-01-07 14:12:54 -08:00
Eli Uriegas
881e9583b2 docker: Add make variable to add docker build args (#48942)
Summary:
Adds an extra make variable 'EXTRA_DOCKER_BUILD_FLAGS' that allows us to
add extra docker build flags to the docker build command.

Example:

    make -f docker.Makefile EXTRA_DOCKER_BUILD_FLAGS=--no-cache devel-image

Signed-off-by: Eli Uriegas <eliuriegas@fb.com>

Pull Request resolved: https://github.com/pytorch/pytorch/pull/48942

Reviewed By: walterddr

Differential Revision: D25376288

Pulled By: seemethere

fbshipit-source-id: 9cf2c2a5e01d505fa54447604ecd653dcbdd42e1
2020-12-07 20:15:24 -08:00
Eli Uriegas
1dd4f4334c docker: Make CUDA_VERSION configurable (#48199)
Summary:
makes CUDA_VERSION configurable for the docker images:

make CUDA_VERSION=10.2 CUDNN_VERSION=7 official-image

Signed-off-by: Eli Uriegas <eliuriegas@fb.com>

Pull Request resolved: https://github.com/pytorch/pytorch/pull/48199

Reviewed By: xuzhao9, janeyx99

Differential Revision: D25064256

Pulled By: seemethere

fbshipit-source-id: 25f52185097be647d11b5324f9f97cd41cdad75b
2020-11-19 10:06:45 -08:00
Tim Nieradzik
99242eca1d Dockerfile: Support CUDA 11 (#45071)
Summary:
Although PyTorch already supports CUDA 11, the Dockerfile still relies on CUDA 10. This pull request upgrades all the necessary versions such that recent NVIDIA GPUs like A100 can be used.

Pull Request resolved: https://github.com/pytorch/pytorch/pull/45071

Reviewed By: ezyang

Differential Revision: D23873224

Pulled By: seemethere

fbshipit-source-id: 822c25f183dcc3b4c5b780c00cd37744d34c6e00
2020-09-23 11:38:49 -07:00
Eli Uriegas
f0c85571ed docker: Refactor Dockerfile process for official images (#32515)
Summary:
## Commit Message:

Refactors Dockerfile to be as parallel as possible with caching and adds a new Makefile to build said Dockerfile.

Also updated the README.md to reflect the changes as well as updated some of the verbage around running our latest Docker images.

Adds the new Dockerfile process to our CircleCI workflows

## How to build:

Building the new images is pretty simple, just requires `docker` > 18.06 since the new build process relies on `buildkit` caching and multi-stage build resolving.

### Development images
For `runtime` images:
```
make -f docker.Makefile runtime-image
```

For `devel` images:
```
make -f docker.Makefile devel-image
```

Builds are tagged as follows:
```bash
docker.io/${docker_user:-whoami}/pytorch:$(git describe --tags)-${image_type}
```

Example:
```
docker.io/seemethere/pytorch:v1.4.0a0-2225-g9eba97b61d-runtime
```

### Official images

Official images are the ones hosted on [`docker.io/pytorch/pytorch`](https://hub.docker.com/r/pytorch/pytorch)

To do official images builds you can simply add set the `BUILD_TYPE` variable to `official` and it will do the correct build without building the local binaries:

Example:
```
make -f docker.Makefile BUILD_TYPE=official runtime-image
```

## How to push:

Pushing is also super simple (And will automatically tag the right thing based off of the git tag):

```
make -f docker.Makefile runtime-push
make -f docker.Makefile devel-push
```
Signed-off-by: Eli Uriegas <eliuriegas@fb.com>
Pull Request resolved: https://github.com/pytorch/pytorch/pull/32515

Differential Revision: D19558619

Pulled By: seemethere

fbshipit-source-id: a06b25cd39ae9890751a60f8f36739ad6ab9ac99
2020-01-24 10:27:20 -08:00