| From 7fb0c86580d4a43bc733447b5138471f674bcdb7 Mon Sep 17 00:00:00 2001 |
| From: Shuo Yang <gshuoy@google.com> |
| Date: Thu, 11 Jan 2024 00:51:54 +0000 |
| Subject: [PATCH] Nvidia Plugin: change nvidia-smi path for COS |
| |
| --- |
| sos/report/plugins/nvidia.py | 17 +++++++++++------ |
| 1 file changed, 11 insertions(+), 6 deletions(-) |
| |
| diff --git a/sos/report/plugins/nvidia.py b/sos/report/plugins/nvidia.py |
| index 9e21b478..51e1e8b1 100644 |
| --- a/sos/report/plugins/nvidia.py |
| +++ b/sos/report/plugins/nvidia.py |
| @@ -9,14 +9,18 @@ |
| # See the LICENSE file in the source distribution for further information. |
| |
| |
| -from sos.report.plugins import Plugin, IndependentPlugin |
| +from sos.report.plugins import Plugin, IndependentPlugin, CosPlugin, PluginOpt |
| |
| |
| -class Nvidia(Plugin, IndependentPlugin): |
| +class Nvidia(Plugin, IndependentPlugin, CosPlugin): |
| |
| short_desc = 'Nvidia GPU information' |
| plugin_name = 'nvidia' |
| commands = ('nvidia-smi',) |
| + option_list = [ |
| + PluginOpt("nvidia-smi-path", default="/var/lib/nvidia/bin/nvidia-smi", |
| + desc="Defines the default nvidia-smi path.") |
| + ] |
| |
| def setup(self): |
| subcmds = [ |
| @@ -29,18 +33,19 @@ class Nvidia(Plugin, IndependentPlugin): |
| 'nvlink -s', |
| 'nvlink -e' |
| ] |
| + nvidia_smi_path = self.get_option('nvidia-smi-path', default="/var/lib/nvidia/bin/nvidia-smi") |
| + self._log_info("The nvidia-smi path is: " + str(nvidia_smi_path)) |
| |
| - self.add_cmd_output(["nvidia-smi %s" % cmd for cmd in subcmds]) |
| + self.add_cmd_output(["%s %s" % (nvidia_smi_path, cmd) for cmd in subcmds]) |
| |
| query = ('gpu_name,gpu_bus_id,vbios_version,temperature.gpu,' |
| 'utilization.gpu,memory.total,memory.free,memory.used,' |
| 'clocks.applications.graphics,clocks.applications.memory') |
| querypages = ('timestamp,gpu_bus_id,gpu_serial,gpu_uuid,' |
| 'retired_pages.address,retired_pages.cause') |
| - self.add_cmd_output("nvidia-smi --query-gpu=%s --format=csv" % query) |
| + self.add_cmd_output("%s --query-gpu=%s --format=csv" % (nvidia_smi_path, query)) |
| self.add_cmd_output( |
| - "nvidia-smi --query-retired-pages=%s --format=csv" % querypages |
| + "%s --query-retired-pages=%s --format=csv" % (nvidia_smi_path, querypages) |
| ) |
| - self.add_journal(boot=0, identifier='nvidia-persistenced') |
| |
| # vim: set et ts=4 sw=4 : |
| -- |
| 2.43.0.429.g432eaa2c6b-goog |
| |
