ci: testing with py3.11

.github/checkgroup.yml

@@ -38,6 +38,9 @@ subprojects:
       - "pl-cpu (macOS-11, pytorch, 3.8, 1.13)"
       - "pl-cpu (ubuntu-20.04, pytorch, 3.8, 1.13)"
       - "pl-cpu (windows-2022, pytorch, 3.8, 1.13)"
+      - "pl-cpu (macOS-12, pytorch, 3.11, 2.0)"
+      - "pl-cpu (ubuntu-22.04, pytorch, 3.11, 2.0)"
+      - "pl-cpu (windows-2022, pytorch, 3.11, 2.0)"
 
   - id: "pytorch_lightning: Azure GPU"
     paths:
@@ -205,6 +208,9 @@ subprojects:
       - "fabric-cpu (macOS-11, fabric, 3.8, 1.13)"
       - "fabric-cpu (ubuntu-20.04, fabric, 3.8, 1.13)"
       - "fabric-cpu (windows-2022, fabric, 3.8, 1.13)"
+      - "fabric-cpu (macOS-12, fabric, 3.11, 2.0)"
+      - "fabric-cpu (ubuntu-22.04, fabric, 3.11, 2.0)"
+      - "fabric-cpu (windows-2022, fabric, 3.11, 2.0)"
 
   - id: "lightning_fabric: Azure GPU"
     paths:
@@ -259,12 +265,15 @@ subprojects:
       - "app-pytest (macOS-11, lightning, 3.8, latest)"
       - "app-pytest (macOS-11, lightning, 3.8, oldest)"
       - "app-pytest (macOS-11, app, 3.9, latest)"
+      - "app-pytest (macOS-12, app, 3.11, latest)"
       - "app-pytest (ubuntu-20.04, lightning, 3.8, latest)"
       - "app-pytest (ubuntu-20.04, lightning, 3.8, oldest)"
       - "app-pytest (ubuntu-20.04, app, 3.9, latest)"
+      - "app-pytest (ubuntu-22.04, app, 3.11, latest)"
       - "app-pytest (windows-2022, lightning, 3.8, latest)"
       - "app-pytest (windows-2022, lightning, 3.8, oldest)"
       - "app-pytest (windows-2022, app, 3.8, latest)"
+      - "app-pytest (windows-2022, app, 3.11, latest)"
 
   - id: "lightning_app: Examples"
     paths:
@@ -387,35 +396,35 @@ subprojects:
       - "!**/*.md"
     checks:
       - "install-pkg (ubuntu-22.04, app, 3.8)"
-      - "install-pkg (ubuntu-22.04, app, 3.10)"
+      - "install-pkg (ubuntu-22.04, app, 3.11)"
       - "install-pkg (ubuntu-22.04, fabric, 3.8)"
-      - "install-pkg (ubuntu-22.04, fabric, 3.10)"
+      - "install-pkg (ubuntu-22.04, fabric, 3.11)"
       - "install-pkg (ubuntu-22.04, pytorch, 3.8)"
-      - "install-pkg (ubuntu-22.04, pytorch, 3.10)"
+      - "install-pkg (ubuntu-22.04, pytorch, 3.11)"
       - "install-pkg (ubuntu-22.04, lightning, 3.8)"
-      - "install-pkg (ubuntu-22.04, lightning, 3.10)"
+      - "install-pkg (ubuntu-22.04, lightning, 3.11)"
       - "install-pkg (ubuntu-22.04, notset, 3.8)"
-      - "install-pkg (ubuntu-22.04, notset, 3.10)"
+      - "install-pkg (ubuntu-22.04, notset, 3.11)"
       - "install-pkg (macOS-12, app, 3.8)"
-      - "install-pkg (macOS-12, app, 3.10)"
+      - "install-pkg (macOS-12, app, 3.11)"
       - "install-pkg (macOS-12, fabric, 3.8)"
-      - "install-pkg (macOS-12, fabric, 3.10)"
+      - "install-pkg (macOS-12, fabric, 3.11)"
       - "install-pkg (macOS-12, pytorch, 3.8)"
