From 43cf6678a44bf8b734db3fd959b1b8b41d3e7afd Mon Sep 17 00:00:00 2001 From: Abhinav Venigalla Date: Fri, 12 Aug 2022 14:32:37 -0700 Subject: [PATCH 1/2] upgrade --- docker/README.md | 8 ++++---- docker/build_matrix.yaml | 28 ++++++++++++++-------------- docker/generate_build_matrix.py | 6 +++--- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/docker/README.md b/docker/README.md index c061bdc1ec..0cbcc67efd 100644 --- a/docker/README.md +++ b/docker/README.md @@ -34,14 +34,14 @@ To install composer, once inside the image, run `pip install mosaicml`. | 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` | ``Pillow-SIMD`` is installed by default in all images. diff --git a/docker/build_matrix.yaml b/docker/build_matrix.yaml index 784b7c2269..adcb6d4311 100644 --- a/docker/build_matrix.yaml +++ b/docker/build_matrix.yaml @@ -36,18 +36,18 @@ - 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 - 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 @@ -55,9 +55,9 @@ 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 @@ -65,9 +65,9 @@ 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 @@ -75,7 +75,7 @@ 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 @@ -84,7 +84,7 @@ 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 @@ -93,7 +93,7 @@ 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 @@ -102,7 +102,7 @@ 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 @@ -111,7 +111,7 @@ 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 @@ -119,7 +119,7 @@ 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 diff --git a/docker/generate_build_matrix.py b/docker/generate_build_matrix.py index a6b12315ed..ac02873a94 100644 --- a/docker/generate_build_matrix.py +++ b/docker/generate_build_matrix.py @@ -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': @@ -30,7 +30,7 @@ def _get_pytorch_version(python_version: str): def _get_torchvision_version(pytorch_version: str): - if pytorch_version == '1.12.0': + if pytorch_version == '1.12.1': return '0.13.0' if pytorch_version == '1.11.0': return '0.12.0' @@ -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}') From db85192858db7f5ae2ac6a1ed4d94a403ba55c1a Mon Sep 17 00:00:00 2001 From: Abhinav Venigalla Date: Mon, 15 Aug 2022 15:41:12 -0700 Subject: [PATCH 2/2] update torchvision 0.13.1 --- docker/build_matrix.yaml | 20 ++++++++++---------- docker/generate_build_matrix.py | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docker/build_matrix.yaml b/docker/build_matrix.yaml index adcb6d4311..1e420b894e 100644 --- a/docker/build_matrix.yaml +++ b/docker/build_matrix.yaml @@ -41,7 +41,7 @@ - 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' @@ -50,7 +50,7 @@ - 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: '' @@ -60,7 +60,7 @@ - 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: '' @@ -70,7 +70,7 @@ - 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 @@ -79,7 +79,7 @@ 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: '' @@ -88,7 +88,7 @@ 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 @@ -97,7 +97,7 @@ 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: '' @@ -106,7 +106,7 @@ 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 @@ -114,7 +114,7 @@ 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: '' @@ -122,4 +122,4 @@ PYTORCH_VERSION: 1.12.1 TAGS: [] TARGET: composer_stage - TORCHVISION_VERSION: 0.13.0 + TORCHVISION_VERSION: 0.13.1 diff --git a/docker/generate_build_matrix.py b/docker/generate_build_matrix.py index ac02873a94..f1c56bfd17 100644 --- a/docker/generate_build_matrix.py +++ b/docker/generate_build_matrix.py @@ -31,7 +31,7 @@ def _get_pytorch_version(python_version: str): def _get_torchvision_version(pytorch_version: str): if pytorch_version == '1.12.1': - return '0.13.0' + return '0.13.1' if pytorch_version == '1.11.0': return '0.12.0' if pytorch_version == '1.10.2':