Commit graph

23 commits

Author SHA1 Message Date
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
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
Eli Uriegas
0d6c900bdb docker: Fix PYTHON_VERSION not propagating (#47877)
Summary:
Signed-off-by: Eli Uriegas <eliuriegas@fb.com>

Fixes #{issue number}

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

Reviewed By: samestep

Differential Revision: D24929116

Pulled By: seemethere

fbshipit-source-id: 442f8eb13318c44735200dfbb2f88e4ca1d9a127
2020-11-17 11:49:30 -08:00
Aliaksandr Ivanou
208df1aeb8 Use python 3.8 in pytorch docker image (#45466)
Summary: Pull Request resolved: https://github.com/pytorch/pytorch/pull/45466

Test Plan: Imported from OSS

Reviewed By: seemethere

Differential Revision: D23975294

Pulled By: tierex

fbshipit-source-id: 964de7928b541121963e9de792630bcef172bb5c
2020-09-28 19:21:40 -07:00
Eli Uriegas
e2ffdf467a docker: Add torchelastic to docker image (#45438)
Summary:
Pull Request resolved: https://github.com/pytorch/pytorch/pull/45438

Adds torchelastic (as well as its dependencies) to the official docker
images

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

Test Plan: Imported from OSS

Reviewed By: tierex

Differential Revision: D23963787

Pulled By: seemethere

fbshipit-source-id: 54ebb4b9c50699e543f264975dadf99badf55753
2020-09-28 09:53:07 -07: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
305444a0bd Update miniconda repository, be specific about cudatoolkit (#37186)
Summary:
Miniconda repo has moved from continuum.io to anaconda.com

Also we should be specific about cudatoolkit version so that it installs
the right CUDA version.

Resolves https://github.com/pytorch/pytorch/issues/37047

Signed-off-by: Eli Uriegas <eliuriegas@fb.com>
Pull Request resolved: https://github.com/pytorch/pytorch/pull/37186

Differential Revision: D21443147

Pulled By: seemethere

fbshipit-source-id: 856718822bdd3ce51bbc6e59b0609fe6af77bd79
2020-05-07 09:58:18 -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
Edward Z. Yang
64e94f02b7 Move Dockerfile to docker/pytorch (#6009)
Signed-off-by: Edward Z. Yang <ezyang@fb.com>
2018-03-26 17:26:34 -04:00
Tongzhou Wang
22ef8e5654 [fft][1 of 3] build system and helpers to support cuFFT and MKL (#5855)
This is the first of three PRs that #5537 will be split into.

This PR adds mkl headers to included files, and provides helper functions for MKL fft and cuFFT.
In particular, on POSIX, headers are using mkl-include from conda, and on Windows, it is from a new file @yf225 and I made and uploaded to s3.

* add mkl-include to required packages

* include MKL headers; add AT_MKL_ENABLED flag; add a method to query MKL availability

* Add MKL and CUFFT helpers
2018-03-19 15:43:14 -04:00
ngimel
771791fe2f install pytorch into default conda env (#5482) 2018-02-28 21:42:38 -05:00
ngimel
2f40c88508 downgrade docker back to 9 (#5257) 2018-02-15 12:31:45 -05:00
Sean Naren
fe810edc80 Consolidated dockerfile changes, updated README (#5235) 2018-02-14 11:57:23 -05:00
Amir Arsalan Soltani
2fd8e596b6 CUDA 9 (#5194) 2018-02-12 14:43:28 -05:00
Amir Arsalan Soltani
19c2ad8834 CUDA 9.0 and cuDNN 7 (#5186) 2018-02-12 14:21:56 -05:00
ngimel
60bff0a5f3 fix nccl version 2017-09-30 16:17:20 -04:00
Natalia Gimelshein
5cc3aff9ba use nccl deb in Dockerfile, easier to change python version 2017-09-30 16:17:20 -04:00
Soumith Chintala
9defb8e653 fix Dockerfile for submodules 2017-09-25 18:04:34 -04:00
ngimel
ab26fa01e6 install vision in devel dockerfile, minor fixes to dockerfile (#2090) 2017-07-13 19:06:41 -04:00
ngimel
3716286e6b reduce the size of Docker image (#1729) 2017-06-05 14:03:11 -04:00
Natalia Gimelshein
253c854da5 update Dockerfile not to use requirements.txt 2017-04-11 15:42:05 -07:00
ngimel
215813d7ac Change dockerfile to support for cudnn v6 (#1135) 2017-03-28 20:05:04 -04:00
ngimel
3c2ecc6b15 add dockerfiles (#583)
* add dockerfiles
2017-01-25 17:30:29 -05:00