-      - "install-pkg (macOS-12, pytorch, 3.10)"
+      - "install-pkg (macOS-12, pytorch, 3.11)"
       - "install-pkg (macOS-12, lightning, 3.8)"
-      - "install-pkg (macOS-12, lightning, 3.10)"
+      - "install-pkg (macOS-12, lightning, 3.11)"
       - "install-pkg (macOS-12, notset, 3.8)"
-      - "install-pkg (macOS-12, notset, 3.10)"
+      - "install-pkg (macOS-12, notset, 3.11)"
       - "install-pkg (windows-2022, app, 3.8)"
-      - "install-pkg (windows-2022, app, 3.10)"
+      - "install-pkg (windows-2022, app, 3.11)"
       - "install-pkg (windows-2022, fabric, 3.8)"
-      - "install-pkg (windows-2022, fabric, 3.10)"
+      - "install-pkg (windows-2022, fabric, 3.11)"
       - "install-pkg (windows-2022, pytorch, 3.8)"
-      - "install-pkg (windows-2022, pytorch, 3.10)"
+      - "install-pkg (windows-2022, pytorch, 3.11)"
       - "install-pkg (windows-2022, lightning, 3.8)"
-      - "install-pkg (windows-2022, lightning, 3.10)"
+      - "install-pkg (windows-2022, lightning, 3.11)"
       - "install-pkg (windows-2022, notset, 3.8)"
-      - "install-pkg (windows-2022, notset, 3.10)"
+      - "install-pkg (windows-2022, notset, 3.11)"
 
   - id: "release dockers"
     paths:

.github/workflows/ci-pkg-install.yml

@@ -44,7 +44,7 @@ jobs:
       matrix:
         os: [ubuntu-22.04, macOS-12, windows-2022]
         pkg-name: ["app", "fabric", "pytorch", "lightning", "notset"]
-        python-version: ["3.8" , "3.10"]
+        python-version: ["3.8" , "3.11"]
         # TODO: add also install from source
     steps:
       - uses: actions/checkout@v3

.github/workflows/ci-tests-app.yml

@@ -37,11 +37,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, macOS-11, windows-2022]
+        os: ["ubuntu-20.04", "macOS-11", "windows-2022"]
         pkg-name: ["lightning"]
         python-version: ["3.8"]
         requires: ["oldest", "latest"]
         include:
+          # only run Python latest, use App scope to limit dependency issues
+          - {os: "macOS-12", pkg-name: "app", python-version: "3.11", requires: "latest"}
+          - {os: "ubuntu-22.04", pkg-name: "app", python-version: "3.11", requires: "latest"}
+          - {os: "windows-2022", pkg-name: "app", python-version: "3.11", requires: "latest"}
           # "app" installs the standalone package
           - {os: "macOS-11", pkg-name: "app", python-version: "3.9", requires: "latest"}
           - {os: "ubuntu-20.04", pkg-name: "app", python-version: "3.9", requires: "latest"}
