Skip to content

Commit cb5de7f

Browse files
speediedanspeediedan
committed
Merge branch 'main' into release/2.6.x
2 parents 10f2919 + 78e6e22 commit cb5de7f

30 files changed

+706
-285
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ python collect_env_details.py
3939
You can also fill out the list below manually.
4040
-->
4141

42-
- Fine-Tuning Scheduler Version (e.g., 2.6.0):
43-
- Lightning Version (e.g., 2.6.0):
44-
- PyTorch Version (e.g., 2.6.0):
42+
- Fine-Tuning Scheduler Version (e.g., 2.7.0):
43+
- Lightning Version (e.g., 2.7.0):
44+
- PyTorch Version (e.g., 2.7.0):
4545
- Python version (e.g., 3.12):
4646
- OS (e.g., Linux):
4747
- CUDA/cuDNN version:

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ lightning_logs/
99
# ignore ipynb files themselves since we want to only store the source *.py
1010
*.ipynb
1111

12+
# SQLite database files
13+
*.db
14+
1215
# Test-tube
1316
test_tube_*/
1417

‎CITATION.cff‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ date-released: 2022-02-04
66
authors:
77
- family-names: "Dale"
88
given-names: "Dan"
9-
version: 2.6.0
9+
version: 2.7.0
1010
identifiers:
1111
- description: "Fine-Tuning Scheduler (all versions)"
1212
type: doi

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ To ensure maximum stability, the latest Lightning patch release fully tested wit
145145
<details>
146146
<summary>Current build statuses for Fine-Tuning Scheduler </summary>
147147

148-
| System / (PyTorch/Python ver) | 2.3.1/3.9 | 2.6.0/3.9, 2.6.0/3.12 |
148+
| System / (PyTorch/Python ver) | 2.3.1/3.9 | 2.7.0/3.9, 2.7.0/3.12 |
149149
| :---------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
150150
| Linux \[GPUs\*\*\] | - | [![Build Status](https://dev.azure.com//speediedan/finetuning-scheduler/_apis/build/status/Multi-GPU%20&%20Example%20Tests?branchName=main)](https://dev.azure.com/speediedan/finetuning-scheduler/_build/latest?definitionId=1&branchName=main) |
151151
| Linux (Ubuntu 22.04) | [![Test](https://github.com/speediedan/finetuning-scheduler/actions/workflows/ci_test-full.yml/badge.svg?branch=main&event=push)](https://github.com/speediedan/finetuning-scheduler/actions/workflows/ci_test-full.yml) | [![Test](https://github.com/speediedan/finetuning-scheduler/actions/workflows/ci_test-full.yml/badge.svg?branch=main&event=push)](https://github.com/speediedan/finetuning-scheduler/actions/workflows/ci_test-full.yml) |

‎dockers/fts-az-base/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
# limitations under the License.
1212

1313
ARG PYTHON_VERSION=3.12
14-
ARG PYTORCH_VERSION=2.6.0
15-
ARG LIGHTNING_VERSION=2.6
14+
ARG PYTORCH_VERSION=2.7.0
15+
ARG LIGHTNING_VERSION=2.7
1616
ARG CUST_BASE
1717

1818
FROM speediedan/finetuning-scheduler:base-${CUST_BASE}py${PYTHON_VERSION}-pt${PYTORCH_VERSION}-pl${LIGHTNING_VERSION}

‎dockers/release/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
# limitations under the License.
1212

1313
ARG PYTHON_VERSION=3.12
14-
ARG PYTORCH_VERSION=2.6.0
15-
ARG LIGHTNING_VERSION=2.6
14+
ARG PYTORCH_VERSION=2.7.0
15+
ARG LIGHTNING_VERSION=2.7
1616
ARG CUST_BASE
1717

1818
FROM speediedan/finetuning-scheduler:base-${CUST_BASE}py${PYTHON_VERSION}-pt${PYTORCH_VERSION}-pl${LIGHTNING_VERSION}

‎docs/source/index.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ thawed/unfrozen parameter groups associated with each fine-tuning phase as desir
100100
and executed in ascending order. In addition to being zero-indexed, fine-tuning phase keys should be contiguous and
101101
either integers or convertible to integers via ``int()``.
102102

103-
1. First, generate the default schedule to ``Trainer.log_dir``. It will be named after your
104-
:external+pl:class:`~lightning.pytorch.core.module.LightningModule` subclass with the suffix
105-
``_ft_schedule.yaml``.
103+
1. First, generate the default schedule (output to :paramref:`~finetuning_scheduler.fts.FinetuningScheduler.log_dir`,
104+
defaults to ``Trainer.log_dir``). It will be named after your
105+
:external+pl:class:`~lightning.pytorch.core.module.LightningModule` subclass with the suffix ``_ft_schedule.yaml``.
106106

107107
.. code-block:: python
108108

‎pyproject.toml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,8 @@ norecursedirs = [
8282
"docs",
8383
]
8484

85-
# two sets of default options to allow periodic warnings pruning
86-
################################################################
87-
addopts = """--strict-markers --doctest-modules --color=yes --ignore-glob='src/fts_examples/ipynb_src/*.py'
88-
--ignore='.actions/assistant.py' --disable-pytest-warnings""" # comment during warnings pruning, otherwise uncomment
89-
# addopts = """--strict-markers --doctest-modules --color=yes --ignore-glob='src/fts_examples/ipynb_src/*.py'
90-
# --ignore='.actions/assistant.py'""" # uncomment during warnings pruning, otherwise comment
91-
################################################################
85+
addopts = """--strict-markers --doctest-modules --color=yes --ignore-glob='src/fts_examples/ipynb_src/*.py' \
86+
--ignore='.actions/assistant.py' --disable-pytest-warnings"""
9287

9388
junit_duration_report = "call"
9489

‎requirements/base.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#lightning>=2.6.0,<2.6.1
22
# the below is uncommented when master is targeting a specific pl dev master commit
3-
git+https://github.com/Lightning-AI/lightning.git@df5dee674243e124a2bf34d9975dd586ff008d4b#egg=lightning
3+
git+https://github.com/Lightning-AI/lightning.git@ca13f77eab5d8b85ee84eb9fd7484c324ba198b1#egg=lightning
44
torch>=2.3.0

‎requirements/standalone_base.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#pytorch-lightning>=2.6.0,<2.6.1
22
# the below is uncommented when master is targeting a specific pl dev master commit
3-
git+https://github.com/Lightning-AI/pytorch-lightning.git@df5dee674243e124a2bf34d9975dd586ff008d4b#egg=pytorch-lightning
3+
git+https://github.com/Lightning-AI/pytorch-lightning.git@ca13f77eab5d8b85ee84eb9fd7484c324ba198b1#egg=pytorch-lightning
44
torch>=2.3.0

0 commit comments

Comments
 (0)