Skip to content

GitLab

Unverified Commit 5c78b9d7 authored by Taylor Robie's avatar Taylor Robie Committed by GitHub
Browse files

catch cpuinfo ImportError (#4138) 

* catch cpuinfo ImportError

* add psutil import catch

* fix typo
parent 369d1981
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 13 deletions
official/utils/logs/logger.py
View file @ 5c78b9d7
...@@ -213,6 +213,7 @@ def _collect_cpu_info(run_info): ...@@ -213,6 +213,7 @@ def _collect_cpu_info(run_info):
cpu_info["num_cores"] = multiprocessing.cpu_count() cpu_info["num_cores"] = multiprocessing.cpu_count()
try:
# Note: cpuinfo is not installed in the TensorFlow OSS tree. # Note: cpuinfo is not installed in the TensorFlow OSS tree.
# It is installable via pip. # It is installable via pip.
import cpuinfo # pylint: disable=g-import-not-at-top import cpuinfo # pylint: disable=g-import-not-at-top
...@@ -222,6 +223,8 @@ def _collect_cpu_info(run_info): ...@@ -222,6 +223,8 @@ def _collect_cpu_info(run_info):
cpu_info["mhz_per_cpu"] = info["hz_advertised_raw"][0] / 1.0e6 cpu_info["mhz_per_cpu"] = info["hz_advertised_raw"][0] / 1.0e6
run_info["machine_config"]["cpu_info"] = cpu_info run_info["machine_config"]["cpu_info"] = cpu_info
except ImportError:
tf.logging.warn("'cpuinfo' not imported. CPU info will not be logged.")
def _collect_gpu_info(run_info): def _collect_gpu_info(run_info):
...@@ -243,12 +246,15 @@ def _collect_gpu_info(run_info): ...@@ -243,12 +246,15 @@ def _collect_gpu_info(run_info):
def _collect_memory_info(run_info): def _collect_memory_info(run_info):
try:
# Note: psutil is not installed in the TensorFlow OSS tree. # Note: psutil is not installed in the TensorFlow OSS tree.
# It is installable via pip. # It is installable via pip.
import psutil # pylint: disable=g-import-not-at-top import psutil # pylint: disable=g-import-not-at-top
vmem = psutil.virtual_memory() vmem = psutil.virtual_memory()
run_info["machine_config"]["memory_total"] = vmem.total run_info["machine_config"]["memory_total"] = vmem.total
run_info["machine_config"]["memory_available"] = vmem.available run_info["machine_config"]["memory_available"] = vmem.available
except ImportError:
tf.logging.warn("'psutil' not imported. Memory info will not be logged.")
def _parse_gpu_model(physical_device_desc): def _parse_gpu_model(physical_device_desc):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment