Skip to content

Commit 12aa9ee

Browse files
Minor tweaks
1 parent b736991 commit 12aa9ee

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

ext/TerminalSystemMonitorCUDAExt/TerminalSystemMonitorCUDAExt.jl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ function _plot_gpu_utilization_rates(dev::CUDA.CuDevice)
5050
mig = uuid(dev) != parent_uuid(dev)
5151
nvml_dev = CUDA.NVML.Device(uuid(dev); mig)
5252
x = CUDA.NVML.name(nvml_dev)
53-
y = CUDA.NVML.utilization_rates(nvml_dev).compute # percent
53+
y = 100 * CUDA.NVML.utilization_rates(nvml_dev).compute
5454
return barplot([x], [y], maximum = 100, width = max(5, 15))
5555
end
5656

@@ -68,10 +68,6 @@ function _plot_gpu_memory_utilization(dev::CUDA.CuDevice)
6868
nvml_gpu = CUDA.NVML.Device(parent_uuid(dev))
6969
nvml_dev = CUDA.NVML.Device(uuid(dev); mig)
7070
x = CUDA.NVML.name(nvml_dev)
71-
device_capability = CUDA.NVML.compute_capability(nvml_dev)
72-
#@show CUDA.NVML.power_usage(nvml_dev) # watt
73-
y = CUDA.NVML.utilization_rates(nvml_dev).compute # percent
74-
#@show CUDA.NVML.temperature(nvml_dev)
7571
(; total, free, used) = CUDA.NVML.memory_info(nvml_dev)
7672

7773
memorytotal, memorytotal_unit = extract_number_and_unit(Base.format_bytes(total))

src/TerminalSystemMonitor.jl

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,17 +133,25 @@ function main(dummyargs...)
133133
try
134134
plts = []
135135
append!(plts, plot_cpu_utilization_rates())
136-
append!(plts, plot_cpu_memory_utilization())
137-
#if isdefined(Main, :CUDA)
138-
append!(plts, plot_gpu_utilization_rates(MLDataDevices.CUDADevice))
139-
append!(plts, plot_gpu_memory_utilization(MLDataDevices.CUDADevice))
140-
#end
141-
# adjust layout
142136
_, cols = displaysize(stdout)
143137
n = max(1, cols ÷ 25)
144138
chunks = collect(Iterators.partition(plts, n))
145139
f = foldl(/, map(c -> prod(UnicodePlots.panel.(c)), chunks))
146140

141+
f /= prod(UnicodePlots.panel.(plot_cpu_memory_utilization()))
142+
143+
if isdefined(Main, :CUDA)
144+
cudaplts = []
145+
n = max(1, cols ÷ 50)
146+
plts1::Vector{Any} = plot_gpu_utilization_rates(MLDataDevices.CUDADevice)
147+
plts2::Vector{Any} = plot_gpu_memory_utilization(MLDataDevices.CUDADevice)
148+
for i in eachindex(plts1, plts2)
149+
push!(cudaplts, plts1[i])
150+
push!(cudaplts, plts2[i])
151+
end
152+
gpuchunks = collect(Iterators.partition(cudaplts, n))
153+
f /= foldl(/, map(c -> prod(UnicodePlots.panel.(c)), gpuchunks))
154+
end
147155
clearlinesall()
148156
display(f)
149157
catch e

0 commit comments

Comments
 (0)