Skip to content
Merged
4 changes: 2 additions & 2 deletions scripts/gpu_power.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ get_gpu()
gpu_power_percent=$(get_tmux_option "@dracula-gpu-power-percent" false)
if [[ "$gpu" == NVIDIA ]]; then
if $gpu_power_percent; then
usage=$(nvidia-smi --query-gpu=power.draw,power.limit --format=csv,noheader,nounits | awk '{ draw += $0; max +=$2 } END { printf("%d%%\n", draw / max * 100) }')
usage=$(nvidia-smi --query-gpu=power.draw,power.limit --format=csv,noheader,nounits | awk -F ', *' '{ printf("|%d%%", $0 / $2 * 100) }' && echo "|")
else
usage=$(nvidia-smi --query-gpu=power.draw,power.limit --format=csv,noheader,nounits | awk '{ draw += $0; max +=$2 } END { printf("%dW/%dW\n", draw, max) }')
usage=$(nvidia-smi --query-gpu=power.draw,power.limit --format=csv,noheader,nounits | awk -F ', *' '{ printf("|%dW/%dW", $0, $2) }' && echo "|")
fi

elif [[ "$gpu" == apple ]]; then
Expand Down
7 changes: 3 additions & 4 deletions scripts/gpu_ram_info.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,13 @@ get_gpu()
gpu_vram_percent=$(get_tmux_option "@dracula-gpu-vram-percent" false)
if [[ "$gpu" == NVIDIA ]]; then
if $gpu_vram_percent; then
usage=$(nvidia-smi --query-gpu=memory.used,memory.total --format=csv,noheader,nounits | awk '{ used += $0; total +=$2 } END { printf("%d%%\n", used / total * 100 ) }')
normalize_percent_len $usage
usage=$(nvidia-smi --query-gpu=memory.used,memory.total --format=csv,noheader,nounits | awk -F ', *' '{ printf("|%d%%", $0 / $2 * 100) }' && echo "|")
echo $usage
exit 0
else
# to add finer grained info
used_accuracy=$(get_tmux_option "@dracula-gpu-vram-used-accuracy" "d")
total_accuracy=$(get_tmux_option "@dracula-gpu-vram-total-accuracy" "d")
usage=$(nvidia-smi --query-gpu=memory.used,memory.total --format=csv,noheader,nounits | awk "{ used += \$0; total +=\$2 } END { printf(\"%${used_accuracy}GB/%${total_accuracy}GB\n\", used / 1024, total / 1024) }")
usage=$(nvidia-smi --query-gpu=memory.used,memory.total --format=csv,noheader,nounits | awk -F ", *" "{ printf(\"|%${used_accuracy}GB/%${total_accuracy}GB\", \$0 / 1024, \$2 / 1024) }" && echo "|")
fi
elif [[ "$gpu" == Advanced ]]; then
usage="$(
Expand Down
4 changes: 2 additions & 2 deletions scripts/gpu_usage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@ get_gpu()
{
gpu=$(get_platform)
if [[ "$gpu" == NVIDIA ]]; then
usage=$(nvidia-smi --query-gpu=utilization.gpu --format=csv,noheader,nounits | awk '{ sum += $0 } END { printf("%d%%\n", sum / NR) }')
usage=$(nvidia-smi --query-gpu=utilization.gpu --format=csv,noheader,nounits | awk -F ', *' '{ printf("|%d%%", $1) }' && echo "|")
elif [[ "$gpu" == apple ]]; then
usage="$(sudo powermetrics --samplers gpu_power -i500 -n 1 | grep 'active residency' | sed 's/[^0-9.%]//g' | sed 's/[%].*$//g')%"
elif [[ "$gpu" == Advanced ]]; then
usage="$(cat /sys/class/drm/card?/device/gpu_busy_percent | sed -z -e 's/\n/%|/g' -e 's/|$//g')"
else # "Intel" "Matrox", etc
usage="unknown"
fi
normalize_percent_len $usage
echo $usage
}

main()
Expand Down