Skip to content

Commit e43820a

Browse files
tchatoncarmoccaBorda
authored
migrate Data subpackage (#19523)
* update * update * update * update * Update checkgroup.yml * More * Add note * Labeller should be kept as long as we have the stubs * update * update * update * Apply suggestions from code review * init * ci fix * pin version range * https://www.neptune.ai/ --------- Co-authored-by: Carlos Mocholí <[email protected]> Co-authored-by: Jirka Borovec <[email protected]> Co-authored-by: Jirka <[email protected]>
1 parent 2a827f3 commit e43820a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+63
-11363
lines changed

.actions/assistant.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,7 @@
4444
"requirements/fabric/base.txt",
4545
"requirements/fabric/strategies.txt",
4646
),
47-
"data": (
48-
"requirements/data/data.txt",
49-
"requirements/data/cloud.txt",
50-
"requirements/data/examples.txt",
51-
),
47+
"data": ("requirements/data/data.txt",),
5248
}
5349
REQUIREMENT_FILES_ALL = list(chain(*REQUIREMENT_FILES.values()))
5450

.github/CODEOWNERS

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,8 @@
4141
/src/lightning/pytorch/core/hooks.py @williamfalcon @tchaton @awaelchli @carmocca
4242
/src/lightning/pytorch/core/module.py @williamfalcon @tchaton @awaelchli @carmocca
4343

44-
# Data Utilities
45-
/examples/data/ @tchaton @nohalon @justusschock @lantiga
44+
# Lightning Data
4645
/src/lightning/data/ @tchaton
47-
/tests/tests_data @tchaton
4846

4947
# Lightning Fabric
5048
/src/lightning/fabric @awaelchli @carmocca @justusschock

.github/checkgroup.yml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -150,29 +150,6 @@ subprojects:
150150
- "build-pl (3.10, 2.0, 11.8.0)"
151151
- "build-pl (3.10, 2.1, 12.1.0)"
152152

153-
# SECTIONS: lightning_data
154-
155-
- id: "lightning_data: CPU workflow"
156-
paths:
157-
- ".actions/*"
158-
- "requirements/data/**"
159-
- "src/lightning/data/**"
160-
- "src/lightning_data/*"
161-
- "src/lightning/__init__.py"
162-
- "src/lightning/__setup__.py"
163-
- "src/lightning/__version__.py"
164-
- "tests/tests_data/**"
165-
- "examples/data/**"
166-
- "pyproject.toml" # includes pytest config
167-
- ".github/workflows/ci-tests-data.yml"
168-
- "!requirements/*/docs.txt"
169-
- "!*.md"
170-
- "!**/*.md"
171-
checks:
172-
- "data-cpu (macOS-11, lightning, 3.10, 2.1)"
173-
- "data-cpu (ubuntu-20.04, lightning, 3.10, 2.1)"
174-
- "data-cpu (windows-2022, lightning, 3.10, 2.1)"
175-
176153
# SECTION: lightning_fabric
177154

178155
- id: "lightning_fabric: CPU workflow"

.github/label-change.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ data:
1414
- changed-files:
1515
- any-glob-to-any-file:
1616
- "src/lightning/data/**"
17-
- "tests/tests_data/**"
1817
- "requirements/data/**"
1918

2019
store:

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ jobs:
7171
pkg-folder: dist/${{ env.PKG_DIR }}
7272
pkg-name: ${{ matrix.pkg-name }}
7373
pkg-extra: ${{ matrix.pkg-extra }}
74+
pip-flags: "--pre" # todo: drop this when `lidata` is released (not as RC only)
7475

7576
- name: Run CLI (via python)
7677
if: ${{ (matrix.pkg-name == 'lightning' || matrix.pkg-name == 'notset') && matrix.pkg-extra == 'app' }}
@@ -100,13 +101,19 @@ jobs:
100101
rm -f ./*/__*.py
101102
rm -f ./**/__*.py
102103
mv lightning lit # rename lightning folder to prevent accidental local imports
103-
- name: drop App doctest
104-
if: ${{ (matrix.pkg-name == 'lightning' || matrix.pkg-name == 'notset') && matrix.pkg-extra != 'app' }}
104+
- name: drop Secondary doctest
105+
if: ${{ matrix.pkg-name == 'lightning' || matrix.pkg-name == 'notset' }}
105106
working-directory: src/lit
106107
run: |
107-
rm -rf app
108-
rm -rf data
109-
rm -rf store
108+
items=("data" "store" "app")
109+
for item in "${items[@]}"; do
110+
if [[ "$item" == "${{ matrix.pkg-extra }}" ]]; then
111+
echo "Skipping $item"
112+
continue # Skip this iteration
113+
fi
114+
echo "Removing $item"
115+
rm -rf $item
116+
done
110117
- name: Install pytest doctest extension
111118
run: |
112119
pip install -q "pytest-doctestplus>=0.9.0"

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

Lines changed: 0 additions & 119 deletions
This file was deleted.

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@ our_model.tar
193193
test.png
194194
saved_models
195195
data/
196-
!src/lightning/data/
197196
!examples/data/
198197
!tests/tests_pytorch/utilities/data/
199198
!requirements/data/

.pre-commit-config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ repos:
102102
exclude: |
103103
(?x)^(
104104
src/lightning/app/CHANGELOG.md|
105-
src/lightning/data/CHANGELOG.md|
106105
src/lightning/fabric/CHANGELOG.md|
107106
src/lightning/pytorch/CHANGELOG.md|
108107
README.md

docs/source-pytorch/visualize/supported_exp_managers.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Here's the full documentation for the :class:`~lightning.pytorch.loggers.MLFlowL
6262

6363
Neptune.ai
6464
==========
65-
To use `Neptune.ai <https://neptune.ai/>`_ first install the neptune package:
65+
To use `Neptune.ai <https://www.neptune.ai/>`_ first install the neptune package:
6666

6767
.. code-block:: bash
6868

pyproject.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,6 @@ lint.ignore-init-module-imports = true
102102
"RET504", # todo:Unnecessary variable assignment before `return` statement
103103
"RET503",
104104
]
105-
"src/lightning/data/**" = [
106-
"S310", # todo: Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
107-
]
108105
"tests/**" = [
109106
"S101", # Use of `assert` detected
110107
"S105", "S106", # todo: Possible hardcoded password: ...

0 commit comments

Comments
 (0)