Skip to content

Commit b65481e

Browse files
hehepig4hehepig4
authored
Merge branch 'master' into deepspeed_mics_init
2 parents 50a0af7 + 9177ec0 commit b65481e

File tree

23 files changed

+147
-114
lines changed

23 files changed

+147
-114
lines changed

‎.actions/assistant.py‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -481,23 +481,27 @@ def convert_version2nightly(ver_file: str = "src/version.info") -> None:
481481
with open(ver_file, "w") as fo:
482482
fo.write(version + os.linesep)
483483

484+
@staticmethod
485+
def generate_docker_tags(
486+
release_version: str,
487+
python_version: str,
488+
torch_version: str,
489+
cuda_version: str,
490+
docker_project: str = "pytorchlightning/pytorch_lightning",
491+
add_latest: bool = False,
492+
) -> None:
493+
"""Generate docker tags for the given versions."""
494+
tags = [f"latest-py{python_version}-torch{torch_version}-cuda{cuda_version}"]
495+
if release_version:
496+
tags += [f"{release_version}-py{python_version}-torch{torch_version}-cuda{cuda_version}"]
497+
if add_latest:
498+
tags += ["latest"]
484499

485-
if __name__ == "__main__":
486-
import sys
487-
488-
import jsonargparse
489-
from jsonargparse import ArgumentParser
490-
491-
def patch_jsonargparse_python_3_12_8():
492-
if sys.version_info < (3, 12, 8):
493-
return
494-
495-
def _parse_known_args_patch(self: ArgumentParser, args: Any = None, namespace: Any = None) -> tuple[Any, Any]:
496-
namespace, args = super(ArgumentParser, self)._parse_known_args(args, namespace, intermixed=False) # type: ignore
497-
return namespace, args
500+
tags = [f"{docker_project}:{tag}" for tag in tags]
501+
print(",".join(tags))
498502

499-
setattr(ArgumentParser, "_parse_known_args", _parse_known_args_patch)
500503

501-
patch_jsonargparse_python_3_12_8() # Required until fix https://github.com/omni-us/jsonargparse/issues/641
504+
if __name__ == "__main__":
505+
import jsonargparse
502506

503507
jsonargparse.CLI(AssistantCLI, as_positional=False)

‎.actions/requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
jsonargparse >=4.16.0, <4.28.0
1+
jsonargparse >=4.16.0, <=4.35.0
22
requests
33
packaging

‎.azure/gpu-benchmarks.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
7878
- bash: |
7979
pip install -e .[dev] --find-links ${TORCH_URL}
80-
pip install setuptools==75.6.0
80+
pip install setuptools==75.6.0 jsonargparse==4.35.0
8181
env:
8282
FREEZE_REQUIREMENTS: "1"
8383
displayName: "Install package"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
- bash: |
108108
extra=$(python -c "print({'lightning': 'fabric-'}.get('$(PACKAGE_NAME)', ''))")
109109
pip install -e ".[${extra}dev]" pytest-timeout -U --find-links="${TORCH_URL}" --find-links="${TORCHVISION_URL}"
110-
pip install setuptools==75.6.0
110+
pip install setuptools==75.6.0 jsonargparse==4.35.0
111111
displayName: "Install package & dependencies"
112112
113113
- bash: |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ jobs:
111111
- bash: |
112112
extra=$(python -c "print({'lightning': 'pytorch-'}.get('$(PACKAGE_NAME)', ''))")
113113
pip install -e ".[${extra}dev]" pytest-timeout -U --find-links="${TORCH_URL}" --find-links="${TORCHVISION_URL}"
114-
pip install setuptools==75.6.0
114+
pip install setuptools==75.6.0 jsonargparse==4.35.0
115115
displayName: "Install package & dependencies"
116116
117117
- bash: pip uninstall -y lightning

‎.github/ISSUE_TEMPLATE/1_bug_report.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ body:
3737
- "v2.2"
3838
- "v2.3"
3939
- "v2.4"
40+
- "v2.5"
4041
- "master"
4142
validations:
4243
required: true
@@ -91,8 +92,8 @@ body:
9192
<summary>Current environment</summary>
9293
9394
```
94-
#- PyTorch Lightning Version (e.g., 2.4.0):
95-
#- PyTorch Version (e.g., 2.4):
95+
#- PyTorch Lightning Version (e.g., 2.5.0):
96+
#- PyTorch Version (e.g., 2.5):
9697
#- Python version (e.g., 3.12):
9798
#- OS (e.g., Linux):
9899
#- CUDA/cuDNN version:

‎.github/advanced-issue-labeler.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,7 @@ policy:
1616
keys: ["v2_3", "v2.3", "2.3.x"]
1717
- name: "ver: 2.4.x"
1818
keys: ["v2_4", "v2.4", "2.4.x"]
19-
- name: "ver: 2.4.x"
19+
- name: "ver: 2.5.x"
20+
keys: ["v2_5", "v2.5", "2.5.x"]
21+
- name: "ver: 2.5.x"
2022
keys: ["master"]

‎.github/checkgroup.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -145,17 +145,17 @@ subprojects:
145145
- "!*.md"
146146
- "!**/*.md"
147147
checks:
148-
- "build-cuda (3.10, 2.1.2, 12.1.0)"
149-
- "build-cuda (3.11, 2.2.2, 12.1.0)"
150-
- "build-cuda (3.11, 2.3.1, 12.1.0)"
151-
- "build-cuda (3.11, 2.4.1, 12.1.0)"
152-
- "build-cuda (3.12, 2.5.1, 12.1.0)"
148+
- "build-cuda (3.10, 2.1.2, 12.1.1)"
149+
- "build-cuda (3.11, 2.2.2, 12.1.1)"
150+
- "build-cuda (3.11, 2.3.1, 12.1.1)"
151+
- "build-cuda (3.11, 2.4.1, 12.1.1)"
152+
- "build-cuda (3.12, 2.5.1, 12.1.1)"
153153
#- "build-NGC"
154-
- "build-pl (3.10, 2.1, 12.1.0)"
155-
- "build-pl (3.11, 2.2, 12.1.0)"
156-
- "build-pl (3.11, 2.3, 12.1.0)"
157-
- "build-pl (3.11, 2.4, 12.1.0)"
158-
- "build-pl (3.12, 2.5, 12.1.0)"
154+
- "build-pl (3.10, 2.1, 12.1.1)"
155+
- "build-pl (3.11, 2.2, 12.1.1)"
156+
- "build-pl (3.11, 2.3, 12.1.1)"
157+
- "build-pl (3.11, 2.4, 12.1.1)"
158+
- "build-pl (3.12, 2.5, 12.1.1, true)"
159159

160160
# SECTION: lightning_fabric
161161

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,16 @@ jobs:
4949
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.3" }
5050
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.3" }
5151
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.3" }
52-
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.4.1" }
53-
- { os: "ubuntu-22.04", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.4.1" }
54-
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.4.1" }
55-
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.5.1" }
56-
- { os: "ubuntu-22.04", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.5.1" }
57-
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.5.1" }
52+
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.12.7", pytorch-version: "2.4.1" }
53+
- { os: "ubuntu-22.04", pkg-name: "lightning", python-version: "3.12.7", pytorch-version: "2.4.1" }
54+
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.12.7", pytorch-version: "2.4.1" }
55+
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.12.7", pytorch-version: "2.5.1" }
56+
- { os: "ubuntu-22.04", pkg-name: "lightning", python-version: "3.12.7", pytorch-version: "2.5.1" }
57+
- { 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", pytorch-version: "2.5.1" }
60-
- { os: "ubuntu-22.04", pkg-name: "fabric", python-version: "3.12", pytorch-version: "2.5.1" }
61-
- { os: "windows-2022", pkg-name: "fabric", python-version: "3.12", pytorch-version: "2.5.1" }
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" }
6262
# "oldest" versions tests, only on minimum Python
6363
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.9", pytorch-version: "2.1", requires: "oldest" }
6464
- {

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,16 @@ jobs:
5353
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.3" }
5454
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.3" }
5555
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.3" }
56-
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.4.1" }
57-
- { os: "ubuntu-22.04", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.4.1" }
58-
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.4.1" }
59-
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.5.1" }
60-
- { os: "ubuntu-22.04", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.5.1" }
61-
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.5.1" }
56+
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.12.7", pytorch-version: "2.4.1" }
57+
- { os: "ubuntu-22.04", pkg-name: "lightning", python-version: "3.12.7", pytorch-version: "2.4.1" }
58+
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.12.7", pytorch-version: "2.4.1" }
59+
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.12.7", pytorch-version: "2.5.1" }
60+
- { os: "ubuntu-22.04", pkg-name: "lightning", python-version: "3.12.7", pytorch-version: "2.5.1" }
61+
- { 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", pytorch-version: "2.5.1" }
64-
- { os: "ubuntu-22.04", pkg-name: "pytorch", python-version: "3.12", pytorch-version: "2.5.1" }
65-
- { os: "windows-2022", pkg-name: "pytorch", python-version: "3.12", pytorch-version: "2.5.1" }
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" }
6666
# "oldest" versions tests, only on minimum Python
6767
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.9", pytorch-version: "2.1", requires: "oldest" }
6868
- {

0 commit comments

Comments
 (0)