Skip to content

Commit 9e22806

Browse files
BordaBorda
committed
update
1 parent e44b0d4 commit 9e22806

File tree

4 files changed

+30
-40
lines changed

4 files changed

+30
-40
lines changed

‎.azure/gpu-tests-fabric.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,11 @@ jobs:
6161
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.1-cuda12.1.1"
6262
PACKAGE_NAME: "fabric"
6363
"Fabric | latest":
64-
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.5-cuda12.1.1"
64+
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.6-cuda12.4.1"
6565
PACKAGE_NAME: "fabric"
6666
"Lightning | latest":
67-
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.5-cuda12.1.1"
68-
PACKAGE_NAME: "lightning"
69-
"Fabric | future":
7067
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.6-cuda12.4.1"
71-
PACKAGE_NAME: "fabric"
68+
PACKAGE_NAME: "lightning"
7269
workspace:
7370
clean: all
7471
steps:

‎.azure/gpu-tests-pytorch.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,11 @@ jobs:
5353
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.1-cuda12.1.1"
5454
PACKAGE_NAME: "pytorch"
5555
"PyTorch | latest":
56-
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.5-cuda12.1.1"
56+
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.6-cuda12.4.1"
5757
PACKAGE_NAME: "pytorch"
5858
"Lightning | latest":
59-
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.5-cuda12.1.1"
60-
PACKAGE_NAME: "lightning"
61-
"PyTorch | future":
6259
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.6-cuda12.4.1"
63-
PACKAGE_NAME: "pytorch"
60+
PACKAGE_NAME: "lightning"
6461
pool: lit-rtx-3090
6562
variables:
6663
DEVICES: $( python -c 'print("$(Agent.Name)".split("_")[-1])' )

‎.github/workflows/ci-tests-fabric.yml‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,33 +56,31 @@ jobs:
5656
- { os: "ubuntu-22.04", pkg-name: "lightning", python-version: "3.12.7", pytorch-version: "2.5.1" }
5757
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.12.7", pytorch-version: "2.5.1" }
5858
# only run PyTorch latest with Python latest, use Fabric scope to limit dependency issues
59-
- { os: "macOS-14", pkg-name: "fabric", python-version: "3.12.7", pytorch-version: "2.5.1" }
60-
- { os: "ubuntu-22.04", pkg-name: "fabric", python-version: "3.12.7", pytorch-version: "2.5.1" }
61-
- { os: "windows-2022", pkg-name: "fabric", python-version: "3.12.7", pytorch-version: "2.5.1" }
59+
- { os: "macOS-14", pkg-name: "fabric", python-version: "3.12.7", pytorch-version: "2.6" }
60+
- { os: "ubuntu-22.04", pkg-name: "fabric", python-version: "3.12.7", pytorch-version: "2.6" }
61+
- { os: "windows-2022", pkg-name: "fabric", python-version: "3.12.7", pytorch-version: "2.6" }
6262
# "oldest" versions tests, only on minimum Python
63-
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.9", pytorch-version: "2.1", requires: "oldest" }
63+
- { os: "macOS-14", python-version: "3.9", pytorch-version: "2.1", requires: "oldest" }
6464
- {
6565
os: "ubuntu-20.04",
66-
pkg-name: "lightning",
6766
python-version: "3.9",
6867
pytorch-version: "2.1",
6968
requires: "oldest",
7069
}
7170
- {
7271
os: "windows-2022",
73-
pkg-name: "lightning",
7472
python-version: "3.9",
7573
pytorch-version: "2.1",
7674
requires: "oldest",
7775
}
7876
# "fabric" installs the standalone package
79-
- { os: "macOS-14", pkg-name: "fabric", python-version: "3.9", pytorch-version: "2.1" }
80-
- { os: "ubuntu-20.04", pkg-name: "fabric", python-version: "3.9", pytorch-version: "2.1" }
81-
- { os: "windows-2022", pkg-name: "fabric", python-version: "3.9", pytorch-version: "2.1" }
82-
# adding recently cut Torch 2.6
83-
- { os: "macOS-14", pkg-name: "fabric", python-version: "3.12", pytorch-version: "2.6" }
84-
- { os: "ubuntu-22.04", pkg-name: "fabric", python-version: "3.12", pytorch-version: "2.6" }
85-
- { os: "windows-2022", pkg-name: "fabric", python-version: "3.12", pytorch-version: "2.6" }
77+
- { os: "macOS-14", pkg-name: "fabric", python-version: "3.10", pytorch-version: "2.5" }
78+
- { os: "ubuntu-20.04", pkg-name: "fabric", python-version: "3.10", pytorch-version: "2.5" }
79+
- { os: "windows-2022", pkg-name: "fabric", python-version: "3.10", pytorch-version: "2.5" }
80+
# adding recently cut Torch 2.7 - FUTURE
81+
# - { os: "macOS-14", pkg-name: "fabric", python-version: "3.12", pytorch-version: "2.7" }
82+
# - { os: "ubuntu-22.04", pkg-name: "fabric", python-version: "3.12", pytorch-version: "2.7" }
83+
# - { os: "windows-2022", pkg-name: "fabric", python-version: "3.12", pytorch-version: "2.7" }
8684
timeout-minutes: 25 # because of building grpcio on Mac
8785
env:
8886
PACKAGE_NAME: ${{ matrix.pkg-name }}
@@ -130,8 +128,8 @@ jobs:
130128
131129
- name: Env. variables
132130
run: |
133-
# Switch PyTorch URL
134-
python -c "print('TORCH_URL=' + str('${{env.TORCH_URL_TEST}}' if '${{ matrix.pytorch-version }}' == '2.6' else '${{env.TORCH_URL_STABLE}}'))" >> $GITHUB_ENV
131+
# Switch PyTorch URL between stable and test/future
132+
python -c "print('TORCH_URL=' + str('${{env.TORCH_URL_TEST}}' if '${{ matrix.pytorch-version }}' == '2.7' else '${{env.TORCH_URL_STABLE}}'))" >> $GITHUB_ENV
135133
# Switch coverage scope
136134
python -c "print('COVERAGE_SCOPE=' + str('lightning' if '${{matrix.pkg-name}}' == 'lightning' else 'lightning_fabric'))" >> $GITHUB_ENV
137135
# if you install mono-package set dependency only for this subpackage

