jlay/amdgpu_stats
Archived
1
1
Fork 0
Code Activity

card/hwmon: classify, support many cards in TUI

Browse source
This commit is contained in:
Josh Lay 2023-04-29 20:45:11 -05:00
parent afd6cb1754
commit cc53db0397
Signed by: jlay
GPG key ID: B265E45CACAD108A
4 changed files with 101 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/amdgpu_stats/__main__.py Normal file
View file

@ -0,0 +1,10 @@
"""TUI for amdgpu_stats"""
from .tui import start
def main():
start()
if __name__ == "__main__":
main()

10
src/amdgpu_stats/main.py
View file

@ -1,10 +0,0 @@
#!/usr/bin/python3
"""Pretty Textual-based stats for AMD GPUs
rich markup reference:
https://rich.readthedocs.io/en/stable/markup.html
"""
if __name__ == "__main__":
from .tui import interface
interface()

41
src/amdgpu_stats/style.css
View file

@ -1,23 +1,38 @@
Header {
background: $panel;
}
GPUStatsWidget { GPUStatsWidget {
layout: grid; layout: grid;
grid-size: 3; grid-size: 3;
grid-gutter: 2 12; grid-gutter: 2 8;
background: $boost; box-sizing: content-box;
height: 11; background: $panel;
min-width: 50; height: 10;
padding: 1; min-width: 50;
} }
/* for colors, see: https://textual.textualize.io/guide/design/#theme-reference */ /* for colors, see: https://textual.textualize.io/guide/design/#theme-reference */
.widgetheader {
background: $panel;
border: solid $primary-background;
content-align: center middle;
}
.box { .box {
height: 100%; height: 100%;
/* border: ascii $primary-background;*/ /* border: ascii $primary-background;*/
border: solid $primary-background; content-align: center middle;
content-align: center middle; padding: 0 1;
padding: 0 1; }
Horizontal {
padding: 0;
margin: 0;
box-sizing: content-box;
} }
.statvalue { .statvalue {
dock: right; dock: right;
} }

105
src/amdgpu_stats/tui.py
View file

