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.

Sign up for GitHub

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

Jump to bottom

Track CPU stats with DeviceStatsMonitor #11795

Merged
merged 62 commits into from
May 10, 2022
Merged

Track CPU stats with DeviceStatsMonitor #11795

merged 62 commits into from
May 10, 2022

Conversation

EricWiener
Copy link
Contributor

@EricWiener EricWiener commented Feb 7, 2022 •
edited by kaushikb11
Loading

What does this PR do?

Adds CPU monitor tracking to CPUAccelerator + adds cpu_stats argument to DeviceStatsMonitor to add CPU stats tracking if another accelerator is being used.

Fixes #11253

        cpu_stats: if ``None``, it will log CPU stats only if the accelerator is CPU.
            It will raise a warning if `psutil` is not installed till version 1.9.0.
            if ``True``, it will log CPU stats regardless of the accelerator, and it will
            raise an exception if `psutil` is not installed.
            if ``False``, it will not log CPU stats regardless of the accelerator.

Does your PR introduce any breaking changes? If yes, please list them.

N

Before submitting

  • Was this discussed/approved 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 internal minor changes/refactorings)

PR review

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

  • 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

Did you have fun?

Always 🎉

ananthsub
ananthsub reviewed Feb 7, 2022
View reviewed changes
pytorch_lightning/accelerators/cpu.py Outdated Show resolved Hide resolved
pytorch_lightning/accelerators/cpu.py Outdated Show resolved Hide resolved
@ananthsub ananthsub added this to the 1.6 milestone Feb 7, 2022
@EricWiener EricWiener mentioned this pull request Feb 7, 2022
Open
tchaton
tchaton approved these changes Feb 9, 2022
View reviewed changes
Copy link
Contributor

@tchaton tchaton left a comment

Choose a reason for hiding this comment

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

LGTM once comments are addressed. Good work!

pytorch_lightning/accelerators/cpu.py Outdated Show resolved Hide resolved
pytorch_lightning/callbacks/device_stats_monitor.py Outdated Show resolved Hide resolved
pytorch_lightning/callbacks/device_stats_monitor.py Outdated Show resolved Hide resolved
tests/callbacks/test_device_stats_monitor.py Outdated Show resolved Hide resolved
@EricWiener EricWiener force-pushed the feature/auto-track-cpu-stats branch 4 times, most recently from 324d8a5 to 231a358 Compare February 9, 2022 14:35
@mergify mergify bot added the has conflicts label Feb 9, 2022
tchaton
tchaton approved these changes Feb 14, 2022
View reviewed changes
Copy link
Contributor

@tchaton tchaton left a comment •
edited
Loading

Choose a reason for hiding this comment

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

LGTM ! Great work !

pytorch_lightning/accelerators/cpu.py Outdated Show resolved Hide resolved
@EricWiener EricWiener force-pushed the feature/auto-track-cpu-stats branch from 231a358 to e4a0a72 Compare February 14, 2022 17:08
@mergify mergify bot removed the has conflicts label Feb 14, 2022
@EricWiener
Copy link
Contributor Author

@ananthsub @daniellepintz could I please ask you for further feedback/approval. Thanks!

@EricWiener EricWiener force-pushed the feature/auto-track-cpu-stats branch from f821cb1 to 7f87cd3 Compare February 18, 2022 18:14
ananthsub
ananthsub reviewed Feb 18, 2022
View reviewed changes
pytorch_lightning/accelerators/cpu.py Outdated Show resolved Hide resolved
pytorch_lightning/accelerators/cpu.py Outdated Show resolved Hide resolved
tests/callbacks/test_device_stats_monitor.py Outdated Show resolved Hide resolved
tests/callbacks/test_device_stats_monitor.py Outdated Show resolved Hide resolved
ananthsub
ananthsub approved these changes Feb 18, 2022
View reviewed changes
pytorch_lightning/accelerators/cpu.py Outdated Show resolved Hide resolved
pytorch_lightning/accelerators/cpu.py Outdated Show resolved Hide resolved
tests/callbacks/test_device_stats_monitor.py Outdated Show resolved Hide resolved
tests/callbacks/test_device_stats_monitor.py Outdated Show resolved Hide resolved
@mergify mergify bot added the ready PRs ready to be merged label Feb 18, 2022
@mergify mergify bot removed the ready PRs ready to be merged label May 5, 2022
@mergify mergify bot added ready PRs ready to be merged and removed has conflicts ready PRs ready to be merged labels May 5, 2022
@kaushikb11
Copy link
Contributor

kaushikb11 commented May 6, 2022 •
edited
Loading

TPU tests are acting weird. Trying to resolve it @carmocca

@mergify mergify bot added has conflicts and removed ready PRs ready to be merged labels May 6, 2022
@mergify mergify bot added ready PRs ready to be merged and removed has conflicts ready PRs ready to be merged labels May 9, 2022
@mergify mergify bot added has conflicts and removed ready PRs ready to be merged labels May 9, 2022
@mergify mergify bot added ready PRs ready to be merged and removed has conflicts ready PRs ready to be merged labels May 9, 2022
@kaushikb11
Copy link
Contributor

do

@kaushikb11 kaushikb11 merged commit 3f78c4c into Lightning-AI:master May 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kaushikb11 kaushikb11 kaushikb11 approved these changes

@daniellepintz daniellepintz daniellepintz left review comments

@rohitgr7 rohitgr7 rohitgr7 approved these changes

@Borda Borda Borda left review comments

@krshrimali krshrimali krshrimali approved these changes

@tchaton tchaton tchaton approved these changes

@carmocca carmocca carmocca approved these changes

@awaelchli awaelchli awaelchli approved these changes

@ananthsub ananthsub ananthsub approved these changes

@justusschock justusschock Awaiting requested review from justusschock justusschock is a code owner

@SeanNaren SeanNaren Awaiting requested review from SeanNaren

@williamFalcon williamFalcon Awaiting requested review from williamFalcon

@edenlightning edenlightning Awaiting requested review from edenlightning

Assignees

@kaushikb11 kaushikb11

Labels
accelerator: cpu Central Processing Unit callback: device stats community This PR is from the community ready PRs ready to be merged
Projects
No open projects
Frameworks Planning
Status: Done
Milestone
pl:1.7
Development

Successfully merging this pull request may close these issues.

CPU System Metrics collection
10 participants
@EricWiener @carmocca @kaushikb11 @ananthsub @awaelchli @Borda @tchaton @krshrimali @rohitgr7 @daniellepintz