fankes/beszel
2
0
Fork 0
mirror of https://github.com/fankes/beszel.git synced 2025-10-20 02:09:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(gpu): handle power for dedicated amd gpus (#414)

Browse Source
This commit is contained in:
Henry Dollman
2025-01-30 20:28:31 -05:00
parent 120aff0d18
commit 83668e5727
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
beszel/internal/agent/gpu.go
View File

@@ -26,13 +26,14 @@ type GPUManager struct {
// RocmSmiJson represents the JSON structure of rocm-smi output // RocmSmiJson represents the JSON structure of rocm-smi output
type RocmSmiJson struct { type RocmSmiJson struct {
ID string `json:"GUID"` ID string `json:"GUID"`
Name string `json:"Card series"` Name string `json:"Card series"`
Temperature string `json:"Temperature (Sensor edge) (C)"` Temperature string `json:"Temperature (Sensor edge) (C)"`
MemoryUsed string `json:"VRAM Total Used Memory (B)"` MemoryUsed string `json:"VRAM Total Used Memory (B)"`
MemoryTotal string `json:"VRAM Total Memory (B)"` MemoryTotal string `json:"VRAM Total Memory (B)"`
Usage string `json:"GPU use (%)"` Usage string `json:"GPU use (%)"`
Power string `json:"Current Socket Graphics Package Power (W)"` PowerPackage string `json:"Average Graphics Package Power (W)"`
PowerSocket string `json:"Current Socket Graphics Package Power (W)"`
} }
// gpuCollector defines a collector for a specific GPU management utility (nvidia-smi or rocm-smi) // gpuCollector defines a collector for a specific GPU management utility (nvidia-smi or rocm-smi)
@@ -186,21 +187,23 @@ func (gm *GPUManager) parseAmdData(output []byte) bool {
gm.mutex.Lock() gm.mutex.Lock()
defer gm.mutex.Unlock() defer gm.mutex.Unlock()
for _, v := range rocmSmiInfo { for _, v := range rocmSmiInfo {
temp, _ := strconv.ParseFloat(v.Temperature, 64) var power float64
if v.PowerPackage != "" {
power, _ = strconv.ParseFloat(v.PowerPackage, 64)
} else {
power, _ = strconv.ParseFloat(v.PowerSocket, 64)
}
memoryUsage, _ := strconv.ParseFloat(v.MemoryUsed, 64) memoryUsage, _ := strconv.ParseFloat(v.MemoryUsed, 64)
totalMemory, _ := strconv.ParseFloat(v.MemoryTotal, 64) totalMemory, _ := strconv.ParseFloat(v.MemoryTotal, 64)
usage, _ := strconv.ParseFloat(v.Usage, 64) usage, _ := strconv.ParseFloat(v.Usage, 64)
power, _ := strconv.ParseFloat(v.Power, 64)
memoryUsage = bytesToMegabytes(memoryUsage)
totalMemory = bytesToMegabytes(totalMemory)
if _, ok := gm.GpuDataMap[v.ID]; !ok { if _, ok := gm.GpuDataMap[v.ID]; !ok {
gm.GpuDataMap[v.ID] = &system.GPUData{Name: v.Name} gm.GpuDataMap[v.ID] = &system.GPUData{Name: v.Name}
} }
gpu := gm.GpuDataMap[v.ID] gpu := gm.GpuDataMap[v.ID]
gpu.Temperature = temp gpu.Temperature, _ = strconv.ParseFloat(v.Temperature, 64)
gpu.MemoryUsed = memoryUsage gpu.MemoryUsed = bytesToMegabytes(memoryUsage)
gpu.MemoryTotal = totalMemory gpu.MemoryTotal = bytesToMegabytes(totalMemory)
gpu.Usage += usage gpu.Usage += usage
gpu.Power += power gpu.Power += power
gpu.Count++ gpu.Count++