clarify toggle cli usage, enable more testing for draft mode PRs, add release-based install mode fallback if user specifies commit pin based install in a context that it is not possible

Author: speediedan

.github/workflows/ci_test-full.yml

@@ -36,7 +36,6 @@ jobs:
 
   cpu:
     runs-on: ${{ matrix.os }}
-    if: github.event.pull_request.draft == false
     strategy:
       fail-fast: false
       matrix:

README.md

@@ -142,6 +142,8 @@ toggle-lightning-mode --mode standalone
 toggle-lightning-mode --mode unified
 ```
 
+> **Note:** If you have the standalone package (`pytorch-lightning`) installed but not the unified package (`lightning`), toggling to unified mode will be prevented. You must install the `lightning` package first before toggling.
+
 This can be useful when:
 
 - You need to adapt existing code to work with a different Lightning package

setup.py

@@ -22,12 +22,10 @@
 
 _PACKAGE_NAME = os.environ.get("PACKAGE_NAME")
 _PACKAGE_MODES = ("pytorch", "lightning")
-
 _PATH_ROOT = Path(os.path.abspath(os.path.dirname(__file__)))
 _INSTALL_PATHS = {}
 for p, d in zip(["source", "tests", "require"], ["src", "tests", "requirements"]):
     _INSTALL_PATHS[p] = _PATH_ROOT / d
-
 _CORE_FTS_LOC = _INSTALL_PATHS["source"] / "finetuning_scheduler"
 _DYNAMIC_VERSIONING_LOC = _CORE_FTS_LOC / "dynamic_versioning"
 
@@ -101,7 +99,7 @@ def _setup_args(standalone: bool = False) -> Dict[str, Any]:
     # Print additional info about Lightning installation method
     use_commit = os.environ.get("USE_CI_COMMIT_PIN", "").lower() in ("1", "true", "yes")
     if use_commit:
-        print("Using Lightning from specific commit (dev mode)")
+        print("Using Lightning from specific commit (dev/ci mode)")
     else:
         print("Using Lightning from PyPI")
 

src/finetuning_scheduler/dynamic_versioning/utils.py

@@ -100,6 +100,13 @@ def get_lightning_requirement(package_type: str = "unified", use_commit: bool =
 
     project_root = Path(__file__).parent.parent.parent.parent
     LIGHTNING_COMMIT_FILE = os.path.join(project_root, "requirements/lightning_pin.txt")
+
+    # Check if the commit file exists
+    if not os.path.exists(LIGHTNING_COMMIT_FILE):
+        print(f"Warning: USE_CI_COMMIT_PIN is set but {LIGHTNING_COMMIT_FILE} does not exist.")
+        print(f"Falling back to release-based installation: {package_name}{pkg_info['version']}")
+        return f"{package_name}{pkg_info['version']}"
+
     with open(LIGHTNING_COMMIT_FILE) as f:
         LIGHTNING_COMMIT = f.read().strip()
 

tests/test_dynamic_versioning_utils.py

@@ -35,6 +35,34 @@ def test_get_lightning_requirement():
         assert "abc123" in req
 
 
+def test_get_lightning_requirement_missing_pin_file():
+    """Test getting the Lightning requirement string when commit pin file is missing."""
+    # Mock os.path.exists to return False for the lightning_pin.txt file
+    with patch('os.path.exists', return_value=False), \
+         patch('builtins.print') as mock_print:
+
+        # Test with use_commit=True but missing pin file
+        req = get_lightning_requirement("unified", True)
+
+        # Should fall back to release-based installation
+        assert "lightning>=" in req
+        assert "@" not in req
+
+        # Should print warning messages
+        assert any("Warning: USE_CI_COMMIT_PIN is set but" in call_args[0][0]
+                  for call_args in mock_print.call_args_list)
+        assert any("Falling back to release-based installation" in call_args[0][0]
+                  for call_args in mock_print.call_args_list)
+
+        # Reset mock
+        mock_print.reset_mock()
+
+        # Same for standalone package
+        req = get_lightning_requirement("standalone", True)
+        assert "pytorch-lightning>=" in req
+        assert "@" not in req
+
+
 def test_lightning_package_mapping():
     """Test Lightning package mapping constants."""
     assert "lightning.pytorch" in LIGHTNING_PACKAGE_MAPPING