‎.github/workflows/ci-tests-pytorch.yml‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -60,33 +60,31 @@ jobs:
6060
- { os: "ubuntu-22.04", pkg-name: "lightning", python-version: "3.12.7", pytorch-version: "2.5.1" }
6161
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.12.7", pytorch-version: "2.5.1" }
6262
# only run PyTorch latest with Python latest, use PyTorch scope to limit dependency issues
63-
- { os: "macOS-14", pkg-name: "pytorch", python-version: "3.12.7", pytorch-version: "2.5.1" }
64-
- { os: "ubuntu-22.04", pkg-name: "pytorch", python-version: "3.12.7", pytorch-version: "2.5.1" }
65-
- { os: "windows-2022", pkg-name: "pytorch", python-version: "3.12.7", pytorch-version: "2.5.1" }
63+
- { os: "macOS-14", pkg-name: "pytorch", python-version: "3.12.7", pytorch-version: "2.6" }
64+
- { os: "ubuntu-22.04", pkg-name: "pytorch", python-version: "3.12.7", pytorch-version: "2.6" }
65+
- { os: "windows-2022", pkg-name: "pytorch", python-version: "3.12.7", pytorch-version: "2.6" }
6666
# "oldest" versions tests, only on minimum Python
67-
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.9", pytorch-version: "2.1", requires: "oldest" }
67+
- { os: "macOS-14", python-version: "3.9", pytorch-version: "2.1", requires: "oldest" }
6868
- {
6969
os: "ubuntu-20.04",
70-
pkg-name: "lightning",
7170
python-version: "3.9",
7271
pytorch-version: "2.1",
7372
requires: "oldest",
7473
}
7574
- {
7675
os: "windows-2022",
77-
pkg-name: "lightning",
7876
python-version: "3.9",
7977
pytorch-version: "2.1",
8078
requires: "oldest",
8179
}
8280
# "pytorch" installs the standalone package
83-
- { os: "macOS-14", pkg-name: "pytorch", python-version: "3.9", pytorch-version: "2.1" }
84-
- { os: "ubuntu-20.04", pkg-name: "pytorch", python-version: "3.9", pytorch-version: "2.1" }
85-
- { os: "windows-2022", pkg-name: "pytorch", python-version: "3.9", pytorch-version: "2.1" }
86-
# adding recently cut Torch 2.6
87-
- { os: "macOS-14", pkg-name: "pytorch", python-version: "3.12", pytorch-version: "2.6" }
88-
- { os: "ubuntu-22.04", pkg-name: "pytorch", python-version: "3.12", pytorch-version: "2.6" }
89-
- { os: "windows-2022", pkg-name: "pytorch", python-version: "3.12", pytorch-version: "2.6" }
81+
- { os: "macOS-14", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "2.5" }
82+
- { os: "ubuntu-20.04", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "2.5" }
83+
- { os: "windows-2022", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "2.5" }
84+
# adding recently cut Torch 2.7 - FUTURE
85+
- { os: "macOS-14", pkg-name: "pytorch", python-version: "3.12", pytorch-version: "2.7" }
86+
- { os: "ubuntu-22.04", pkg-name: "pytorch", python-version: "3.12", pytorch-version: "2.7" }
87+
- { os: "windows-2022", pkg-name: "pytorch", python-version: "3.12", pytorch-version: "2.7" }
9088
timeout-minutes: 50
9189
env:
9290
PACKAGE_NAME: ${{ matrix.pkg-name }}
@@ -136,8 +134,8 @@ jobs:
136134
137135
- name: Env. variables
138136
run: |
139-
# Switch PyTorch URL
140-
python -c "print('TORCH_URL=' + str('${{env.TORCH_URL_TEST}}' if '${{ matrix.pytorch-version }}' == '2.6' else '${{env.TORCH_URL_STABLE}}'))" >> $GITHUB_ENV
137+
# Switch PyTorch URL between stable and test/future
138+
python -c "print('TORCH_URL=' + str('${{env.TORCH_URL_TEST}}' if '${{ matrix.pytorch-version }}' == '2.7' else '${{env.TORCH_URL_STABLE}}'))" >> $GITHUB_ENV
141139
# Switch coverage scope
142140
python -c "print('COVERAGE_SCOPE=' + str('lightning' if '${{matrix.pkg-name}}' == 'lightning' else 'pytorch_lightning'))" >> $GITHUB_ENV
143141
# if you install mono-package set dependency only for this subpackage

0 commit comments

Comments
 (0)