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

[App] Enable to register data connections #16670

Merged
merged 27 commits into from
Feb 8, 2023
Merged

[App] Enable to register data connections #16670

merged 27 commits into from
Feb 8, 2023

Conversation

tchaton
Copy link
Contributor

@tchaton tchaton commented Feb 7, 2023

What does this PR do?

This PR refactors connect to add sub ressources:

lightning connect data

lightning connect app

lightning connect X

NB: Need to merge some platforms stuffs for the tests to pass.

Fixes #<issue_number>

Before submitting
  • Was this discussed/agreed via a GitHub issue? (not for typos and docs)
  • Did you read the contributor guideline, Pull Request section?
  • Did you make sure your PR does only one thing, instead of bundling different changes together?
  • Did you make sure to update the documentation with your changes? (if necessary)
  • Did you write any new necessary tests? (not for typos and docs)
  • Did you verify new and existing tests pass locally with your changes?
  • Did you list all the breaking changes introduced by this pull request?
  • Did you update the CHANGELOG? (not for typos, docs, test updates, or minor internal changes/refactors)

PR review

Anyone in the community is welcome to review the PR.
Before you start reviewing, make sure you have read the review guidelines. In short, see the following bullet-list:

Reviewer checklist
  • Is this pull request ready for review? (if not, please submit in draft mode)
  • Check that all items from Before submitting are resolved
  • Make sure the title is self-explanatory and the description concisely explains the PR
  • Add labels and milestones (and optionally projects) to the PR so it can be classified

cc @Borda

@github-actions github-actions bot added the app (removed) Generic label for Lightning App package label Feb 7, 2023
@tchaton tchaton marked this pull request as ready for review February 7, 2023 14:20
@github-actions
Copy link
Contributor

github-actions bot commented Feb 7, 2023

⚡ Required checks status: All passing 🟢

Groups summary

🟢 pytorch_lightning: Tests workflow
Check ID Status
pl-cpu (macOS-11, lightning, 3.8, 1.11) success
pl-cpu (macOS-11, lightning, 3.9, 1.12) success
pl-cpu (macOS-11, lightning, 3.10, 1.13) success
pl-cpu (macOS-11, lightning, 3.8, 1.11, oldest) success
pl-cpu (ubuntu-20.04, lightning, 3.9, 1.11) success
pl-cpu (ubuntu-20.04, lightning, 3.10, 1.12) success
pl-cpu (ubuntu-20.04, lightning, 3.10, 1.13) success
pl-cpu (ubuntu-20.04, lightning, 3.8, 1.11, oldest) success
pl-cpu (windows-2022, lightning, 3.9, 1.11) success
pl-cpu (windows-2022, lightning, 3.10, 1.12) success
pl-cpu (windows-2022, lightning, 3.10, 1.13) success
pl-cpu (windows-2022, lightning, 3.8, 1.11, oldest) success
pl-cpu (slow, macOS-11, lightning, 3.8, 1.11) success
pl-cpu (slow, ubuntu-20.04, lightning, 3.8, 1.11) success
pl-cpu (slow, windows-2022, lightning, 3.8, 1.11) success
pl-cpu (macOS-11, pytorch, 3.8, 1.13) success
pl-cpu (ubuntu-20.04, pytorch, 3.8, 1.13) success
pl-cpu (windows-2022, pytorch, 3.8, 1.13) success

These checks are required after the changes to pyproject.toml.

🟢 pytorch_lightning: Azure GPU
Check ID Status
pytorch-lightning (GPUs) success

These checks are required after the changes to pyproject.toml.

🟢 pytorch_lightning: Azure HPU
Check ID Status
pytorch-lightning (HPUs) success

These checks are required after the changes to pyproject.toml.

🟢 pytorch_lightning: Azure IPU
Check ID Status
pytorch-lightning (IPUs) success

These checks are required after the changes to pyproject.toml.

🟢 pytorch_lightning: Docs
Check ID Status
make-doctest (pytorch) success
make-html (pytorch) success

These checks are required after the changes to pyproject.toml.

🟢 lightning_fabric: CPU workflow
Check ID Status
fabric-cpu (macOS-11, lightning, 3.8, 1.11) success
fabric-cpu (macOS-11, lightning, 3.9, 1.12) success
fabric-cpu (macOS-11, lightning, 3.10, 1.13) success
fabric-cpu (macOS-11, lightning, 3.8, 1.11, oldest) success
fabric-cpu (ubuntu-20.04, lightning, 3.9, 1.11) success
fabric-cpu (ubuntu-20.04, lightning, 3.10, 1.12) success
fabric-cpu (ubuntu-20.04, lightning, 3.10, 1.13) success
fabric-cpu (ubuntu-20.04, lightning, 3.8, 1.11, oldest) success
fabric-cpu (windows-2022, lightning, 3.9, 1.11) success
fabric-cpu (windows-2022, lightning, 3.10, 1.12) success
fabric-cpu (windows-2022, lightning, 3.10, 1.13) success
fabric-cpu (windows-2022, lightning, 3.8, 1.11, oldest) success
fabric-cpu (macOS-11, fabric, 3.8, 1.13) success
fabric-cpu (ubuntu-20.04, fabric, 3.8, 1.13) success
fabric-cpu (windows-2022, fabric, 3.8, 1.13) success

