Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
2bdc588
bump: testing with future torch 2.6
Borda Dec 19, 2024
89153f0
bump `typing-extensions`
Borda Dec 19, 2024
b490968
Merge branch 'master' into ci/bump-pt-2.6
lantiga Jan 6, 2025
6e1f1ba
Merge branch 'master' into ci/bump-pt-2.6
Borda Jan 6, 2025
daacd5d
Merge branch 'master' into ci/bump-pt-2.6
Borda Jan 7, 2025
bc3cbd9
TORCHINDUCTOR_CACHE_DIR
Borda Jan 7, 2025
6cfa48c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 7, 2025
0e1d047
--extra-index-url=https://download.pytorch.org/whl/cpu/
Borda Jan 7, 2025
6946f47
onnx.log max_torch="2.6.0"
Borda Jan 7, 2025
6ac85c1
Merge branch 'master' into ci/bump-pt-2.6
Borda Jan 7, 2025
7530f57
todo
Borda Jan 7, 2025
cb73790
Merge branch 'ci/bump-pt-2.6' of https://github.com/Lightning-AI/ligh…
Borda Jan 7, 2025
26a8864
docker
Borda Jan 8, 2025
e52f392
gpu
Borda Jan 8, 2025
e7d800f
gpu
Borda Jan 8, 2025
9fb71dc
check
Borda Jan 8, 2025
daa0920
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 8, 2025
6c26f48
gpu
Borda Jan 8, 2025
2d8eb16
Merge branch 'ci/bump-pt-2.6' of https://github.com/Lightning-AI/ligh…
Borda Jan 8, 2025
3a06681
bitsandbytes
Borda Jan 8, 2025
d31f23c
bitsandbytes
Borda Jan 8, 2025
97cf6ed
set -e
Borda Jan 8, 2025
5e9009b
fix
Borda Jan 8, 2025
165d38a
future
Borda Jan 8, 2025
7024590
batch
Borda Jan 8, 2025
0612808
Merge branch 'master' into ci/bump-pt-2.6
Borda Jan 9, 2025
83a01f1
Empty-Commit
Borda Jan 22, 2025
e44b0d4
Merge branch 'master' into ci/bump-pt-2.6
lantiga Feb 3, 2025
4edf5fc
Merge branch 'master' into ci/bump-pt-2.6
Borda Feb 14, 2025
9e22806
update
Borda Feb 14, 2025
070f9d3
Merge branch 'ci/bump-pt-2.6' of https://github.com/Lightning-AI/ligh…
Borda Feb 14, 2025
bee93b6
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 14, 2025
4607a55
if [[ "$(image)" == *"torch2.6"* ]]; then
Borda Feb 14, 2025
f3569ec
Merge branch 'ci/bump-pt-2.6' of https://github.com/Lightning-AI/ligh…
Borda Feb 14, 2025
fc4811c
update
Borda Feb 14, 2025
cfa27a7
3.9
Borda Feb 14, 2025
cdbd1a6
PL_STANDALONE_TESTS_BATCH_SIZE
Borda Feb 14, 2025
3d8f484
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 14, 2025
d54ab0b
Merge branch 'master' into ci/bump-pt-2.6
Borda Feb 14, 2025
6559d4f
python -c "import bitsandbytes"
Borda Feb 14, 2025
2355ae2
Bump bitsandbytes upper bound for CI
lantiga Feb 18, 2025
d2f4b0a
Bump bitsandbytes lower bound for CI
lantiga Feb 18, 2025
74b11a4
Merge branch 'master' into ci/bump-pt-2.6
Borda Feb 28, 2025
1ef3940
Merge branch 'master' into ci/bump-pt-2.6
Borda Mar 10, 2025
c736f7b
Merge branch 'master' into ci/bump-pt-2.6
Borda Mar 11, 2025
f5bd47a
COVERAGE_SOURCE
Borda Mar 11, 2025
837ef68
bitsandbytes
Borda Mar 11, 2025
ce5a219
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 11, 2025
d6cc6ad
external
Borda Mar 11, 2025
54921ce
Merge branch 'ci/bump-pt-2.6' of https://github.com/Lightning-AI/ligh…
Borda Mar 11, 2025
1895897
_BITSANDBYTES_AVAILABLE
Borda Mar 11, 2025
e343e6b
link
Borda Mar 11, 2025
3d56092
bb
Borda Mar 11, 2025
be212ca
bitsandbytes
Borda Mar 11, 2025
b98ed10
reduce-overhead
Borda Mar 11, 2025
5c021d5
@pytest.mark.filterwarnings("ignore::FutureWarning")
Borda Mar 11, 2025
a12a1ec
not _BITSANDBYTES_AVAILABLE
Borda Mar 11, 2025
7b19eb7
Apply suggestions from code review
Borda Mar 11, 2025
89c13f3
RunIf(mps=False)
Borda Mar 11, 2025
056ed0d
test_bitsandbytes_plugin
Borda Mar 11, 2025
3a2499e
reason
Borda Mar 11, 2025
84cae47
_TORCH_LESS_EQUAL_2_6
Borda Mar 11, 2025
eac0f94
Merge branch 'master' into ci/bump-pt-2.6
Borda Mar 11, 2025
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
19 changes: 12 additions & 7 deletions .azure/gpu-tests-fabric.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,14 @@ jobs:
options: "--gpus=all --shm-size=2gb -v /var/tmp:/var/tmp"
strategy:
matrix:
"Fabric | oldest":
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.1-cuda12.1.1"
PACKAGE_NAME: "fabric"
"Fabric | latest":
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.11-torch2.3-cuda12.1.0"
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.6-cuda12.4.1"
PACKAGE_NAME: "fabric"
"Lightning | latest":
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.5-cuda12.1.0"
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.6-cuda12.4.1"
PACKAGE_NAME: "lightning"
workspace:
clean: all
Expand All @@ -77,9 +80,8 @@ jobs:
displayName: "set env. vars"
- bash: |
echo "##vso[task.setvariable variable=TORCH_URL]https://download.pytorch.org/whl/test/cu${CUDA_VERSION_MM}"
echo "##vso[task.setvariable variable=TORCHVISION_URL]https://download.pytorch.org/whl/test/cu124/torchvision-0.19.0%2Bcu124-cp${PYTHON_VERSION_MM}-cp${PYTHON_VERSION_MM}-linux_x86_64.whl"
condition: endsWith(variables['Agent.JobName'], 'future')
displayName: "set env. vars 4 future"
displayName: "extend env. vars 4 future"

