bump version to 2.3.2, support for Lightning <= 2.3.2 and PyTorch…

… <= `2.3.1`
speediedan · Jul 8, 2024 · 977fde3 · 977fde3
1 parent 2c7fec3
commit 977fde3
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 46 deletions.
diff --git a/.azure-pipelines/gpu-tests.yml b/.azure-pipelines/gpu-tests.yml
@@ -48,7 +48,7 @@ jobs:
           image: "speediedan/finetuning-scheduler:py3.10-pt2.0.1-pl2.3-azpl-init"
           scope: "2.0.1"
         'PyTorch | latest':
-          image: "speediedan/finetuning-scheduler:py3.11-pt2.3.0-pl2.3-azpl-init"
+          image: "speediedan/finetuning-scheduler:py3.11-pt2.3.1-pl2.3-azpl-init"
           scope: ""
     # how long to run the job before automatically cancelling
     timeoutInMinutes: "100"

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -39,9 +39,9 @@ python collect_env_details.py
 You can also fill out the list below manually.
 -->
 
-- Fine-Tuning Scheduler Version (e.g., 2.3.0):
-- Lightning Version (e.g., 2.3.0):
-- PyTorch Version (e.g., 2.3.0):
+- Fine-Tuning Scheduler Version (e.g., 2.3.2):
+- Lightning Version (e.g., 2.3.2):
+- PyTorch Version (e.g., 2.3.1):
 - Python version (e.g., 3.11):
 - OS (e.g., Linux):
 - CUDA/cuDNN version:

diff --git a/.github/workflows/release-docker.yml b/.github/workflows/release-docker.yml
@@ -31,7 +31,7 @@ jobs:
       matrix:
         # initially building only the latest supported configuration
         python_version: ["3.11"]
-        pytorch_version: ["2.3.0"]
+        pytorch_version: ["2.3.1"]
         cust_base: ["cu12.1.0-"]
         pl_version: ["2.3"]
     steps:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
+## [2.3.2] - 2024-07-08
+
+- Support for Lightning <= ``2.3.2`` and PyTorch <= ``2.3.1``
+
 ## [2.3.0] - 2024-05-17
 
 ### Added

diff --git a/CITATION.cff b/CITATION.cff
@@ -6,7 +6,7 @@ date-released: 2022-02-04
 authors:
   - family-names: "Dale"
     given-names: "Dan"
-version: 2.3.0
+version: 2.3.2
 identifiers:
   - description: "Fine-Tuning Scheduler (all versions)"
     type: doi

diff --git a/README.md b/README.md
@@ -38,15 +38,6 @@ ______________________________________________________________________
 
 ## Setup
 