These checks are required after the changes to pyproject.toml.

🟢 lightning_fabric: Azure GPU
Check ID Status
lightning-fabric (GPUs) success

These checks are required after the changes to pyproject.toml.

🟢 lightning_app: Tests workflow
Check ID Status
app-pytest (macOS-11, lightning, 3.8, latest) success
app-pytest (macOS-11, lightning, 3.8, oldest) success
app-pytest (macOS-11, app, 3.9, latest) success
app-pytest (ubuntu-20.04, lightning, 3.8, latest) success
app-pytest (ubuntu-20.04, lightning, 3.8, oldest) success
app-pytest (ubuntu-20.04, app, 3.9, latest) success
app-pytest (windows-2022, lightning, 3.8, latest) success
app-pytest (windows-2022, lightning, 3.8, oldest) success
app-pytest (windows-2022, app, 3.8, latest) success

These checks are required after the changes to src/lightning/app/cli/commands/app_commands.py, src/lightning/app/cli/commands/cd.py, src/lightning/app/cli/commands/ls.py, src/lightning/app/cli/connect/__init__.py, src/lightning/app/cli/connect/app.py, src/lightning/app/cli/connect/data.py, src/lightning/app/cli/lightning_cli.py, tests/tests_app/cli/test_connect.py, tests/tests_app/cli/test_connect_data.py, tests/tests_app/utilities/test_commands.py, requirements/app/base.txt.

🟢 lightning_app: Examples
Check ID Status
app-examples (macOS-11, lightning, 3.9, latest) success
app-examples (macOS-11, lightning, 3.9, oldest) success
app-examples (macOS-11, app, 3.9, latest) success
app-examples (ubuntu-20.04, lightning, 3.9, latest) success
app-examples (ubuntu-20.04, lightning, 3.9, oldest) success
app-examples (ubuntu-20.04, app, 3.9, latest) success
app-examples (windows-2022, lightning, 3.9, latest) success
app-examples (windows-2022, lightning, 3.9, oldest) success
app-examples (windows-2022, app, 3.9, latest) success

These checks are required after the changes to src/lightning/app/cli/commands/app_commands.py, src/lightning/app/cli/commands/cd.py, src/lightning/app/cli/commands/ls.py, src/lightning/app/cli/connect/__init__.py, src/lightning/app/cli/connect/app.py, src/lightning/app/cli/connect/data.py, src/lightning/app/cli/lightning_cli.py, tests/integrations_app/public/test_commands_and_api.py, requirements/app/base.txt.

🟢 lightning_app: Azure
Check ID Status
App.cloud-e2e success

These checks are required after the changes to src/lightning/app/cli/commands/app_commands.py, src/lightning/app/cli/commands/cd.py, src/lightning/app/cli/commands/ls.py, src/lightning/app/cli/connect/__init__.py, src/lightning/app/cli/connect/app.py, src/lightning/app/cli/connect/data.py, src/lightning/app/cli/lightning_cli.py, requirements/app/base.txt, tests/integrations_app/public/test_commands_and_api.py.

🟢 lightning_app: Docs
Check ID Status
make-doctest (app) success
make-html (app) success

These checks are required after the changes to src/lightning/app/cli/commands/app_commands.py, src/lightning/app/cli/commands/cd.py, src/lightning/app/cli/commands/ls.py, src/lightning/app/cli/connect/__init__.py, src/lightning/app/cli/connect/app.py, src/lightning/app/cli/connect/data.py, src/lightning/app/cli/lightning_cli.py, requirements/app/base.txt, pyproject.toml.

🟢 mypy
Check ID Status
mypy success

These checks are required after the changes to requirements/app/base.txt, src/lightning/app/cli/commands/app_commands.py, src/lightning/app/cli/commands/cd.py, src/lightning/app/cli/commands/ls.py, src/lightning/app/cli/connect/__init__.py, src/lightning/app/cli/connect/app.py, src/lightning/app/cli/connect/data.py, src/lightning/app/cli/lightning_cli.py, pyproject.toml.