@ -29,11 +29,8 @@ from textual.widgets import Header, Footer, Static, TextLog, Label
from .utils import AMDGPU_CARDS, format_frequency, get_core_stats, get_fan_rpm, get_fan_target, get_power_stats, get_temp_stats # pylint: disable=line-too-long from .utils import AMDGPU_CARDS, format_frequency, get_core_stats, get_fan_rpm, get_fan_target, get_power_stats, get_temp_stats # pylint: disable=line-too-long
# globals - card handling / choice for TUI # rich markup reference:
if len(AMDGPU_CARDS) > 0: # https://rich.readthedocs.io/en/stable/markup.html
# default to showing stats for the first detected card
CARD = next(iter(AMDGPU_CARDS))
hwmon_dir = AMDGPU_CARDS[CARD]
class LogScreen(Screen): class LogScreen(Screen):
@ -60,14 +57,27 @@ class LogScreen(Screen):
class GPUStatsWidget(Static): class GPUStatsWidget(Static):
"""The main stats widget.""" """The main stats widget."""
def __init__(self, *args, card=None, **kwargs):
super().__init__(*args, **kwargs)
# Instance variables
self.card = card
self.hwmon_dir = AMDGPU_CARDS[self.card]
def compose(self) -> ComposeResult: def compose(self) -> ComposeResult:
"""Create child widgets.""" """Create child widgets."""
yield ClockDisplay(classes="box") yield ClockDisplay(classes="box", card=self.card, hwmon_dir=self.hwmon_dir)
yield PowerDisplay(classes="box") yield PowerDisplay(classes="box", card=self.card, hwmon_dir=self.hwmon_dir)
yield MiscDisplay(classes="box") yield MiscDisplay(classes="box", card=self.card)
_msg = f'[bold]App:[/] creating stat widgets for [green]{self.card}[/], info directory: {self.hwmon_dir}'
self.update_log(_msg)
def update_log(self, message: str) -> None:
"""Update the TextLog widget with a new message."""
log_screen = AMDGPU_Stats.SCREENS["logs"]
log_screen.text_log.write(message)
class GPUStats(App): class AMDGPU_Stats(App):
"""Textual-based tool to show AMDGPU statistics.""" """Textual-based tool to show AMDGPU statistics."""
# apply stylesheet # apply stylesheet
@ -77,23 +87,27 @@ class GPUStats(App):
SCREENS = {"logs": LogScreen()} SCREENS = {"logs": LogScreen()}
# title the app after the card # title the app after the card
TITLE = 'GPUStats - ' + CARD # TITLE = 'GPUStats - ' + CARD
# setup keybinds # setup keybinds
# Binding("l", "push_screen('logs')", "Toggle logs", priority=True), # Binding("l", "push_screen('logs')", "Toggle logs", priority=True),
BINDINGS = [ BINDINGS = [
Binding("c", "custom_dark", "Colors"),
Binding("l", "toggle_log", "Logs"),
Binding("s", "screenshot_wrapper", "Screenshot"), Binding("s", "screenshot_wrapper", "Screenshot"),
Binding("c", "custom_dark", "Toggle colors"),
Binding("l", "toggle_log", "Toggle logs"),
Binding("q", "quit", "Quit") Binding("q", "quit", "Quit")
] ]
def compose(self) -> ComposeResult: def compose(self) -> ComposeResult:
"""Create child widgets for the app.""" """Create child widgets for the app."""
yield Header(show_clock=True) yield Header(show_clock=True)
yield Container(GPUStatsWidget()) for card in AMDGPU_CARDS:
stat_widget_name = "stats_" + card
yield Label(card, expand=True, classes='widgetheader')
widget = Container(GPUStatsWidget(card=card, id=stat_widget_name))
yield widget
self.update_log("[bold green]App started, logging begin!") self.update_log("[bold green]App started, logging begin!")
self.update_log(f"[bold italic]Information source:[/] {hwmon_dir}") self.update_log(f"[bold]Discovered AMD GPUs:[/] {list(AMDGPU_CARDS)}")
# nice-to-have: account for not storing these in dicts, but resolved in funcs # nice-to-have: account for not storing these in dicts, but resolved in funcs
# for metric, source in SRC_FILES.items(): # for metric, source in SRC_FILES.items():
# self.update_log(f'[bold] {metric}:[/] {source}') # self.update_log(f'[bold] {metric}:[/] {source}')
@ -140,7 +154,6 @@ class MiscDisplay(Static):
fan_rpm_target = reactive(0) fan_rpm_target = reactive(0)
# do some dancing to craft the UI; initialize the reactive obj with data # do some dancing to craft the UI; initialize the reactive obj with data
# to get proper labels # to get proper labels
initial_stats = get_temp_stats(CARD)
# dynamic object for temperature updates # dynamic object for temperature updates
temp_stats = reactive({}) temp_stats = reactive({})
# default to 'not composed', once labels are made - become true # default to 'not composed', once labels are made - become true
@ -148,10 +161,12 @@ class MiscDisplay(Static):
# ... and making labels for them # ... and making labels for them
composed = False composed = False
def __init__(self, *args, **kwargs): def __init__(self, card: str, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.timer_misc = None self.timer_misc = None
self.temp_stats = get_temp_stats(CARD) self.card = card
self.initial_stats = get_temp_stats(self.card)
self.temp_stats = get_temp_stats(self.card)
def compose(self) -> ComposeResult: def compose(self) -> ComposeResult:
yield Horizontal(Label("[underline]Temperatures"), yield Horizontal(Label("[underline]Temperatures"),
@ -160,8 +175,9 @@ class MiscDisplay(Static):
# capitalize the first letter for display # capitalize the first letter for display
caption = temp_node[0].upper() + temp_node[1:] caption = temp_node[0].upper() + temp_node[1:]
yield Horizontal(Label(f' {caption}:',), yield Horizontal(Label(f' {caption}:',),
Label("", id="temp_" + temp_node, Label("", id="temp_" + temp_node, classes="statvalue"))
classes="statvalue")) # padding to split groups
yield Horizontal()
yield Horizontal(Label("[underline]Fan RPM"), yield Horizontal(Label("[underline]Fan RPM"),
Label("", classes="statvalue")) Label("", classes="statvalue"))
yield Horizontal(Label(" Current:",), yield Horizontal(Label(" Current:",),
@ -178,9 +194,9 @@ class MiscDisplay(Static):
"""Method to update the temp/fan values to current measurements. """Method to update the temp/fan values to current measurements.
Run by a timer created 'on_mount'""" Run by a timer created 'on_mount'"""
self.fan_rpm = get_fan_rpm(CARD) self.fan_rpm = get_fan_rpm(self.card)
self.fan_rpm_target = get_fan_target(CARD) self.fan_rpm_target = get_fan_target(self.card)
self.temp_stats = get_temp_stats(CARD) self.temp_stats = get_temp_stats(self.card)
def watch_fan_rpm(self, fan_rpm: int) -> None: def watch_fan_rpm(self, fan_rpm: int) -> None:
"""Called when the 'fan_rpm' reactive attr changes. """Called when the 'fan_rpm' reactive attr changes.
@ -210,25 +226,28 @@ class ClockDisplay(Static):
"""A widget to display GPU power stats.""" """A widget to display GPU power stats."""
core_vals = reactive({"sclk": 0, "mclk": 0, "voltage": 0, "util_pct": 0}) core_vals = reactive({"sclk": 0, "mclk": 0, "voltage": 0, "util_pct": 0})
def __init__(self, *args, **kwargs): def __init__(self, card: str, hwmon_dir: str, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.timer_clocks = None self.timer_clocks = None
self.card = card
self.hwmon_dir = hwmon_dir
def compose(self) -> ComposeResult: def compose(self) -> ComposeResult:
yield Horizontal(Label("[underline]Clocks"), yield Horizontal(Label("[underline]Performance"),
Label("", classes="statvalue")) Label("", classes="statvalue"))
yield Horizontal(Label(" GPU core:",), yield Horizontal(Label(" Core clock:",),
Label("", id="clk_core_val", classes="statvalue")) Label("", id="clk_core_val", classes="statvalue"))
yield Horizontal(Label(" Memory:"), yield Horizontal(Label(" Memory clock:"),
Label("", id="clk_memory_val", classes="statvalue")) Label("", id="clk_memory_val", classes="statvalue"))
# padding to split groups
yield Horizontal(Label(""), Label("", classes="statvalue"))
yield Horizontal(Label("[underline]Core"),
Label("", classes="statvalue"))
yield Horizontal(Label(" Utilization:",), yield Horizontal(Label(" Utilization:",),
Label("", id="util_pct", classes="statvalue")) Label("", id="util_pct", classes="statvalue"))
yield Horizontal(Label(" Voltage:",), yield Horizontal(Label(" Voltage:",),
Label("", id="clk_voltage_val", classes="statvalue")) Label("", id="clk_voltage_val", classes="statvalue"))
# padding underneath, don't let them space out vertically
yield Horizontal()
yield Horizontal()
yield Horizontal()
yield Horizontal()
def on_mount(self) -> None: def on_mount(self) -> None:
"""Event handler called when widget is added to the app.""" """Event handler called when widget is added to the app."""
@ -237,7 +256,7 @@ class ClockDisplay(Static):
def update_core_vals(self) -> None: def update_core_vals(self) -> None:
"""Method to update GPU clock values to the current measurements. """Method to update GPU clock values to the current measurements.
Run by a timer created 'on_mount'""" Run by a timer created 'on_mount'"""
self.core_vals = get_core_stats(CARD) self.core_vals = get_core_stats(self.card)
def watch_core_vals(self, core_vals: dict) -> None: def watch_core_vals(self, core_vals: dict) -> None:
"""Called when the clocks attribute changes """Called when the clocks attribute changes
@ -261,25 +280,27 @@ class PowerDisplay(Static):
"capability": 0, "capability": 0,
"default": 0}) "default": 0})
def __init__(self, *args, **kwargs): def __init__(self, card: str, hwmon_dir: str, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.timer_watts = None self.timer_watts = None
self.card = card
self.hwmon_dir = hwmon_dir
def compose(self) -> ComposeResult: def compose(self) -> ComposeResult:
yield Horizontal(Label("[underline]Power"), yield Horizontal(Label("[underline]Power"),
Label("", classes="statvalue")) Label("", classes="statvalue"))
yield Horizontal(Label(" Usage:",), yield Horizontal(Label(" Usage:",),
Label("", id="pwr_avg_val", classes="statvalue")) Label("", id="pwr_avg_val", classes="statvalue"))
# padding to split groups yield Horizontal(Label(" Set Limit:",),
yield Horizontal(Label(""), Label("", classes="statvalue"))
yield Horizontal(Label("[underline]Limits"),
Label("", classes="statvalue"))
yield Horizontal(Label(" Configured:",),
Label("", id="pwr_lim_val", classes="statvalue")) Label("", id="pwr_lim_val", classes="statvalue"))
yield Horizontal(Label(" Default:",), yield Horizontal(Label(" Default Limit:",),
Label("", id="pwr_def_val", classes="statvalue")) Label("", id="pwr_def_val", classes="statvalue"))
yield Horizontal(Label(" Board capability:",), yield Horizontal(Label(" Capability:",),
Label("", id="pwr_cap_val", classes="statvalue")) Label("", id="pwr_cap_val", classes="statvalue"))
yield Horizontal()
yield Horizontal()
yield Horizontal()
yield Horizontal()
def on_mount(self) -> None: def on_mount(self) -> None:
"""Event handler called when widget is added to the app.""" """Event handler called when widget is added to the app."""
@ -289,7 +310,7 @@ class PowerDisplay(Static):
"""Method to update GPU power values to current measurements. """Method to update GPU power values to current measurements.
Run by a timer created 'on_mount'""" Run by a timer created 'on_mount'"""
self.watts = get_power_stats(CARD) self.watts = get_power_stats(self.card)
def watch_watts(self, watts: dict) -> None: def watch_watts(self, watts: dict) -> None:
"""Called when the 'watts' reactive attribute (var) changes. """Called when the 'watts' reactive attribute (var) changes.
@ -305,10 +326,10 @@ class PowerDisplay(Static):
Static).update(f"{watts['capability']}W") Static).update(f"{watts['capability']}W")
def interface() -> None: def start() -> None:
'''Spawns the textual UI only during CLI invocation / after argparse''' '''Spawns the textual UI only during CLI invocation / after argparse'''
if len(AMDGPU_CARDS) > 0: if len(AMDGPU_CARDS) > 0:
app = GPUStats(watch_css=True) app = AMDGPU_Stats(watch_css=True)
app.run() app.run()
else: else:
sys.exit('Could not find an AMD GPU, exiting.') sys.exit('Could not find an AMD GPU, exiting.')