- bash: |
echo $(DEVICES)
Expand All @@ -105,15 +107,17 @@ jobs:
displayName: "Adjust dependencies"

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

- bash: |
set -e
python requirements/collect_env_details.py
python -c "import torch ; mgpu = torch.cuda.device_count() ; assert mgpu == 2, f'GPU: {mgpu}'"
python requirements/pytorch/check-avail-extras.py
python -c "import bitsandbytes"
displayName: "Env details"

Expand All @@ -140,10 +144,11 @@ jobs:
displayName: "Testing: fabric standard"
timeoutInMinutes: "10"

- bash: bash ./run_standalone_tests.sh "tests_fabric"
- bash: |
wget https://raw.githubusercontent.com/Lightning-AI/utilities/main/scripts/run_standalone_tests.sh
bash ./run_standalone_tests.sh "tests_fabric"
workingDirectory: tests/
env:
PL_STANDALONE_TESTS_SOURCE: $(COVERAGE_SOURCE)
PL_RUN_STANDALONE_TESTS: "1"
displayName: "Testing: fabric standalone"
timeoutInMinutes: "10"
Expand Down
18 changes: 11 additions & 7 deletions .azure/gpu-tests-pytorch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,14 @@ jobs:
cancelTimeoutInMinutes: "2"
strategy:
matrix:
"PyTorch | oldest":
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.1-cuda12.1.1"
PACKAGE_NAME: "pytorch"
"PyTorch | latest":
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.11-torch2.3-cuda12.1.0"
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.6-cuda12.4.1"
PACKAGE_NAME: "pytorch"
"Lightning | latest":
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.5-cuda12.1.0"
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.6-cuda12.4.1"
PACKAGE_NAME: "lightning"
pool: lit-rtx-3090
variables:
Expand Down Expand Up @@ -81,9 +84,8 @@ jobs:
displayName: "set env. vars"
- bash: |
echo "##vso[task.setvariable variable=TORCH_URL]https://download.pytorch.org/whl/test/cu${CUDA_VERSION_MM}"
echo "##vso[task.setvariable variable=TORCHVISION_URL]https://download.pytorch.org/whl/test/cu124/torchvision-0.19.0%2Bcu124-cp${PYTHON_VERSION_MM}-cp${PYTHON_VERSION_MM}-linux_x86_64.whl"
condition: endsWith(variables['Agent.JobName'], 'future')
displayName: "set env. vars 4 future"
displayName: "extend env. vars 4 future"

