Skip to content

Commit

Permalink
Merge branch 'issue2796' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@nicolargo
nicolargo committed May 25, 2024
2 parents 8d6fabc + 79d9aa7 commit 4b48304
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 51 deletions.
116 changes: 66 additions & 50 deletions glances/outputs/static/js/components/plugin-gpu.vue
View file
Original file line number Diff line number Diff line change
@@ -1,59 +1,75 @@
<template>
<section id="gpu" class="plugin">
<div class="gpu-name title">
{{ name }}
</div>
<div class="table">
<div class="table-row" v-if="args.meangpu || gpus.length === 1">
<div class="table-cell text-left">proc:</div>
<div class="table-cell" :class="getMeanDecoration('proc')" v-if="mean.proc != null">
{{ $filters.number(mean.proc, 0) }}%
</div>
<div class="table-cell" v-if="mean.proc == null">N/A</div>
<section class="plugin" id="gpu" v-if="gpus != undefined">
<!-- single gpu -->
<template v-if="gpus.length === 1">
<div class="title gpu-name">{{ name }}</div>
<div class="table">
<template v-for="(gpu, gpuId) in gpus" :key="gpuId">
<div class="table-row">
<div class="table-cell text-left">proc:</div>
<div class="table-cell" :class="getDecoration(gpu.gpu_id, 'proc')" v-if="gpu.proc != null">{{ $filters.number(gpu.proc, 0) }}%</div>
<div class="table-cell" v-if="gpu.proc == null">N/A</div>
</div>
<div class="table-row">
<div class="table-cell text-left">mem:</div>
<div class="table-cell" :class="getDecoration(gpu.gpu_id, 'mem')" v-if="gpu.mem != null">{{ $filters.number(gpu.mem, 0) }}%</div>
<div class="table-cell" v-if="gpu.mem == null">N/A</div>
</div>
<div class="table-row">
<div class="table-cell text-left">temp:</div>
<div class="table-cell" :class="getDecoration(gpu.gpu_id, 'temperature')" v-if="gpu.temperature != null">{{ $filters.number(gpu.temperature, 0) }}°C</div>
<div class="table-cell" v-if="gpu.temperature == null">N/A</div>
</div>
</template>
</div>
<div class="table-row" v-if="args.meangpu || gpus.length === 1">
<div class="table-cell text-left">mem:</div>
<div class="table-cell" :class="getMeanDecoration('mem')" v-if="mean.mem != null">
{{ $filters.number(mean.mem, 0) }}%
</template>

<!-- multiple gpus - one line per gpu (no mean) -->
<template v-if="!args.meangpu && gpus.length > 1">
<div class="title gpu-name">{{ name }}</div>
<div class="table">
<div class="table-row" v-for="(gpu, gpuId) in gpus" :key="gpuId">
<div class="table-cell text-left">{{ gpu.gpu_id }}:</div>
<div class="table-cell" :class="getDecoration(gpu.gpu_id, 'proc')" v-if="gpu.proc != null">{{ $filters.number(gpu.proc, 0) }}%</div>
<div class="table-cell" v-if="gpu.proc == null">N/A</div>
<div class="table-cell text-left" style="padding-left: 10px">mem:</div>
<div class="table-cell" :class="getDecoration(gpu.gpu_id, 'mem')" v-if="gpu.mem != null">{{ $filters.number(gpu.mem, 0) }}%</div>
<div class="table-cell" v-if="gpu.mem == null">N/A</div>
</div>
<div class="table-cell" v-if="mean.mem == null">N/A</div>
</div>
<div class="table-row" v-if="args.meangpu || gpus.length === 1">
<div class="table-cell text-left">temperature:</div>
<div
class="table-cell"
:class="getMeanDecoration('temperature')"
v-if="mean.temperature != null"
>
{{ $filters.number(mean.temperature, 0) }}°
</template>

<!-- multiple gpus - mean -->
<template v-if="args.meangpu && gpus.length > 1">
<div class="title gpu-name">{{ name }}</div>
<div class="table">
<div class="table-row">
<div class="table-cell text-left">proc mean:</div>
<div class="table-cell" :class="getMeanDecoration('proc')" v-if="mean.proc != null">
{{ $filters.number(mean.proc, 0) }}%
</div>
<div class="table-cell" v-if="mean.proc == null">N/A</div>
</div>
<div class="table-cell" v-if="mean.temperature == null">N/A</div>
</div>
<template v-if="!args.meangpu && gpus.length > 1">
<div class="table-row" v-for="(gpu, gpuId) in gpus" :key="gpuId">
<div class="table-cell text-left">
{{ gpu.gpu_id }}:
<span :class="getDecoration(gpu.gpu_id, 'proc')" v-if="gpu.proc != null">
{{ $filters.number(gpu.proc, 0) }}%
</span>
<span v-if="gpu.proc == null">N/A</span>
mem:
<span :class="getDecoration(gpu.gpu_id, 'mem')" v-if="gpu.mem != null">
{{ $filters.number(gpu.mem, 0) }}%
</span>
<span v-if="gpu.mem == null">N/A</span>
temp:
<span
:class="getDecoration(gpu.gpu_id, 'temperature')"
v-if="gpu.temperature != null"
>
{{ $filters.number(gpu.temperature, 0) }}C
</span>
<span v-if="gpu.temperature == null">N/A</span>
<div class="table-row">
<div class="table-cell text-left">mem mean:</div>
<div class="table-cell" :class="getMeanDecoration('mem')" v-if="mean.mem != null">
{{ $filters.number(mean.mem, 0) }}%
</div>
<div class="table-cell" v-if="mean.mem == null">N/A</div>
</div>
</template>
</div>
<div class="table-row">
<div class="table-cell text-left">temp mean:</div>
<div
class="table-cell"
:class="getMeanDecoration('temperature')"
v-if="mean.temperature != null"
>
{{ $filters.number(mean.temperature, 0) }}°
</div>
<div class="table-cell" v-if="mean.temperature == null">N/A</div>
</div>
</div>
</template>
</section>
</template>

Expand Down Expand Up @@ -124,7 +140,7 @@ export default {
return this.view[gpuId][value].decoration.toLowerCase();
},
getMeanDecoration(value) {
return this.getDecoration(0, value);
return 'DEFAULT';
}
}
};
Expand Down
2 changes: 1 addition & 1 deletion glances/outputs/static/public/glances.js
View file

Large diffs are not rendered by default.

0 comments on commit 4b48304

Please sign in to comment.