🟢 install
Check ID Status
install-pkg (ubuntu-22.04, app, 3.8) success
install-pkg (ubuntu-22.04, app, 3.10) success
install-pkg (ubuntu-22.04, fabric, 3.8) success
install-pkg (ubuntu-22.04, fabric, 3.10) success
install-pkg (ubuntu-22.04, pytorch, 3.8) success
install-pkg (ubuntu-22.04, pytorch, 3.10) success
install-pkg (ubuntu-22.04, lightning, 3.8) success
install-pkg (ubuntu-22.04, lightning, 3.10) success
install-pkg (ubuntu-22.04, notset, 3.8) success
install-pkg (ubuntu-22.04, notset, 3.10) success
install-pkg (macOS-12, app, 3.8) success
install-pkg (macOS-12, app, 3.10) success
install-pkg (macOS-12, fabric, 3.8) success
install-pkg (macOS-12, fabric, 3.10) success
install-pkg (macOS-12, pytorch, 3.8) success
install-pkg (macOS-12, pytorch, 3.10) success
install-pkg (macOS-12, lightning, 3.8) success
install-pkg (macOS-12, lightning, 3.10) success
install-pkg (macOS-12, notset, 3.8) success
install-pkg (macOS-12, notset, 3.10) success
install-pkg (windows-2022, app, 3.8) success
install-pkg (windows-2022, app, 3.10) success
install-pkg (windows-2022, fabric, 3.8) success
install-pkg (windows-2022, fabric, 3.10) success
install-pkg (windows-2022, pytorch, 3.8) success
install-pkg (windows-2022, pytorch, 3.10) success
install-pkg (windows-2022, lightning, 3.8) success
install-pkg (windows-2022, lightning, 3.10) success
install-pkg (windows-2022, notset, 3.8) success
install-pkg (windows-2022, notset, 3.10) success

These checks are required after the changes to src/lightning/app/cli/commands/app_commands.py, src/lightning/app/cli/commands/cd.py, src/lightning/app/cli/commands/ls.py, src/lightning/app/cli/connect/__init__.py, src/lightning/app/cli/connect/app.py, src/lightning/app/cli/connect/data.py, src/lightning/app/cli/lightning_cli.py, requirements/app/base.txt.

🟢 link-check
Check ID Status
markdown-link-check success

These checks are required after the changes to src/lightning/app/CHANGELOG.md.


Thank you for your contribution! 💜

Note
This comment is automatically generated and updates for 60 minutes every 180 seconds. If you have any other questions, contact carmocca for help.

@tchaton tchaton requested a review from Borda as a code owner February 7, 2023 16:43
@tchaton tchaton enabled auto-merge (squash) February 7, 2023 18:39
Copy link
Member

@ethanwharris ethanwharris left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It feels a bit weird to me that lightning connect data and lightning connect app both exist in the same group as they are about two different kinds of connection. So lightning connect app doesn't feel right, it would be more like lightning connect to app - maybe lightning connect should be renamed entirely to lightning attach or something?

src/lightning/app/cli/connect/data.py Outdated Show resolved Hide resolved
src/lightning/app/cli/connect/data.py Outdated Show resolved Hide resolved
src/lightning/app/cli/lightning_cli.py Outdated Show resolved Hide resolved
src/lightning/app/cli/lightning_cli.py Outdated Show resolved Hide resolved
@mergify mergify bot added the ready PRs ready to be merged label Feb 7, 2023
@codecov
Copy link

codecov bot commented Feb 7, 2023

Codecov Report

Merging #16670 (4d833fc) into master (74ee699) will decrease coverage by 0%.
The diff coverage is 90%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master   #16670   +/-   ##
=======================================
- Coverage      81%      81%   -0%     
=======================================
  Files         445      436    -9     
  Lines       32500    32423   -77     
=======================================
- Hits        26431    26352   -79     
- Misses       6069     6071    +2     

@mergify mergify bot added has conflicts and removed ready PRs ready to be merged labels Feb 7, 2023
@tchaton
Copy link
Contributor Author

tchaton commented Feb 8, 2023

It feels a bit weird to me that lightning connect data and lightning connect app both exist in the same group as they are about two different kinds of connection. So lightning connect app doesn't feel right, it would be more like lightning connect to app - maybe lightning connect should be renamed entirely to lightning attach or something?

I agree. Let's re-align the CLI experience soon before Trainer 2.0. So we can improve on the wordings and consistency.

@mergify mergify bot added ready PRs ready to be merged and removed has conflicts ready PRs ready to be merged labels Feb 8, 2023
Copy link
Contributor

@awaelchli awaelchli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with @ethanwharris

tests/tests_app/cli/test_connect_data.py Show resolved Hide resolved
src/lightning/app/cli/connect/data.py Show resolved Hide resolved
@tchaton tchaton merged commit 88e089e into master Feb 8, 2023
@tchaton tchaton deleted the mount branch February 8, 2023 18:41
Borda pushed a commit that referenced this pull request Feb 10, 2023
Co-authored-by: thomas <[email protected]>

(cherry picked from commit 88e089e)
Borda pushed a commit that referenced this pull request Feb 10, 2023
Co-authored-by: thomas <[email protected]>

(cherry picked from commit 88e089e)
Borda pushed a commit that referenced this pull request Feb 10, 2023
Co-authored-by: thomas <[email protected]>

(cherry picked from commit 88e089e)
@awaelchli awaelchli added this to the v1.9.x milestone Feb 10, 2023
lantiga pushed a commit that referenced this pull request Feb 10, 2023
Co-authored-by: thomas <[email protected]>

(cherry picked from commit 88e089e)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
app (removed) Generic label for Lightning App package ready PRs ready to be merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants