Skip to content

Commit a2e66b1

Browse files
authored
Merge branch 'master' into bugfix/20852_add-support-for-xla2.7-which-deprecated-methods
2 parents e013cb2 + 6a5c946 commit a2e66b1

File tree

11 files changed

+18
-10
lines changed

11 files changed

+18
-10
lines changed

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Welcome to the PyTorch Lightning community! We're building the most advanced research platform on the planet to implement the latest, best practices
44
and integrations that the amazing PyTorch team and other research organization rolls out!
55

6-
If you are new to open source, check out [this blog to get started with your first Open Source contribution](https://devblog.pytorchlightning.ai/quick-contribution-guide-86d977171b3a).
6+
If you are new to open source, check out [this blog to get started with your first Open Source contribution](https://medium.com/pytorch-lightning/quick-contribution-guide-86d977171b3a).
77

88
## Main Core Value: One less thing to remember
99

docs/source-fabric/advanced/model_parallel/tp_fsdp.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ The :doc:`Tensor Parallelism documentation <tp>` and a general understanding of
99

1010
.. raw:: html
1111

12-
<a target="_blank" href="https://lightning.ai/lightning-ai/studios/tensor-parallelism-supercharging-large-model-training-with-lightning-fabric">
12+
<a target="_blank" href="https://lightning.ai/lightning-ai/studios/pretrain-an-llm-with-pytorch-lightning">
1313
<img src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/app-2/studio-badge.svg" alt="Open In Studio" style="width: auto; max-width: none;"/>
1414
</a>
1515

docs/source-pytorch/advanced/model_parallel/tp.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ This method is most effective for models with very large layers, significantly e
88

99
.. raw:: html
1010

11-
<a target="_blank" href="https://lightning.ai/lightning-ai/studios/tensor-parallelism-supercharging-large-model-training-with-pytorch-lightning">
11+
<a target="_blank" href="https://lightning.ai/lightning-ai/studios/pretrain-an-llm-with-pytorch-lightning">
1212
<img src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/app-2/studio-badge.svg" alt="Open In Studio" style="width: auto; max-width: none;"/>
1313
</a>
1414

requirements/docs.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ myst-parser >=0.18.1, <4.0.0
33
nbsphinx >=0.8.5, <=0.9.7
44
nbconvert >7.14, <7.17
55
pandoc >=1.0, <=2.4
6-
docutils >=0.16, <0.22
6+
docutils>=0.18.1,<=0.19
77
sphinxcontrib-fulltoc >=1.0, <=1.2.0
88
sphinxcontrib-mockautodoc
99
sphinx-autobuild

requirements/fabric/base.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment
33

44
torch >=2.1.0, <2.8.0
5-
fsspec[http] >=2022.5.0, <2025.6.0
5+
fsspec[http] >=2022.5.0, <2025.8.0
66
packaging >=20.0, <=25.0
77
typing-extensions >=4.5.0, <4.15.0
88
lightning-utilities >=0.10.0, <0.15.0

requirements/pytorch/base.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
torch >=2.1.0, <=2.8.0
55
tqdm >=4.57.0, <4.68.0
66
PyYAML >5.4, <6.1.0
7-
fsspec[http] >=2022.5.0, <2025.6.0
7+
fsspec[http] >=2022.5.0, <2025.8.0
88
torchmetrics >0.7.0, <1.8.0
99
packaging >=20.0, <=25.0
1010
typing-extensions >=4.5.0, <4.15.0

requirements/pytorch/test.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ pandas >2.0, <2.4.0 # needed in benchmarks
1616
fastapi # for `ServableModuleValidator` # not setting version as re-defined in App
1717
uvicorn # for `ServableModuleValidator` # not setting version as re-defined in App
1818

19-
tensorboard >=2.9.1, <2.20.0 # for `TensorBoardLogger`
19+
tensorboard >=2.9.1, <2.21.0 # for `TensorBoardLogger`

requirements/typing.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
mypy==1.16.1
1+
mypy==1.17.0
22
torch==2.7.1
33

44
types-Markdown

src/lightning/pytorch/callbacks/progress/rich_progress.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,11 @@ def _add_task(self, total_batches: Union[int, float], description: str, visible:
447447
visible=visible,
448448
)
449449

450+
def _initialize_train_progress_bar_id(self) -> None:
451+
total_batches = self.total_train_batches
452+
train_description = self._get_train_description(self.trainer.current_epoch)
453+
self.train_progress_bar_id = self._add_task(total_batches, train_description)
454+
450455
def _update(self, progress_bar_id: Optional["TaskID"], current: int, visible: bool = True) -> None:
451456
if self.progress is not None and self.is_enabled:
452457
assert progress_bar_id is not None
@@ -531,6 +536,9 @@ def on_train_batch_end(
531536
batch: Any,
532537
batch_idx: int,
533538
) -> None:
539+
if not self.is_disabled and self.train_progress_bar_id is None:
540+
# can happen when resuming from a mid-epoch restart
541+
self._initialize_train_progress_bar_id()
534542
self._update(self.train_progress_bar_id, batch_idx + 1)
535543
self._update_metrics(trainer, pl_module)
536544
self.refresh()

src/pytorch_lightning/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ The PyTorch Lightning community is maintained by
370370
- [10+ core contributors](https://lightning.ai/docs/pytorch/stable/community/governance.html) who are all a mix of professional engineers, Research Scientists, and Ph.D. students from top AI labs.
371371
- 680+ active community contributors.
372372

373-
Want to help us build Lightning and reduce boilerplate for thousands of researchers? [Learn how to make your first contribution here](https://devblog.pytorchlightning.ai/quick-contribution-guide-86d977171b3a)
373+
Want to help us build Lightning and reduce boilerplate for thousands of researchers? [Learn how to make your first contribution here](https://medium.com/pytorch-lightning/quick-contribution-guide-86d977171b3a)
374374

375375
PyTorch Lightning is also part of the [PyTorch ecosystem](https://pytorch.org/ecosystem/) which requires projects to have solid testing, documentation and support.
376376

0 commit comments

Comments
 (0)