move pytorch_lightning >> lightning/pytorch

.azure/gpu-tests-pytorch.yml

@@ -26,7 +26,8 @@ pr:
       - "examples/pl_basics/backbone_image_classifier.py"
       - "examples/pl_basics/autoencoder.py"
       - "requirements/pytorch/**"
-      - "src/pytorch_lightning/**"
+      - "src/lightning/pytorch/**"
+      - "src/pytorch_lightning/*"
       - "tests/tests_pytorch/**"
       - "pyproject.toml"  # includes pytest config
       - "requirements/fabric/**"

.azure/hpu-tests.yml

@@ -23,7 +23,8 @@ pr:
       - "requirements/fabric/**"
       - "src/lightning_fabric/**"
       - "requirements/pytorch/**"
-      - "src/pytorch_lightning/**"
+      - "src/lightning/pytorch/**"
+      - "src/pytorch_lightning/*"
       - "tests/tests_pytorch/**"
       - "pyproject.toml"  # includes pytest config
     exclude:

.azure/ipu-tests.yml

@@ -20,7 +20,8 @@ pr:
       - "requirements/fabric/**"
       - "src/lightning_fabric/**"
       - "requirements/pytorch/**"
-      - "src/pytorch_lightning/**"
+      - "src/lightning/pytorch/**"
+      - "src/pytorch_lightning/*"
       - "tests/tests_pytorch/**"
       - "pyproject.toml"  # includes pytest config
     exclude:

.github/checkgroup.yml

@@ -10,7 +10,8 @@ subprojects:
       - "requirements/fabric/**"
       - "src/lightning_fabric/**"
       - "requirements/pytorch/**"
-      - "src/pytorch_lightning/**"
+      - "src/lightning/pytorch/**"
+      - "src/pytorch_lightning/*"
       - "tests/tests_pytorch/**"
       - "tests/legacy/**"
       - "pyproject.toml"  # includes pytest config
@@ -48,7 +49,8 @@ subprojects:
       - "examples/pl_basics/backbone_image_classifier.py"
       - "examples/pl_basics/autoencoder.py"
       - "requirements/pytorch/**"
-      - "src/pytorch_lightning/**"
+      - "src/lightning/pytorch/**"
+      - "src/pytorch_lightning/*"
       - "tests/tests_pytorch/**"
       - "pyproject.toml"  # includes pytest config
       - "requirements/fabric/**"
@@ -79,7 +81,8 @@ subprojects:
       - "requirements/fabric/**"
       - "src/lightning_fabric/**"
       - "requirements/pytorch/**"
-      - "src/pytorch_lightning/**"
+      - "src/lightning/pytorch/**"
+      - "src/pytorch_lightning/*"
       - "tests/tests_pytorch/**"
       - "pyproject.toml"  # includes pytest config
       - "!requirements/*/docs.txt"
@@ -95,7 +98,8 @@ subprojects:
       - "requirements/fabric/**"
       - "src/lightning_fabric/**"
       - "requirements/pytorch/**"
-      - "src/pytorch_lightning/**"
+      - "src/lightning/pytorch/**"
+      - "src/pytorch_lightning/*"
       - "tests/tests_pytorch/**"
       - "pyproject.toml"  # includes pytest config
       - "!requirements/docs.txt"
@@ -126,7 +130,8 @@ subprojects:
 
   - id: "pytorch_lightning: Docs"
     paths:
-      - "src/pytorch_lightning/**"
+      - "src/lightning/pytorch/**"
+      - "src/pytorch_lightning/*"
       - "docs/source-pytorch/**"
       - ".actions/**"
       - ".github/workflows/docs-checks.yml"

.github/labeler.yml

@@ -9,7 +9,8 @@ app:
   - 'requirements/app/**'
 
 pl:
-  - 'src/pytorch_lightning/**'
+  - "src/lightning/pytorch/**"
+  - "src/pytorch_lightning/*"
   - 'tests/tests_pytorch/**'
   - 'tests/legacy/**'
   - 'examples/pl_*/**'

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

@@ -10,7 +10,8 @@ on:
     paths:
       - ".actions/**"
       - "requirements/pytorch/**"
-      - "src/pytorch_lightning/**"
+      - "src/lightning/pytorch/**"
+      - "src/pytorch_lightning/*"
       - "tests/tests_pytorch/**"
       - "tests/legacy/**"
       - "pyproject.toml"  # includes pytest config

.github/workflows/tpu-tests.yml

@@ -14,7 +14,8 @@ on:
       - "src/lightning_fabric/**"
       - "tests/tests_fabric/**"
       - "requirements/pytorch/**"
-      - "src/pytorch_lightning/**"
+      - "src/lightning/pytorch/**"
+      - "src/pytorch_lightning/*"
       - "tests/tests_pytorch/**"
       - "pyproject.toml"  # includes pytest config
       - "!requirements/*/docs.txt"

.gitignore

@@ -54,7 +54,10 @@ src/lightning_app/
 !src/lightning_app/MANIFEST.in
 !src/lightning_app/README.md
 src/lightning/fabric/
-src/lightning/pytorch/
+src/pytorch_lightning/
+!src/pytorch_lightning/__*__.py
+!src/pytorch_lightning/MANIFEST.in
+!src/pytorch_lightning/README.md
 
 # PyInstaller
 #  Usually these files are written by a python script from a template

setup.py

@@ -58,7 +58,7 @@
     "fabric": "lightning_fabric",
 }
 # TODO: drop this reverse list when all packages are moved
-_MIRROR_PACKAGE_REVERSED = ("app",)
+_MIRROR_PACKAGE_REVERSED = ("app", "pytorch")
 # https://packaging.python.org/guides/single-sourcing-package-version/
 # http://blog.ionelmc.ro/2014/05/25/python-packaging/
 _PATH_ROOT = os.path.dirname(__file__)
@@ -143,9 +143,8 @@ def _set_manifest_path(manifest_dir: str, aggregate: bool = False, mapping: Mapp
         if package_to_install == "lightning":
             # merge all requirements files
             assistant._load_aggregate_requirements(_PATH_REQUIRE, _FREEZE_REQUIREMENTS)
-        if package_to_install == "lightning" or _PACKAGE_NAME in _MIRROR_PACKAGE_REVERSED:  # install everything
-            # replace imports and copy the code
-            assistant.create_mirror_package(_PATH_SRC, _PACKAGE_MAPPING, reverse=_MIRROR_PACKAGE_REVERSED)
+        # replace imports and copy the code
+        assistant.create_mirror_package(_PATH_SRC, _PACKAGE_MAPPING, reverse=_MIRROR_PACKAGE_REVERSED)
     else:
         assert len(local_pkgs) > 0
         # PL as a package is distributed together with Fabric, so in such case there are more than one candidate