@@ -52,6 +56,7 @@ jobs:
       PACKAGE_NAME: ${{ matrix.pkg-name }}
       FREEZE_REQUIREMENTS: ${{ ! (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release/')) }}
       PYPI_CACHE_DIR: "_pip-wheels"
+      TORCH_URL: "https://download.pytorch.org/whl/cpu/torch_stable.html"
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
@@ -75,14 +80,18 @@ jobs:
         mkdir -p $PYPI_CACHE_DIR
         ls -lh $PYPI_CACHE_DIR
 
-    - name: Switch PyTorch URL
-      run: python -c "print('TORCH_URL=https://download.pytorch.org/whl/' + str('test/cpu/torch_test.html' if '${{matrix.release}}' == 'pre' else 'cpu/torch_stable.html'))" >> $GITHUB_ENV
+    - name: Env. variables
+      run: |
+        # Switch coverage scope
+        python -c "print('COVERAGE_SCOPE=' + str('lightning' if '${{matrix.pkg-name}}' == 'lightning' else 'pytorch_lightning'))" >> $GITHUB_ENV
+        # if you install mono-package set dependency only for this subpackage
+        python -c "print('EXTRA_PREFIX=' + str('' if '${{matrix.pkg-name}}' != 'lightning' else 'app-'))" >> $GITHUB_ENV
 
     - name: Install package & dependencies
       run: |
         python -m pip install -q pip -U
-        extra=$(python -c "print({'lightning': 'app-'}.get('${{ matrix.pkg-name }}', ''))")
-        pip install -e ".[${extra}dev]" -U -f ${TORCH_URL} -f ${PYPI_CACHE_DIR} --prefer-binary
+        pip install -e ".[${EXTRA_PREFIX}dev]" -U --prefer-binary \
+          -f ${TORCH_URL} -f ${PYPI_CACHE_DIR}
         pip list
     - name: Dump handy wheels
       if: github.event_name == 'push' && github.ref == 'refs/heads/master'

.github/workflows/ci-tests-data.yml

@@ -46,8 +46,7 @@ jobs:
       PACKAGE_NAME: ${{ matrix.pkg-name }}
       FREEZE_REQUIREMENTS: ${{ ! (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release/')) }}
       # PYPI_CACHE_DIR: "_pip-wheels"
-      TORCH_URL_STABLE: "https://download.pytorch.org/whl/cpu/torch_stable.html"
-      TORCH_URL_TEST: "https://download.pytorch.org/whl/test/cpu/torch_test.html"
+      TORCH_URL: "https://download.pytorch.org/whl/cpu/torch_stable.html"
     steps:
     - uses: actions/checkout@v3
 
@@ -75,6 +74,7 @@ jobs:
         cat requirements/data/data.txt
         cat requirements/data/cloud.txt
 
+    # ToDo
     # - name: pip wheels cache
     #   uses: actions/cache/restore@v3
     #   with:
@@ -84,12 +84,10 @@ jobs:
     #     mkdir -p $PYPI_CACHE_DIR
     #     ls -lh $PYPI_CACHE_DIR
 
-    # removing torch stable line:
-    # pip install -e ".[${extra}test]" "pytest-timeout" -U -f ${TORCH_URL} ${TORCH_PREINSTALL} -f ${PYPI_CACHE_DIR} --prefer-binary
     - name: Install package & dependencies
       run: |
         python -m pip install -q pip -U
-        pip install -e ".[data-dev]" "pytest-timeout" -U -f ${TORCH_URL} --prefer-binary
+        pip install -e ".[data-dev]" "pytest-timeout" -U --prefer-binary -f ${TORCH_URL}
         pip list
 
     - name: Testing Data

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

@@ -47,10 +47,14 @@ jobs:
           - {os: "windows-2022", pkg-name: "lightning", python-version: "3.8", pytorch-version: "1.11"}
           - {os: "windows-2022", pkg-name: "lightning", python-version: "3.9", pytorch-version: "1.12"}
           - {os: "windows-2022", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13"}
-          # only run PyTorch latest with Python latest
+          # only run PyTorch latest with Python recent
           - {os: "macOS-11", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.0"}
           - {os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.0"}
           - {os: "windows-2022", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.0"}
+          # only run PyTorch latest with Python latest, use Fabric scope to limit dependency issues
+          - {os: "macOS-12", pkg-name: "fabric", python-version: "3.11", pytorch-version: "2.0"}
+          - {os: "ubuntu-22.04", pkg-name: "fabric", python-version: "3.11", pytorch-version: "2.0"}
+          - {os: "windows-2022", pkg-name: "fabric", python-version: "3.11", pytorch-version: "2.0"}
           # "oldest" versions tests, only on minimum Python
           - {os: "macOS-11", pkg-name: "lightning", python-version: "3.8", pytorch-version: "1.11", requires: "oldest"}
           - {os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.8", pytorch-version: "1.11", requires: "oldest"}
@@ -82,7 +86,7 @@ jobs:
       run: python .actions/assistant.py replace_oldest_ver
 
     - name: Adjust PyTorch versions in requirements files
-      if: ${{ matrix.requires != 'oldest' && matrix.release != 'pre' }}
+      if: ${{ matrix.requires != 'oldest' }}
       run: |
         pip install -q wget packaging
         python -m wget https://raw.githubusercontent.com/Lightning-AI/utilities/main/scripts/adjust-torch-versions.py
@@ -103,16 +107,17 @@ jobs:
     - name: Env. variables
       run: |
         # Switch PyTorch URL
-        python -c "print('TORCH_URL=' + str('${{env.TORCH_URL_TEST}}' if '${{ matrix.release }}' == 'pre' else '${{env.TORCH_URL_STABLE}}'))" >> $GITHUB_ENV
-        python -c "print('TORCH_PREINSTALL=' + str('--pre' if '${{ matrix.release }}' == 'pre' else ''))" >> $GITHUB_ENV
+        #python -c "print('TORCH_URL=' + str('${{env.TORCH_URL_TEST}}' if '${{ matrix.release }}' == 'pre' else '${{env.TORCH_URL_STABLE}}'))" >> $GITHUB_ENV
         # Switch coverage scope
         python -c "print('COVERAGE_SCOPE=' + str('lightning' if '${{matrix.pkg-name}}' == 'lightning' else 'lightning_fabric'))" >> $GITHUB_ENV
+        # if you install mono-package set dependency only for this subpackage
+        python -c "print('EXTRA_PREFIX=' + str('' if '${{matrix.pkg-name}}' != 'lightning' else 'fabric-'))" >> $GITHUB_ENV
 
     - name: Install package & dependencies
       run: |
-        python -m pip install -q pip -U
-        extra=$(python -c "print({'lightning': 'fabric-'}.get('${{ matrix.pkg-name }}', ''))")
-        pip install -e ".[${extra}test,${extra}strategies]" "pytest-timeout" -U -f ${TORCH_URL} ${TORCH_PREINSTALL} -f ${PYPI_CACHE_DIR} --prefer-binary
+        #python -m pip install -q pip -U
+        pip install -e ".[${EXTRA_PREFIX}test,${EXTRA_PREFIX}strategies]" -U --prefer-binary \
+          "pytest-timeout" --find-links="${TORCH_URL}" --find-links="${PYPI_CACHE_DIR}"
         pip list
     - name: Dump handy wheels
       if: github.event_name == 'push' && github.ref == 'refs/heads/master'

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

@@ -51,10 +51,14 @@ jobs:
           - {os: "windows-2022", pkg-name: "lightning", python-version: "3.8", pytorch-version: "1.11"}
           - {os: "windows-2022", pkg-name: "lightning", python-version: "3.9", pytorch-version: "1.12"}
           - {os: "windows-2022", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13"}
-          # only run PyTorch latest with Python latest
+          # only run PyTorch latest with Python recent
           - {os: "macOS-11", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.0"}
           - {os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.0"}
           - {os: "windows-2022", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.0"}
+          # only run PyTorch latest with Python latest, use PyTorch scope to limit dependency issues
+          - {os: "macOS-12", pkg-name: "pytorch", python-version: "3.11", pytorch-version: "2.0"}
+          - {os: "ubuntu-22.04", pkg-name: "pytorch", python-version: "3.11", pytorch-version: "2.0"}
+          - {os: "windows-2022", pkg-name: "pytorch", python-version: "3.11", pytorch-version: "2.0"}
           # "oldest" versions tests, only on minimum Python
           - {os: "macOS-11", pkg-name: "lightning", python-version: "3.8", pytorch-version: "1.11", requires: "oldest"}
           - {os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.8", pytorch-version: "1.11", requires: "oldest"}
@@ -66,6 +70,7 @@ jobs:
     timeout-minutes: 50
     env:
       PACKAGE_NAME: ${{ matrix.pkg-name }}
+      TORCH_URL: "https://download.pytorch.org/whl/cpu/torch_stable.html"
       TORCH_URL_STABLE: "https://download.pytorch.org/whl/cpu/torch_stable.html"
       TORCH_URL_TEST: "https://download.pytorch.org/whl/test/cpu/torch_test.html"
       FREEZE_REQUIREMENTS: ${{ ! (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release/')) }}
@@ -86,7 +91,7 @@ jobs:
       run: python .actions/assistant.py replace_oldest_ver
 
     - name: Adjust PyTorch versions in requirements files
-      if: ${{ matrix.requires != 'oldest' && matrix.release != 'pre' }}
+      if: ${{ matrix.requires != 'oldest' }}
       run: |
         pip install -q wget packaging
         python -m wget https://raw.githubusercontent.com/Lightning-AI/utilities/main/scripts/adjust-torch-versions.py
@@ -107,18 +112,18 @@ jobs:
     - name: Env. variables
       run: |
         # Switch PyTorch URL
-        python -c "print('TORCH_URL=' + str('${{env.TORCH_URL_TEST}}' if '${{ matrix.release }}' == 'pre' else '${{env.TORCH_URL_STABLE}}'))" >> $GITHUB_ENV
-        python -c "print('TORCH_PREINSTALL=' + str('--pre' if '${{ matrix.release }}' == 'pre' else ''))" >> $GITHUB_ENV
+        #python -c "print('TORCH_URL=' + str('${{env.TORCH_URL_TEST}}' if '${{ matrix.release }}' == 'pre' else '${{env.TORCH_URL_STABLE}}'))" >> $GITHUB_ENV
         # Switch coverage scope
         python -c "print('COVERAGE_SCOPE=' + str('lightning' if '${{matrix.pkg-name}}' == 'lightning' else 'pytorch_lightning'))" >> $GITHUB_ENV
+        # if you install mono-package set dependency only for this subpackage
+        python -c "print('EXTRA_PREFIX=' + str('' if '${{matrix.pkg-name}}' != 'lightning' else 'pytorch-'))" >> $GITHUB_ENV
 
     - name: Install package & dependencies
       run: |
-        python -m pip install -q pip -U
-        extra=$(python -c "print({'lightning': 'pytorch-'}.get('${{ matrix.pkg-name }}', ''))")
-        pip install ".[${extra}extra,${extra}test,${extra}strategies]" -U \
+        #python -m pip install -q pip -U
+        pip install ".[${EXTRA_PREFIX}extra,${EXTRA_PREFIX}test,${EXTRA_PREFIX}strategies]" -U --prefer-binary \
           "pytest-timeout" -r requirements/_integrations/accelerators.txt \
-          -f ${TORCH_URL} ${TORCH_PREINSTALL} -f ${PYPI_CACHE_DIR} --prefer-binary
+          --find-links="${TORCH_URL}" --find-links="${PYPI_CACHE_DIR}"
         pip list
     - name: Drop LAI from extensions
       if: ${{ matrix.pkg-name != 'lightning' }}

requirements/pytorch/examples.txt

@@ -4,4 +4,4 @@ torchvision >=0.12.0, <=0.15.2
 gym[classic_control] >=0.17.0, <0.26.3
 ipython[all] <8.14.1
 torchmetrics >=0.10.0, <1.1.0
-lightning-utilities >=0.7.0, <0.10.0
+lightning-utilities >=0.8.0, <0.10.0

requirements/pytorch/test.txt

@@ -7,12 +7,11 @@ pytest-random-order ==1.1.0
 # needed in tests
 cloudpickle >=1.3, <2.3.0
 scikit-learn >0.22.1, <1.3.1
-onnx <1.15.0
-onnxruntime <1.16.0
+onnx >=0.14.0, <1.15.0
+onnxruntime >=0.15.0, <1.16.0
 psutil <5.9.6 # for `DeviceStatsMonitor`
 pandas >1.0, <2.0.4  # needed in benchmarks
 fastapi <0.100.0  # for `ServableModuleValidator`
 uvicorn <0.23.3  # for `ServableModuleValidator`
 
 tensorboard >=2.9.1, <2.15.0  # for `TensorBoardLogger`
-protobuf <=3.20.1 # strict  # an extra is updating protobuf, this pin prevents TensorBoard failure

src/lightning/__setup__.py

@@ -121,5 +121,6 @@ def _setup_args() -> Dict[str, Any]:
             "Programming Language :: Python :: 3.8",
             "Programming Language :: Python :: 3.9",
             "Programming Language :: Python :: 3.10",
+            "Programming Language :: Python :: 3.11",
         ],  # todo: consider aggregation/union of tags from particular packages
     }

src/lightning/pytorch/loops/evaluation_loop.py

@@ -157,7 +157,7 @@ def run(self) -> List[_OUT_DICT]:
     def setup_data(self) -> None:
         trainer = self.trainer
         trainer_fn = self._trainer_fn
-        if self._combined_loader is not None and trainer_fn == "fit" and not self._should_reload_val_dl:
+        if self._combined_loader is not None and trainer_fn == TrainerFn.FITTING and not self._should_reload_val_dl:
             return
 
         pl_module = trainer.lightning_module
@@ -168,7 +168,7 @@ def setup_data(self) -> None:
 
         # store epoch of dataloader reset for reload_dataloaders_every_n_epochs
         # it should not reload again if it has already reloaded during sanity_check
-        if trainer_fn == "fit" and (
+        if trainer_fn == TrainerFn.FITTING and (
             (trainer.sanity_checking and trainer.fit_loop.epoch_loop._should_check_val_epoch())
             or not trainer.sanity_checking
         ):
@@ -184,7 +184,7 @@ def setup_data(self) -> None:
         else:
             combined_loader = dataloaders
 
-        if trainer_fn == "fit" and trainer.overfit_batches > 0:
+        if trainer_fn == TrainerFn.FITTING and trainer.overfit_batches > 0:
             _resolve_overfit_batches(combined_loader, stage)
 
         dataloaders = []
@@ -296,7 +296,7 @@ def on_run_end(self) -> List[_OUT_DICT]:
         self._on_evaluation_model_train()
 
         if self.verbose and self.trainer.is_global_zero:
-            self._print_results(logged_outputs, self._stage)
+            self._print_results(logged_outputs, self._stage.value)
 
         return logged_outputs
 

src/lightning/pytorch/trainer/connectors/data_connector.py

@@ -404,14 +404,14 @@ def _check_dataloader_iterable(
         prefix = "train_" if trainer_fn == TrainerFn.FITTING else ""
         if not source.is_module():
             raise TypeError(
-                f"An invalid dataloader was passed to `Trainer.{trainer_fn}({prefix}dataloaders=...)`."
+                f"An invalid dataloader was passed to `Trainer.{trainer_fn.value}({prefix}dataloaders=...)`."
                 f" Found {dataloader}."
             )
         if not is_overridden(source.name, source.instance):
             raise TypeError(
-                f"An invalid dataloader was passed to `Trainer.{trainer_fn}({prefix}dataloaders=...)`."
+                f"An invalid dataloader was passed to `Trainer.{trainer_fn.value}({prefix}dataloaders=...)`."
                 f" Found {dataloader}."
-                f" Either pass the dataloader to the `.{trainer_fn}()` method OR implement"
+                f" Either pass the dataloader to the `.{trainer_fn.value}()` method OR implement"
                 f" `def {source.name}(self):` in your LightningModule/LightningDataModule."
             )
         raise TypeError(

src/lightning_app/__setup__.py

@@ -109,5 +109,6 @@ def _setup_args() -> Dict[str, Any]:
             "Programming Language :: Python :: 3.8",
             "Programming Language :: Python :: 3.9",
             "Programming Language :: Python :: 3.10",
+            "Programming Language :: Python :: 3.11",
         ],
     }

src/lightning_fabric/__setup__.py

@@ -103,5 +103,6 @@ def _setup_args() -> Dict[str, Any]:
             "Programming Language :: Python :: 3.8",
             "Programming Language :: Python :: 3.9",
             "Programming Language :: Python :: 3.10",
+            "Programming Language :: Python :: 3.11",
         ],
     }