Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to torch 1.12.1 #1409

Merged
merged 2 commits into from
Aug 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@ To install composer, once inside the image, run `pip install mosaicml`.
<!-- BEGIN_PYTORCH_BUILD_MATRIX -->
| Linux Distro | Flavor | PyTorch Version | CUDA Version | Python Version | Docker Tags |
|----------------|----------|-------------------|----------------|------------------|--------------------------------------------------------------------------------------------------|
| Ubuntu 20.04 | Base | 1.12.0 | 11.6.2 | 3.9 | `mosaicml/pytorch:latest`, `mosaicml/pytorch:1.12.0_cu116-python3.9-ubuntu20.04` |
| Ubuntu 20.04 | Base | 1.12.0 | cpu | 3.9 | `mosaicml/pytorch:latest_cpu`, `mosaicml/pytorch:1.12.0_cpu-python3.9-ubuntu20.04` |
| Ubuntu 20.04 | Base | 1.12.1 | 11.6.2 | 3.9 | `mosaicml/pytorch:latest`, `mosaicml/pytorch:1.12.1_cu116-python3.9-ubuntu20.04` |
| Ubuntu 20.04 | Base | 1.12.1 | cpu | 3.9 | `mosaicml/pytorch:latest_cpu`, `mosaicml/pytorch:1.12.1_cpu-python3.9-ubuntu20.04` |
| Ubuntu 20.04 | Base | 1.11.0 | 11.5.2 | 3.8 | `mosaicml/pytorch:1.11.0_cu115-python3.8-ubuntu20.04` |
| Ubuntu 20.04 | Base | 1.11.0 | cpu | 3.8 | `mosaicml/pytorch:1.11.0_cpu-python3.8-ubuntu20.04` |
| Ubuntu 20.04 | Base | 1.10.2 | 11.3.1 | 3.7 | `mosaicml/pytorch:1.10.2_cu113-python3.7-ubuntu20.04` |
| Ubuntu 20.04 | Base | 1.10.2 | cpu | 3.7 | `mosaicml/pytorch:1.10.2_cpu-python3.7-ubuntu20.04` |
| Ubuntu 20.04 | Vision | 1.12.0 | 11.6.2 | 3.9 | `mosaicml/pytorch_vision:latest`, `mosaicml/pytorch_vision:1.12.0_cu116-python3.9-ubuntu20.04` |
| Ubuntu 20.04 | Vision | 1.12.0 | cpu | 3.9 | `mosaicml/pytorch_vision:latest_cpu`, `mosaicml/pytorch_vision:1.12.0_cpu-python3.9-ubuntu20.04` |
| Ubuntu 20.04 | Vision | 1.12.1 | 11.6.2 | 3.9 | `mosaicml/pytorch_vision:latest`, `mosaicml/pytorch_vision:1.12.1_cu116-python3.9-ubuntu20.04` |
| Ubuntu 20.04 | Vision | 1.12.1 | cpu | 3.9 | `mosaicml/pytorch_vision:latest_cpu`, `mosaicml/pytorch_vision:1.12.1_cpu-python3.9-ubuntu20.04` |
<!-- END_PYTORCH_BUILD_MATRIX -->