- bash: |
echo $(DEVICES)
Expand All @@ -109,8 +111,9 @@ jobs:
displayName: "Adjust dependencies"

- bash: |
set -e
extra=$(python -c "print({'lightning': 'pytorch-'}.get('$(PACKAGE_NAME)', ''))")
pip install -e ".[${extra}dev]" pytest-timeout -U --find-links="${TORCH_URL}" --find-links="${TORCHVISION_URL}"
pip install -e ".[${extra}dev]" pytest-timeout -U --extra-index-url="${TORCH_URL}"
pip install setuptools==75.6.0 jsonargparse==4.35.0
displayName: "Install package & dependencies"

Expand Down Expand Up @@ -161,11 +164,12 @@ jobs:
displayName: "Testing: PyTorch standard"
timeoutInMinutes: "35"

- bash: bash ./run_standalone_tests.sh "tests_pytorch"
- bash: |
wget https://raw.githubusercontent.com/Lightning-AI/utilities/main/scripts/run_standalone_tests.sh
bash ./run_standalone_tests.sh "tests_pytorch"
workingDirectory: tests/
env:
PL_USE_MOCKED_MNIST: "1"
PL_STANDALONE_TESTS_SOURCE: $(COVERAGE_SOURCE)
PL_RUN_STANDALONE_TESTS: "1"
displayName: "Testing: PyTorch standalone tests"
timeoutInMinutes: "35"
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/pip-wheels/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ runs:
run: |
# cat requirements.dump
pip wheel -r requirements.dump --prefer-binary \
--wheel-dir=.wheels \
-f ${{ inputs.torch-url }} -f ${{ inputs.wheel-dir }}
--wheel-dir=".wheels" \
--extra-index-url=${{ inputs.torch-url }} -f ${{ inputs.wheel-dir }}
ls -lh .wheels/
shell: bash

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/_legacy-checkpoints.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ on:

env:
LEGACY_FOLDER: "tests/legacy"
TORCH_URL: "https://download.pytorch.org/whl/cpu/torch_stable.html"
TORCH_URL: "https://download.pytorch.org/whl/cpu/"

defaults:
run:
Expand All @@ -67,12 +67,12 @@ jobs:
PACKAGE_NAME: pytorch
FREEZE_REQUIREMENTS: 1
timeout-minutes: 20
run: pip install . -f ${TORCH_URL}
run: pip install . --extra-index-url="${TORCH_URL}"
if: inputs.pl_version == ''

- name: Install PL version
timeout-minutes: 20
run: pip install "pytorch-lightning==${{ inputs.pl_version }}" -f ${TORCH_URL}
run: pip install "pytorch-lightning==${{ inputs.pl_version }}" --extra-index-url="${TORCH_URL}"
if: inputs.pl_version != ''

