Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

migrate Data subpackage #19523

Merged
merged 19 commits into from
Feb 26, 2024
Merged
6 changes: 1 addition & 5 deletions .actions/assistant.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,7 @@
"requirements/fabric/base.txt",
"requirements/fabric/strategies.txt",
),
"data": (
"requirements/data/data.txt",
"requirements/data/cloud.txt",
"requirements/data/examples.txt",
),
"data": ("requirements/data/data.txt",),
}
REQUIREMENT_FILES_ALL = list(chain(*REQUIREMENT_FILES.values()))

Expand Down
4 changes: 1 addition & 3 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,8 @@
/src/lightning/pytorch/core/hooks.py @williamfalcon @tchaton @awaelchli @carmocca
/src/lightning/pytorch/core/module.py @williamfalcon @tchaton @awaelchli @carmocca

# Data Utilities
/examples/data/ @tchaton @nohalon @justusschock @lantiga
# Lightning Data
/src/lightning/data/ @tchaton
/tests/tests_data @tchaton

# Lightning Fabric
/src/lightning/fabric @awaelchli @carmocca @justusschock
Expand Down
23 changes: 0 additions & 23 deletions .github/checkgroup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,29 +150,6 @@ subprojects:
- "build-pl (3.10, 2.0, 11.8.0)"
- "build-pl (3.10, 2.1, 12.1.0)"

# SECTIONS: lightning_data

- id: "lightning_data: CPU workflow"
paths:
- ".actions/*"
- "requirements/data/**"
- "src/lightning/data/**"
- "src/lightning_data/*"
- "src/lightning/__init__.py"
- "src/lightning/__setup__.py"
- "src/lightning/__version__.py"
- "tests/tests_data/**"
- "examples/data/**"
- "pyproject.toml" # includes pytest config
- ".github/workflows/ci-tests-data.yml"
- "!requirements/*/docs.txt"
- "!*.md"
- "!**/*.md"
checks:
- "data-cpu (macOS-11, lightning, 3.10, 2.1)"
- "data-cpu (ubuntu-20.04, lightning, 3.10, 2.1)"
- "data-cpu (windows-2022, lightning, 3.10, 2.1)"

# SECTION: lightning_fabric

- id: "lightning_fabric: CPU workflow"
Expand Down
1 change: 0 additions & 1 deletion .github/label-change.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ data:
- changed-files:
- any-glob-to-any-file:
- "src/lightning/data/**"
- "tests/tests_data/**"
- "requirements/data/**"

store:
Expand Down
119 changes: 0 additions & 119 deletions .github/workflows/ci-tests-data.yml
tchaton marked this conversation as resolved.
Show resolved Hide resolved

This file was deleted.

1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,6 @@ our_model.tar
test.png
saved_models
data/
!src/lightning/data/
!examples/data/
!tests/tests_pytorch/utilities/data/
!requirements/data/
Expand Down
1 change: 0 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ repos:
exclude: |
(?x)^(
src/lightning/app/CHANGELOG.md|
src/lightning/data/CHANGELOG.md|
src/lightning/fabric/CHANGELOG.md|
src/lightning/pytorch/CHANGELOG.md|
README.md
Expand Down
3 changes: 0 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,6 @@ lint.ignore-init-module-imports = true
"RET504", # todo:Unnecessary variable assignment before `return` statement
"RET503",
]
"src/lightning/data/**" = [
"S310", # todo: Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
]
"tests/**" = [
"S101", # Use of `assert` detected
"S105", "S106", # todo: Possible hardcoded password: ...
Expand Down
5 changes: 0 additions & 5 deletions requirements/data/cloud.txt

This file was deleted.

9 changes: 2 additions & 7 deletions requirements/data/data.txt
tchaton marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
# NOTE: the upper bound for the package version is only set for CI stability, and it is dropped while installing this package
# in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment
# NOTE: this is here only to expose `pip install lightning[data]`. we don't install or test it in this project's CI

lightning-utilities >=0.8.0, <0.10.0
# to be able to include also PL 2.0 and preserve `>` needed for CI min version bypass
torch >0.14.0, <=2.2.0
lightning-cloud
filelock
litdata >= 0.2.0rc
3 changes: 0 additions & 3 deletions requirements/data/examples.txt

This file was deleted.

9 changes: 0 additions & 9 deletions requirements/data/test.txt

This file was deleted.

1 change: 0 additions & 1 deletion src/lightning/MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@
include src/lightning/version.info
include src/lightning/py.typed
include requirements/base.txt
recursive-include requirements/data *.txt
2 changes: 0 additions & 2 deletions src/lightning/__setup__.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ def _prepare_extras() -> Dict[str, Any]:
extras["app-extra"] = extras["app-app"] + extras["app-cloud"] + extras["app-ui"] + extras["app-components"]
extras["app-all"] = extras["app-extra"]
extras["app-dev"] = extras["app-all"] + extras["app-test"]
extras["data-all"] = extras["data-data"] + extras["data-cloud"] + extras["data-examples"]
extras["data-dev"] = extras["data-all"] + extras["data-test"]
extras["store-store"] = extras["app-app"] # todo: consider cutting/leaning this dependency

# merge per-project extras of the same category, e.g. `app-test` + `fabric-test`
Expand Down
Loading
Loading