Skip to content

Update GPU CI and docker images for PyTorch 2.1 #18719

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.

Sign up for GitHub

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

Merged
merged 18 commits into from
Oct 6, 2023
Merged

Update GPU CI and docker images for PyTorch 2.1 #18719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
fd7d35a
update docker cuda images
awaelchli Oct 4, 2023
0ccc140
debug
awaelchli Oct 4, 2023
9b9703f
nccl does not have cuda12.1
Borda Oct 4, 2023
d660356
remove is_nightly
awaelchli Oct 4, 2023
518ff80
Merge remote-tracking branch 'origin/feature/2-1-cuda' into feature/2…
awaelchli Oct 4, 2023
564dd77
Revert "nccl does not have cuda12.1"
Borda Oct 4, 2023
8ae7bdc
bump NCCL to 2.17.1, first with 12.1 support
Borda Oct 4, 2023
0816967
Merge branch 'feature/2-1-cuda' of https://github.com/PyTorchLightnin…
Borda Oct 4, 2023
195a9cb
trigger push
awaelchli Oct 4, 2023
423ec3c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 4, 2023
df7b201
Revert "trigger push"
Borda Oct 4, 2023
4091343
stay with Python 3.10 for now
awaelchli Oct 5, 2023
054853b
checkgroup
awaelchli Oct 5, 2023
b2f36ba
remove extra docker build entry
awaelchli Oct 5, 2023
f7a5b4d
Apply suggestions from code review
awaelchli Oct 5, 2023
583302a
Merge remote-tracking branch 'origin/feature/2-1-cuda' into feature/2…
awaelchli Oct 5, 2023
980ba13
Update .azure/gpu-tests-fabric.yml
awaelchli Oct 5, 2023
37decea
Merge branch 'master' into feature/2-1-cuda
awaelchli Oct 6, 2023
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
21 changes: 2 additions & 19 deletions .azure/gpu-tests-fabric.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,10 @@ jobs:
strategy:
matrix:
"Fabric | latest":
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.0-cuda11.8.0"
IS_NIGHTLY: "false"
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.1-cuda12.1.0"
PACKAGE_NAME: "fabric"
"Lightning | latest":
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.0-cuda11.8.0"
IS_NIGHTLY: "false"
PACKAGE_NAME: "lightning"
"Lightning | RC":
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.0-cuda11.8.0"
IS_NIGHTLY: "true"
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.1-cuda12.1.0"
PACKAGE_NAME: "lightning"
workspace:
clean: all
Expand All @@ -87,7 +81,6 @@ jobs:
echo $CUDA_VISIBLE_DEVICES
echo $CUDA_VERSION_MM
echo $TORCH_URL
echo $(IS_NIGHTLY)
echo $COVERAGE_SOURCE
whereis nvidia
nvidia-smi
Expand All @@ -104,23 +97,13 @@ jobs:
for fpath in `ls requirements/**/*.txt`; do \
python ./adjust-torch-versions.py $fpath ${PYTORCH_VERSION}; \
done
# without succeeded this could run even if the job has already failed
condition: and(succeeded(), eq(variables.IS_NIGHTLY, 'false'))
displayName: "Adjust dependencies"

- bash: |
extra=$(python -c "print({'lightning': 'fabric-'}.get('$(PACKAGE_NAME)', ''))")
pip install -e ".[${extra}dev]" pytest-timeout -U --find-links ${TORCH_URL}
displayName: "Install package & dependencies"

- bash: |
pip uninstall -y torch torchvision
pip install torch torchvision -U --pre --no-cache --index-url https://download.pytorch.org/whl/test/cu${CUDA_VERSION_MM%}
python -c "from torch import __version__ as ver; assert ver.startswith('2.1.0'), ver"
# without succeeded this could run even if the job has already failed
condition: and(succeeded(), eq(variables.IS_NIGHTLY, 'true'))
displayName: "Bump to RC"