- name: Adjust tests -> PL
Expand Down
46 changes: 19 additions & 27 deletions .github/workflows/ci-tests-fabric.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,36 +56,28 @@ jobs:
- { os: "ubuntu-22.04", pkg-name: "lightning", python-version: "3.12.7", pytorch-version: "2.5.1" }
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.12.7", pytorch-version: "2.5.1" }
# only run PyTorch latest with Python latest, use Fabric scope to limit dependency issues
- { os: "macOS-14", pkg-name: "fabric", python-version: "3.12.7", pytorch-version: "2.5.1" }
- { os: "ubuntu-22.04", pkg-name: "fabric", python-version: "3.12.7", pytorch-version: "2.5.1" }
- { os: "windows-2022", pkg-name: "fabric", python-version: "3.12.7", pytorch-version: "2.5.1" }
- { os: "macOS-14", pkg-name: "fabric", python-version: "3.12.7", pytorch-version: "2.6" }
- { os: "ubuntu-22.04", pkg-name: "fabric", python-version: "3.12.7", pytorch-version: "2.6" }
- { os: "windows-2022", pkg-name: "fabric", python-version: "3.12.7", pytorch-version: "2.6" }
# "oldest" versions tests, only on minimum Python
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.9", pytorch-version: "2.1", requires: "oldest" }
- {
os: "ubuntu-20.04",
pkg-name: "lightning",
python-version: "3.9",
pytorch-version: "2.1",
requires: "oldest",
}
- {
os: "windows-2022",
pkg-name: "lightning",
python-version: "3.9",
pytorch-version: "2.1",
requires: "oldest",
}
- { os: "macOS-14", pkg-name: "fabric", pytorch-version: "2.1", requires: "oldest" }
- { os: "ubuntu-20.04", pkg-name: "fabric", pytorch-version: "2.1", requires: "oldest" }
- { os: "windows-2022", pkg-name: "fabric", pytorch-version: "2.1", requires: "oldest" }
# "fabric" installs the standalone package
- { os: "macOS-14", pkg-name: "fabric", python-version: "3.9", pytorch-version: "2.1" }
- { os: "ubuntu-20.04", pkg-name: "fabric", python-version: "3.9", pytorch-version: "2.1" }
- { os: "windows-2022", pkg-name: "fabric", python-version: "3.9", pytorch-version: "2.1" }
- { os: "macOS-14", pkg-name: "fabric", python-version: "3.10", pytorch-version: "2.5" }
- { os: "ubuntu-20.04", pkg-name: "fabric", python-version: "3.10", pytorch-version: "2.5" }
- { os: "windows-2022", pkg-name: "fabric", python-version: "3.10", pytorch-version: "2.5" }
# adding recently cut Torch 2.7 - FUTURE
# - { os: "macOS-14", pkg-name: "fabric", python-version: "3.12", pytorch-version: "2.7" }
# - { os: "ubuntu-22.04", pkg-name: "fabric", python-version: "3.12", pytorch-version: "2.7" }
# - { os: "windows-2022", pkg-name: "fabric", python-version: "3.12", pytorch-version: "2.7" }
timeout-minutes: 25 # because of building grpcio on Mac
env:
PACKAGE_NAME: ${{ matrix.pkg-name }}
FREEZE_REQUIREMENTS: ${{ ! (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release/')) }}
PYPI_CACHE_DIR: "_pip-wheels"
TORCH_URL_STABLE: "https://download.pytorch.org/whl/cpu/torch_stable.html"
TORCH_URL_TEST: "https://download.pytorch.org/whl/test/cpu/torch"
TORCH_URL_STABLE: "https://download.pytorch.org/whl/cpu/"
TORCH_URL_TEST: "https://download.pytorch.org/whl/test/cpu/"
# TODO: Remove this - Enable running MPS tests on this platform
DISABLE_MPS: ${{ matrix.os == 'macOS-14' && '1' || '0' }}
steps:
Expand All @@ -94,7 +86,7 @@ jobs:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
python-version: ${{ matrix.python-version || '3.9' }}

- name: basic setup
run: pip install -q -r .actions/requirements.txt
Expand Down Expand Up @@ -126,8 +118,8 @@ jobs:

- name: Env. variables
run: |
# Switch PyTorch URL
python -c "print('TORCH_URL=' + str('${{env.TORCH_URL_TEST}}' if '${{ matrix.pytorch-version }}' == '2.5' else '${{env.TORCH_URL_STABLE}}'))" >> $GITHUB_ENV
# Switch PyTorch URL between stable and test/future
python -c "print('TORCH_URL=' + str('${{env.TORCH_URL_TEST}}' if '${{ matrix.pytorch-version }}' == '2.7' else '${{env.TORCH_URL_STABLE}}'))" >> $GITHUB_ENV
# Switch coverage scope
python -c "print('COVERAGE_SCOPE=' + str('lightning' if '${{matrix.pkg-name}}' == 'lightning' else 'lightning_fabric'))" >> $GITHUB_ENV
# if you install mono-package set dependency only for this subpackage
Expand All @@ -139,7 +131,7 @@ jobs:
timeout-minutes: 20
run: |
pip install -e ".[${EXTRA_PREFIX}test,${EXTRA_PREFIX}strategies]" -U --prefer-binary \
--find-links="${TORCH_URL}" --find-links="${PYPI_CACHE_DIR}"
--extra-index-url="${TORCH_URL}" --find-links="${PYPI_CACHE_DIR}"
pip list
- name: Dump handy wheels
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
Expand Down
48 changes: 20 additions & 28 deletions .github/workflows/ci-tests-pytorch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,35 +60,27 @@ jobs:
- { os: "ubuntu-22.04", pkg-name: "lightning", python-version: "3.12.7", pytorch-version: "2.5.1" }
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.12.7", pytorch-version: "2.5.1" }
# only run PyTorch latest with Python latest, use PyTorch scope to limit dependency issues
- { os: "macOS-14", pkg-name: "pytorch", python-version: "3.12.7", pytorch-version: "2.5.1" }
- { os: "ubuntu-22.04", pkg-name: "pytorch", python-version: "3.12.7", pytorch-version: "2.5.1" }
- { os: "windows-2022", pkg-name: "pytorch", python-version: "3.12.7", pytorch-version: "2.5.1" }
- { os: "macOS-14", pkg-name: "pytorch", python-version: "3.12.7", pytorch-version: "2.6" }
- { os: "ubuntu-22.04", pkg-name: "pytorch", python-version: "3.12.7", pytorch-version: "2.6" }
- { os: "windows-2022", pkg-name: "pytorch", python-version: "3.12.7", pytorch-version: "2.6" }
# "oldest" versions tests, only on minimum Python
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.9", pytorch-version: "2.1", requires: "oldest" }
- {
os: "ubuntu-20.04",
pkg-name: "lightning",
python-version: "3.9",
pytorch-version: "2.1",
requires: "oldest",
}
- {
os: "windows-2022",
pkg-name: "lightning",
python-version: "3.9",
pytorch-version: "2.1",
requires: "oldest",
}
- { os: "macOS-14", pkg-name: "pytorch", pytorch-version: "2.1", requires: "oldest" }
- { os: "ubuntu-20.04", pkg-name: "pytorch", pytorch-version: "2.1", requires: "oldest" }
- { os: "windows-2022", pkg-name: "pytorch", pytorch-version: "2.1", requires: "oldest" }
# "pytorch" installs the standalone package
- { os: "macOS-14", pkg-name: "pytorch", python-version: "3.9", pytorch-version: "2.1" }
- { os: "ubuntu-20.04", pkg-name: "pytorch", python-version: "3.9", pytorch-version: "2.1" }
- { os: "windows-2022", pkg-name: "pytorch", python-version: "3.9", pytorch-version: "2.1" }
- { os: "macOS-14", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "2.5" }
- { os: "ubuntu-20.04", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "2.5" }
- { os: "windows-2022", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "2.5" }
# adding recently cut Torch 2.7 - FUTURE
# - { os: "macOS-14", pkg-name: "pytorch", python-version: "3.12", pytorch-version: "2.7" }
# - { os: "ubuntu-22.04", pkg-name: "pytorch", python-version: "3.12", pytorch-version: "2.7" }
# - { os: "windows-2022", pkg-name: "pytorch", python-version: "3.12", pytorch-version: "2.7" }
timeout-minutes: 50
env:
PACKAGE_NAME: ${{ matrix.pkg-name }}
TORCH_URL: "https://download.pytorch.org/whl/cpu/torch_stable.html"
TORCH_URL_STABLE: "https://download.pytorch.org/whl/cpu/torch_stable.html"
TORCH_URL_TEST: "https://download.pytorch.org/whl/test/cpu/torch"
TORCH_URL: "https://download.pytorch.org/whl/cpu/"
TORCH_URL_STABLE: "https://download.pytorch.org/whl/cpu/"
TORCH_URL_TEST: "https://download.pytorch.org/whl/test/cpu/"
FREEZE_REQUIREMENTS: ${{ ! (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release/')) }}
PYPI_CACHE_DIR: "_pip-wheels"
# TODO: Remove this - Enable running MPS tests on this platform
Expand All @@ -99,7 +91,7 @@ jobs:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
python-version: ${{ matrix.python-version || '3.9' }}

- name: basic setup
run: pip install -q -r .actions/requirements.txt
Expand Down Expand Up @@ -132,8 +124,8 @@ jobs:

- name: Env. variables
run: |
# Switch PyTorch URL
python -c "print('TORCH_URL=' + str('${{env.TORCH_URL_TEST}}' if '${{ matrix.pytorch-version }}' == '2.5' else '${{env.TORCH_URL_STABLE}}'))" >> $GITHUB_ENV
# Switch PyTorch URL between stable and test/future
python -c "print('TORCH_URL=' + str('${{env.TORCH_URL_TEST}}' if '${{ matrix.pytorch-version }}' == '2.7' else '${{env.TORCH_URL_STABLE}}'))" >> $GITHUB_ENV
# Switch coverage scope
python -c "print('COVERAGE_SCOPE=' + str('lightning' if '${{matrix.pkg-name}}' == 'lightning' else 'pytorch_lightning'))" >> $GITHUB_ENV
# if you install mono-package set dependency only for this subpackage
Expand All @@ -146,7 +138,7 @@ jobs:
run: |
pip install ".[${EXTRA_PREFIX}extra,${EXTRA_PREFIX}test,${EXTRA_PREFIX}strategies]" -U --prefer-binary \
-r requirements/_integrations/accelerators.txt \
--find-links="${TORCH_URL}" --find-links="${PYPI_CACHE_DIR}"
--extra-index-url="${TORCH_URL}" --find-links="${PYPI_CACHE_DIR}"
pip list
- name: Drop LAI from extensions
if: ${{ matrix.pkg-name != 'lightning' }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ jobs:
- { python_version: "3.11", pytorch_version: "2.3.1", cuda_version: "12.1.1" }
- { python_version: "3.11", pytorch_version: "2.4.1", cuda_version: "12.1.1" }
- { python_version: "3.12", pytorch_version: "2.5.1", cuda_version: "12.1.1" }
- { python_version: "3.12", pytorch_version: "2.6.0", cuda_version: "12.4.1" }
steps:
- uses: actions/checkout@v4
- uses: docker/setup-buildx-action@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ defaults:

env:
FREEZE_REQUIREMENTS: "1"
TORCH_URL: "https://download.pytorch.org/whl/cpu/torch_stable.html"
TORCH_URL: "https://download.pytorch.org/whl/cpu/"
PYPI_CACHE_DIR: "_pip-wheels"
PYPI_LOCAL_DIR: "pypi_pkgs/"

Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
mkdir -p ${PYPI_CACHE_DIR} # in case cache was not hit
ls -lh ${PYPI_CACHE_DIR}
pip install .[all] -U -r requirements/${{ matrix.pkg-name }}/docs.txt \
-f ${PYPI_LOCAL_DIR} -f ${PYPI_CACHE_DIR} -f ${TORCH_URL}
-f ${PYPI_LOCAL_DIR} -f ${PYPI_CACHE_DIR} --extra-index-url="${TORCH_URL}"
pip list
- name: Install req. for Notebooks/tutorials
if: matrix.pkg-name == 'pytorch'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ defaults:

env:
FREEZE_REQUIREMENTS: 1
TORCH_URL: "https://download.pytorch.org/whl/cpu/torch_stable.html"
TORCH_URL: "https://download.pytorch.org/whl/cpu/"
PYTHON_VER: "3.9"

jobs:
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
python-version: ${{ env.PYTHON_VER }}
- name: install Package
run: |
pip install . -f ${TORCH_URL}
pip install . --extra-index-url="${TORCH_URL}"
pip list
- name: package Version
id: lai-package
Expand Down
5 changes: 2 additions & 3 deletions dockers/base-cuda/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,8 @@ RUN \
-r requirements/pytorch/extra.txt \
-r requirements/pytorch/test.txt \
-r requirements/pytorch/strategies.txt \
--find-links="https://download.pytorch.org/whl/cu${CUDA_VERSION_MM//'.'/''}/torch_stable.html" \
--find-links="https://download.pytorch.org/whl/test/cu${CUDA_VERSION_MM//'.'/''}/torch" \
--find-links="https://download.pytorch.org/whl/test/cu${CUDA_VERSION_MM//'.'/''}/pytorch-triton"
--extra-index-url="https://download.pytorch.org/whl/cu${CUDA_VERSION_MM//'.'/''}/" \
--extra-index-url="https://download.pytorch.org/whl/test/cu${CUDA_VERSION_MM//'.'/''}/"

RUN \
# Show what we have
Expand Down
2 changes: 1 addition & 1 deletion requirements/fabric/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
torch >=2.1.0, <2.6.0
fsspec[http] >=2022.5.0, <2024.4.0
packaging >=20.0, <=23.1
typing-extensions >=4.4.0, <4.10.0
typing-extensions >=4.4.0, <4.11.0
lightning-utilities >=0.10.0, <0.12.0
3 changes: 1 addition & 2 deletions requirements/fabric/strategies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@
# note: is a bug around 0.10 with `MPS_Accelerator must implement all abstract methods`
# shall be resolved by https://github.com/microsoft/DeepSpeed/issues/4372
deepspeed >=0.8.2, <=0.9.3; platform_system != "Windows" and platform_system != "Darwin" # strict
bitsandbytes >=0.44.0,<0.44.2; sys_platform == 'linux' or sys_platform == 'win32'
bitsandbytes >=0.42.0,<0.43.0 ; sys_platform == 'darwin'
bitsandbytes >=0.45.2,<0.45.3; platform_system != "Darwin"
Loading
Loading