Skip to content

Update the importing logic for cpuinfo and psutil. #3781

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

Merged
merged 2 commits into from
Mar 27, 2018
Merged

Update the importing logic for cpuinfo and psutil. #3781

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5078aa4
Update the importing logic for cpuinfo and psutil.
qlzh727 Mar 27, 2018
9d2d969
Add pylint warning suppression.
qlzh727 Mar 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions official/utils/logging/logger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,6 @@
import numbers
import os

# pylint: disable=g-bad-import-order
# Note: cpuinfo and psutil are not installed in the TensorFlow OSS tree.
# They are installable via pip.
import cpuinfo
import psutil
# pylint: enable=g-bad-import-order

import tensorflow as tf
from tensorflow.python.client import device_lib

Expand Down Expand Up @@ -149,6 +142,10 @@ def _collect_cpu_info(run_info):

cpu_info["num_cores"] = multiprocessing.cpu_count()

# Note: cpuinfo is not installed in the TensorFlow OSS tree.
# It is installable via pip.
import cpuinfo # pylint: disable=g-import-not-at-top

info = cpuinfo.get_cpu_info()
cpu_info["cpu_info"] = info["brand"]
cpu_info["mhz_per_cpu"] = info["hz_advertised_raw"][0] / 1.0e6
Expand All @@ -175,6 +172,9 @@ def _collect_gpu_info(run_info):


def _collect_memory_info(run_info):
# Note: psutil is not installed in the TensorFlow OSS tree.
# It is installable via pip.
import psutil # pylint: disable=g-import-not-at-top
vmem = psutil.virtual_memory()
run_info["memory_total"] = vmem.total
run_info["memory_available"] = vmem.available
Expand Down