-> \[!NOTE\]
-> Because Lightning is not currently planning an official `2.3.0` release, this FTS release is marked as a pre-release and pins a `lightning` `2.3.0dev` commit. A return to normal Lightning cadence is expected with `2.4.0` and FTS will release accordingly. Installation of this FTS pre-release can either follow the normal installation from source or use the release archive, e.g.:
-
-```bash
-export FTS_VERSION=2.3.0 && \
-wget https://github.com/speediedan/finetuning-scheduler/releases/download/v${FTS_VERSION}-rc1/finetuning_scheduler-${FTS_VERSION}rc1.tar.gz && \
-pip install finetuning_scheduler-${FTS_VERSION}rc1.tar.gz
-```
-
 ### Step 0: Install from PyPI
 
 ```bash
@@ -154,7 +145,7 @@ To ensure maximum stability, the latest Lightning patch release fully tested wit
 <details>
   <summary>Current build statuses for Fine-Tuning Scheduler </summary>
 
-| System / (PyTorch/Python ver) |                                                                                                        2.0.1/3.8                                                                                                         |                                                                                                              2.3.0/3.8, 2.3.0/3.11                                                                                                               |
+| System / (PyTorch/Python ver) |                                                                                                        2.0.1/3.8                                                                                                         |                                                                                                              2.3.2/3.8, 2.3.2/3.11                                                                                                               |
 | :---------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
 |      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) |
 |     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)             |

diff --git a/dockers/base-cuda/Dockerfile b/dockers/base-cuda/Dockerfile
@@ -17,7 +17,7 @@ ARG OS_VER=ubuntu22.04
 FROM nvidia/cuda:${CUDA_VERSION}-devel-${OS_VER}
 
 ARG PYTHON_VERSION=3.11
-ARG PYTORCH_VERSION=2.3.0
+ARG PYTORCH_VERSION=2.3.1
 ARG CUST_BUILD=0
 ARG MKL_THREADING_LAYER=GNU
 
@@ -89,7 +89,7 @@ RUN \
         # ... pytorch patch version
         # pip install torch==1.11.1+cu113 torchvision==0.11.3+cu113 -f https://download.pytorch.org/whl/cu113/torch_stable.html; \
         # ... pytorch nightly dev version
-        #pip install --pre torch==2.3.0.dev20240209  torchvision==0.18.0.dev20240209 -f https://download.pytorch.org/whl/nightly/cu121/torch_nightly.html; \
+        #pip install --pre torch==2.3.1.dev20240209  torchvision==0.18.0.dev20240209 -f https://download.pytorch.org/whl/nightly/cu121/torch_nightly.html; \
         # ... test channel
         # pip install --pre torch torchvision -f https://download.pytorch.org/whl/test/cu121/torch_test.html; \
     fi && \

diff --git a/dockers/docker_images_main.sh b/dockers/docker_images_main.sh
@@ -49,7 +49,7 @@ maybe_build(){
 
 build_eval(){
 	# latest PyTorch image supported by release
-	declare -A iv=(["cuda"]="12.1.0" ["python"]="3.11" ["pytorch"]="2.3.0" ["lightning"]="2.3" ["cust_build"]="1")
+	declare -A iv=(["cuda"]="12.1.0" ["python"]="3.11" ["pytorch"]="2.3.1" ["lightning"]="2.3" ["cust_build"]="1")
 	export latest_pt="base-cu${iv["cuda"]}-py${iv["python"]}-pt${iv["pytorch"]}-pl${iv["lightning"]}"
 	export latest_azpl="py${iv["python"]}-pt${iv["pytorch"]}-pl${iv["lightning"]}-azpl-init"
 	maybe_build iv "${latest_pt}" "${latest_azpl}"

diff --git a/dockers/docker_images_release.sh b/dockers/docker_images_release.sh
@@ -50,7 +50,7 @@ maybe_build(){
 
 build_eval(){
 	# latest PyTorch image supported by release
-	declare -A iv=(["cuda"]="12.1.0" ["python"]="3.11" ["pytorch"]="2.3.0" ["lightning"]="2.3" ["cust_build"]="0")
+	declare -A iv=(["cuda"]="12.1.0" ["python"]="3.11" ["pytorch"]="2.3.1" ["lightning"]="2.3" ["cust_build"]="0")
 	export latest_pt="base-cu${iv["cuda"]}-py${iv["python"]}-pt${iv["pytorch"]}-pl${iv["lightning"]}"
 	export latest_azpl="py${iv["python"]}-pt${iv["pytorch"]}-pl${iv["lightning"]}-azpl-init"
 	maybe_build iv "${latest_pt}" "${latest_azpl}"

diff --git a/dockers/fts-az-base/Dockerfile b/dockers/fts-az-base/Dockerfile
@@ -11,7 +11,7 @@
 # limitations under the License.
 
 ARG PYTHON_VERSION=3.11
-ARG PYTORCH_VERSION=2.3.0
+ARG PYTORCH_VERSION=2.3.1
 ARG LIGHTNING_VERSION=2.3
 ARG CUST_BASE
 

diff --git a/dockers/release-conda/Dockerfile b/dockers/release-conda/Dockerfile
@@ -18,7 +18,7 @@ FROM nvidia/cuda:${CUDA_VERSION}-devel-ubuntu22.04
 
 ARG CUDATOOLKIT_VERSION=12.1
 ARG PYTHON_VERSION=3.11
-ARG PYTORCH_VERSION=2.3.0
+ARG PYTORCH_VERSION=2.3.1
 ARG CONDA_VERSION=4.13.0
 
 SHELL ["/bin/bash", "-c"]

diff --git a/dockers/release/Dockerfile b/dockers/release/Dockerfile
@@ -11,7 +11,7 @@
 # limitations under the License.
 
 ARG PYTHON_VERSION=3.11
-ARG PYTORCH_VERSION=2.3.0
+ARG PYTORCH_VERSION=2.3.1
 ARG LIGHTNING_VERSION=2.3
 ARG CUST_BASE
 

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -1,10 +1,5 @@
-########################################################################################################################
-# Because Lightning is not currently planning an official `2.3.0` release, this FTS release is marked as a pre-release
-# and pins the below `lightning` commit. A return to normal Lightning cadence is expected with `2.4.0` and FTS will
-# release accordingly.
-########################################################################################################################
-#lightning>=2.3.0,<2.3.1
+lightning>=2.3.0,<2.3.3
 # the below is uncommented when master is targeting a specific pl dev master commit
-git+https://github.com/Lightning-AI/lightning.git@90d04b5b86f37994cdceccc6de32f0e93b1cc7f0#egg=lightning
+#git+https://github.com/Lightning-AI/lightning.git@90d04b5b86f37994cdceccc6de32f0e93b1cc7f0#egg=lightning
 torch>=2.0.0
 mpmath<1.4.0  # temporary requirement to avoid installation of alpha version of mpmath
diff --git a/requirements/pl_adjust_versions.py b/requirements/pl_adjust_versions.py
@@ -6,7 +6,8 @@
 # IMPORTANT: this list needs to be sorted in reverse
 VERSIONS = [
     dict(torch="2.4.0", torchvision="0.19.0"),  # nightly
-    dict(torch="2.3.0", torchvision="0.18.0"),  # stable
+    dict(torch="2.3.1", torchvision="0.18.1"),  # stable
+    dict(torch="2.3.0", torchvision="0.18.0"),
     dict(torch="2.2.2", torchvision="0.17.2"),
     dict(torch="2.2.1", torchvision="0.17.1"),
     dict(torch="2.2.0", torchvision="0.17.0"),

diff --git a/requirements/standalone_base.txt b/requirements/standalone_base.txt
@@ -1,10 +1,5 @@
-########################################################################################################################
-# Because Lightning is not currently planning an official `2.3.0` release, this FTS release is marked as a pre-release
-# and pins the below `lightning` commit. A return to normal Lightning cadence is expected with `2.4.0` and FTS will
-# release accordingly.
-########################################################################################################################
-#pytorch-lightning>=2.3.0,<2.3.1
+pytorch-lightning>=2.3.0,<2.3.3
 # the below is uncommented when master is targeting a specific pl dev master commit
-git+https://github.com/Lightning-AI/pytorch-lightning.git@90d04b5b86f37994cdceccc6de32f0e93b1cc7f0#egg=pytorch-lightning
+#git+https://github.com/Lightning-AI/pytorch-lightning.git@90d04b5b86f37994cdceccc6de32f0e93b1cc7f0#egg=pytorch-lightning
 torch>=2.0.0
 mpmath<1.4.0  # temporary requirement to avoid installation of alpha version of mpmath
diff --git a/setup.py b/setup.py
@@ -131,15 +131,15 @@ def _setup_args(standalone: bool = False) -> Dict[str, Any]:
     )
 
     base_reqs = "standalone_base.txt" if standalone else "base.txt"
-    # install_requires = setup_tools._load_requirements(
-    #     _INSTALL_PATHS["require"], file_name=base_reqs, standalone=standalone
-    # )
     install_requires = setup_tools._load_requirements(
-        _INSTALL_PATHS["require"],
-        file_name=base_reqs,
-        standalone=standalone,
-        pl_commit="90d04b5b86f37994cdceccc6de32f0e93b1cc7f0",
+        _INSTALL_PATHS["require"], file_name=base_reqs, standalone=standalone
     )
+    # install_requires = setup_tools._load_requirements(
+    #     _INSTALL_PATHS["require"],
+    #     file_name=base_reqs,
+    #     standalone=standalone,
+    #     pl_commit="90d04b5b86f37994cdceccc6de32f0e93b1cc7f0",
+    # )
     base_setup["install_requires"] = install_requires
     return base_setup
 

diff --git a/src/finetuning_scheduler/__about__.py b/src/finetuning_scheduler/__about__.py
@@ -1,7 +1,7 @@
 import time
 
 _this_year = time.strftime("%Y")
-__version__ = "2.3.0-rc1"
+__version__ = "2.3.2"
 __author__ = "Dan Dale"
 __author_email__ = "[email protected]"
 __license__ = "Apache-2.0"