- bash: |
set -e
python requirements/collect_env_details.py
Expand Down
21 changes: 2 additions & 19 deletions .azure/gpu-tests-pytorch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,10 @@ jobs:
strategy:
matrix:
"PyTorch | latest":
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.0-cuda11.8.0"
IS_NIGHTLY: "false"
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.1-cuda12.1.0"
PACKAGE_NAME: "pytorch"
"Lightning | latest":
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.0-cuda11.8.0"
IS_NIGHTLY: "false"
PACKAGE_NAME: "lightning"
"Lightning | RC":
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.0-cuda11.8.0"
IS_NIGHTLY: "true"
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.1-cuda12.1.0"
PACKAGE_NAME: "lightning"
pool: lit-rtx-3090
variables:
Expand Down Expand Up @@ -89,7 +83,6 @@ jobs:
echo $CUDA_VISIBLE_DEVICES
echo $CUDA_VERSION_MM
echo $TORCH_URL
echo $(IS_NIGHTLY)
echo $COVERAGE_SOURCE
whereis nvidia
nvidia-smi
Expand All @@ -106,8 +99,6 @@ jobs:
for fpath in `ls requirements/**/*.txt`; do \
python ./adjust-torch-versions.py $fpath ${PYTORCH_VERSION}; \
done
# without succeeded this could run even if the job has already failed
condition: and(succeeded(), eq(variables.IS_NIGHTLY, 'false'))
displayName: "Adjust dependencies"

- bash: |
Expand All @@ -122,14 +113,6 @@ jobs:
pip install -e ".[${extra}dev]" -r requirements/_integrations/strategies.txt pytest-timeout -U --find-links ${TORCH_URL}
displayName: "Install package & dependencies"

- bash: |
pip uninstall -y torch torchvision
pip install torch torchvision -U --pre --no-cache --index-url https://download.pytorch.org/whl/test/cu${CUDA_VERSION_MM%}
python -c "from torch import __version__ as ver; assert ver.startswith('2.1.0'), ver"
# without succeeded this could run even if the job has already failed
condition: and(succeeded(), eq(variables.IS_NIGHTLY, 'true'))
displayName: "Bump to RC"

- bash: pip uninstall -y lightning
# without succeeded this could run even if the job has already failed
condition: and(succeeded(), eq(variables['PACKAGE_NAME'], 'pytorch'))
Expand Down
4 changes: 2 additions & 2 deletions .github/checkgroup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,13 @@ subprojects:
- "build-cuda (3.9, 1.13, 11.8.0)"
- "build-cuda (3.9, 1.13, 12.0.1)"
- "build-cuda (3.10, 2.0, 11.8.0)"
- "build-cuda (3.10, 2.0, 12.0.1)"
- "build-cuda (3.10, 2.1, 12.1.0)"
#- "build-NGC"
- "build-pl (3.9, 1.12, 11.7.1)"
- "build-pl (3.9, 1.13, 11.8.0)"
- "build-pl (3.9, 1.13, 12.0.1)"
- "build-pl (3.10, 2.0, 11.8.0)"
- "build-pl (3.10, 2.0, 12.0.1)"
- "build-pl (3.10, 2.1, 12.1.0)"

# SECTIONS: lightning_data

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
- { python_version: "3.9", pytorch_version: "1.13", cuda_version: "11.8.0" }
- { python_version: "3.9", pytorch_version: "1.13", cuda_version: "12.0.1" }
- { python_version: "3.10", pytorch_version: "2.0", cuda_version: "11.8.0" }
- { python_version: "3.10", pytorch_version: "2.0", cuda_version: "12.0.1" }
- { python_version: "3.10", pytorch_version: "2.1", cuda_version: "12.1.0" }
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
- { python_version: "3.9", pytorch_version: "1.13", cuda_version: "11.8.0" }
- { python_version: "3.9", pytorch_version: "1.13", cuda_version: "12.0.1" }
- { python_version: "3.10", pytorch_version: "2.0", cuda_version: "11.8.0" }
- { python_version: "3.10", pytorch_version: "2.0", cuda_version: "12.0.1" }
- { python_version: "3.10", pytorch_version: "2.1", cuda_version: "12.1.0" }
steps:
- uses: actions/checkout@v4
- uses: docker/setup-buildx-action@v3
Expand Down
4 changes: 2 additions & 2 deletions dockers/base-cuda/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ ARG CUDA_VERSION=11.7.1
FROM nvidia/cuda:${CUDA_VERSION}-runtime-ubuntu${UBUNTU_VERSION}

ARG PYTHON_VERSION=3.10
ARG PYTORCH_VERSION=2.0
ARG MAX_ALLOWED_NCCL=2.16.2
ARG PYTORCH_VERSION=2.1
ARG MAX_ALLOWED_NCCL=2.17.1

SHELL ["/bin/bash", "-c"]
# https://techoverflow.net/2019/05/18/how-to-fix-configuring-tzdata-interactive-input-when-building-docker-images/
Expand Down