@@ -635,21 +635,18 @@ func saveXPUDataToDB() {
635635 }
636636}
637637func loadGPUInfoInt (val string ) int {
638- valItem := strings .ReplaceAll (val , "MiB" , "" )
639- valItem = strings .ReplaceAll (valItem , "C" , "" )
640- valItem = strings .ReplaceAll (valItem , "%" , "" )
641- valItem = strings .TrimSpace (valItem )
642- data , _ := strconv .Atoi (valItem )
638+ val = strings .TrimSuffix (val , "%" )
639+ val = strings .TrimSpace (val )
640+ data , _ := strconv .Atoi (val )
643641 return data
644642}
645643func loadGPUInfoFloat (val string ) float64 {
646- valItem := strings .ReplaceAll (val , "W" , "" )
647- valItem = strings .ReplaceAll (valItem , "MB" , "" )
648- valItem = strings .ReplaceAll (valItem , "MiB" , "" )
649- valItem = strings .ReplaceAll (valItem , "C" , "" )
650- valItem = strings .ReplaceAll (valItem , "°C" , "" )
651- valItem = strings .ReplaceAll (valItem , "%" , "" )
652- valItem = strings .TrimSpace (valItem )
653- data , _ := strconv .ParseFloat (valItem , 64 )
644+ val = strings .TrimSpace (val )
645+ suffixes := []string {"W" , "MB" , "MiB" , "°C" , "C" , "%" }
646+ for _ , suffix := range suffixes {
647+ val = strings .TrimSuffix (val , suffix )
648+ }
649+ val = strings .TrimSpace (val )
650+ data , _ := strconv .ParseFloat (val , 64 )
654651 return data
655652}
0 commit comments