``Pillow-SIMD`` is installed by default in all images.
Expand Down
48 changes: 24 additions & 24 deletions docker/build_matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,90 +36,90 @@
- BASE_IMAGE: nvidia/cuda:11.6.2-cudnn8-devel-ubuntu20.04
CUDA_VERSION: 11.6.2
PYTHON_VERSION: '3.9'
PYTORCH_VERSION: 1.12.0
PYTORCH_VERSION: 1.12.1
TAGS:
- mosaicml/pytorch:1.12.0_cu116-python3.9-ubuntu20.04
- mosaicml/pytorch:1.12.1_cu116-python3.9-ubuntu20.04
- mosaicml/pytorch:latest
TARGET: pytorch_stage
TORCHVISION_VERSION: 0.13.0
TORCHVISION_VERSION: 0.13.1
- BASE_IMAGE: nvidia/cuda:11.6.2-cudnn8-devel-ubuntu20.04
CUDA_VERSION: 11.6.2
PYTHON_VERSION: '3.9'
PYTORCH_VERSION: 1.12.0
PYTORCH_VERSION: 1.12.1
TAGS:
- mosaicml/pytorch_vision:1.12.0_cu116-python3.9-ubuntu20.04
- mosaicml/pytorch_vision:1.12.1_cu116-python3.9-ubuntu20.04
- mosaicml/pytorch_vision:latest
TARGET: vision_stage
TORCHVISION_VERSION: 0.13.0
TORCHVISION_VERSION: 0.13.1
- BASE_IMAGE: ubuntu:20.04
CUDA_VERSION: ''
MOFED_VERSION: ''
PYTHON_VERSION: '3.9'
PYTORCH_VERSION: 1.12.0
PYTORCH_VERSION: 1.12.1
TAGS:
- mosaicml/pytorch:1.12.0_cpu-python3.9-ubuntu20.04
- mosaicml/pytorch:1.12.1_cpu-python3.9-ubuntu20.04
- mosaicml/pytorch:latest_cpu
TARGET: pytorch_stage
TORCHVISION_VERSION: 0.13.0
TORCHVISION_VERSION: 0.13.1
- BASE_IMAGE: ubuntu:20.04
CUDA_VERSION: ''
MOFED_VERSION: ''
PYTHON_VERSION: '3.9'
PYTORCH_VERSION: 1.12.0
PYTORCH_VERSION: 1.12.1
TAGS:
- mosaicml/pytorch_vision:1.12.0_cpu-python3.9-ubuntu20.04
- mosaicml/pytorch_vision:1.12.1_cpu-python3.9-ubuntu20.04
- mosaicml/pytorch_vision:latest_cpu
TARGET: vision_stage
TORCHVISION_VERSION: 0.13.0
TORCHVISION_VERSION: 0.13.1
- BASE_IMAGE: nvidia/cuda:11.6.2-cudnn8-devel-ubuntu20.04
COMPOSER_INSTALL_COMMAND: mosaicml[all]
CUDA_VERSION: 11.6.2
PYTHON_VERSION: '3.9'
PYTORCH_VERSION: 1.12.0
PYTORCH_VERSION: 1.12.1
TAGS:
- mosaicml/composer:latest
TARGET: composer_stage
TORCHVISION_VERSION: 0.13.0
TORCHVISION_VERSION: 0.13.1
- BASE_IMAGE: ubuntu:20.04
COMPOSER_INSTALL_COMMAND: mosaicml[all]
CUDA_VERSION: ''
PYTHON_VERSION: '3.9'
PYTORCH_VERSION: 1.12.0
PYTORCH_VERSION: 1.12.1
TAGS:
- mosaicml/composer:latest_cpu
TARGET: composer_stage
TORCHVISION_VERSION: 0.13.0
TORCHVISION_VERSION: 0.13.1
- BASE_IMAGE: nvidia/cuda:11.6.2-cudnn8-devel-ubuntu20.04
COMPOSER_INSTALL_COMMAND: mosaicml[all]==0.8.2
CUDA_VERSION: 11.6.2
PYTHON_VERSION: '3.9'
PYTORCH_VERSION: 1.12.0
PYTORCH_VERSION: 1.12.1
TAGS:
- mosaicml/composer:0.8.2
TARGET: composer_stage
TORCHVISION_VERSION: 0.13.0
TORCHVISION_VERSION: 0.13.1
- BASE_IMAGE: ubuntu:20.04
COMPOSER_INSTALL_COMMAND: mosaicml[all]==0.8.2
CUDA_VERSION: ''
PYTHON_VERSION: '3.9'
PYTORCH_VERSION: 1.12.0
PYTORCH_VERSION: 1.12.1
TAGS:
- mosaicml/composer:0.8.2_cpu
TARGET: composer_stage
TORCHVISION_VERSION: 0.13.0
TORCHVISION_VERSION: 0.13.1
- BASE_IMAGE: nvidia/cuda:11.6.2-cudnn8-devel-ubuntu20.04
COMPOSER_INSTALL_COMMAND: mosaicml[all]GIT_COMMIT
CUDA_VERSION: 11.6.2
PYTHON_VERSION: '3.9'
PYTORCH_VERSION: 1.12.0
PYTORCH_VERSION: 1.12.1
TAGS: []
TARGET: composer_stage
TORCHVISION_VERSION: 0.13.0
TORCHVISION_VERSION: 0.13.1
- BASE_IMAGE: ubuntu:20.04
COMPOSER_INSTALL_COMMAND: mosaicml[all]GIT_COMMIT
CUDA_VERSION: ''
PYTHON_VERSION: '3.9'
PYTORCH_VERSION: 1.12.0
PYTORCH_VERSION: 1.12.1
TAGS: []
TARGET: composer_stage
TORCHVISION_VERSION: 0.13.0
TORCHVISION_VERSION: 0.13.1
8 changes: 4 additions & 4 deletions docker/generate_build_matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

def _get_pytorch_version(python_version: str):
if python_version == '3.9':
return '1.12.0'
return '1.12.1'
if python_version in '3.8':
return '1.11.0'
if python_version == '3.7':
Expand All @@ -30,8 +30,8 @@ def _get_pytorch_version(python_version: str):


def _get_torchvision_version(pytorch_version: str):
if pytorch_version == '1.12.0':
return '0.13.0'
if pytorch_version == '1.12.1':
return '0.13.1'
if pytorch_version == '1.11.0':
return '0.12.0'
if pytorch_version == '1.10.2':
Expand All @@ -52,7 +52,7 @@ def _get_cuda_version(pytorch_version: str, use_cuda: bool):
return '11.3.1'
if pytorch_version == '1.11.0':
return '11.5.2'
if pytorch_version == '1.12.0':
if pytorch_version == '1.12.1':
return '11.6.2'
raise ValueError(f'Invalid pytorch_version: {str}')

Expand Down