greatbody
/
glances
mirror of https://github.com/nicolargo/glances
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

GPU temperature not shown in webview #1849

pull/1866/head
nicolargo 2021-04-24 10:54:39 +02:00
parent 2baf73ff0e
commit a155500b79
5 changed files with 53 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glances/outputs/static/js/components/plugin-gpu/controller.js
View File

@ -27,7 +27,8 @@ export default function GlancesPluginGpuController($scope, GlancesStats, ARGUMEN
vm.name = "GPU";
vm.mean = {
proc: null,
mem: null
mem: null,
temperature: null
};
var sameName = true;
@ -38,6 +39,7 @@ export default function GlancesPluginGpuController($scope, GlancesStats, ARGUMEN
vm.mean.proc += gpu.proc;
vm.mean.mem += gpu.mem;
vm.mean.temperature += gpu.temperature;
vm.gpus.push(gpu);
}
@ -50,6 +52,7 @@ export default function GlancesPluginGpuController($scope, GlancesStats, ARGUMEN
vm.mean.proc = vm.mean.proc / stats.length;
vm.mean.mem = vm.mean.mem / stats.length;
vm.mean.temperature = vm.mean.temperature / stats.length;
}
vm.getDecoration = function (gpuId, value) {

11
glances/outputs/static/js/components/plugin-gpu/view.html
View File

@ -17,6 +17,14 @@
</div>
<div class="table-cell" ng-if="vm.mean.mem == null">N/A</div>
</div>
<div class="table-row" ng-if="arguments.meangpu || vm.gpus.length === 1">
<div class="table-cell text-left">temperature::</div>
<div class="table-cell" ng-class="vm.getMeanDecoration('temperature')" ng-if="vm.mean.temperature != null">{{ vm.mean.temperature | number
:
0 }}%
</div>
<div class="table-cell" ng-if="vm.mean.temperature == null">N/A</div>
</div>
<div class="table-row" ng-if="!arguments.meangpu && vm.gpus.length > 1" ng-repeat="gpu in vm.gpus">
<div class="table-cell text-left">
{{ gpu.gpu_id }}:
@ -25,6 +33,9 @@
mem:
<span ng-class="vm.getDecoration(gpu.gpu_id, 'mem')" ng-if="gpu.mem != null">{{ gpu.mem | number : 0 }}%</span>
<span ng-if="gpu.mem == null">N/A</span>
temp:
<span ng-class="vm.getDecoration(gpu.gpu_id, 'temperature')" ng-if="gpu.temperature != null">{{ gpu.temperature | number : 0 }}C</span>
<span ng-if="gpu.temperature == null">N/A</span>
</div>
</div>
</div>

7
glances/outputs/static/public/glances.js vendored
View File

@ -58457,7 +58457,8 @@ function GlancesPluginGpuController($scope, GlancesStats, ARGUMENTS) {
vm.name = "GPU";
vm.mean = {
proc: null,
mem: null
mem: null,
temperature: null
};
var sameName = true;
@ -58468,6 +58469,7 @@ function GlancesPluginGpuController($scope, GlancesStats, ARGUMENTS) {
vm.mean.proc += gpu.proc;
vm.mean.mem += gpu.mem;
vm.mean.temperature += gpu.temperature;
vm.gpus.push(gpu);
}
@ -58480,6 +58482,7 @@ function GlancesPluginGpuController($scope, GlancesStats, ARGUMENTS) {
vm.mean.proc = vm.mean.proc / stats.length;
vm.mean.mem = vm.mean.mem / stats.length;
vm.mean.temperature = vm.mean.temperature / stats.length;
}
vm.getDecoration = function (gpuId, value) {
@ -58501,7 +58504,7 @@ function GlancesPluginGpuController($scope, GlancesStats, ARGUMENTS) {
/***/ (function(module, exports) {
var path = '/home/nicolargo/dev/glances/glances/outputs/static/js/components/plugin-gpu/view.html';
var html = "<section id=\"gpu\" class=\"plugin\">\n <div class=\"gpu-name title\">\n {{ vm.name }}\n </div>\n <div class=\"table\">\n <div class=\"table-row\" ng-if=\"arguments.meangpu || vm.gpus.length === 1\">\n <div class=\"table-cell text-left\">proc:</div>\n <div class=\"table-cell\" ng-class=\"vm.getMeanDecoration('proc')\" ng-if=\"vm.mean.proc != null\">{{ vm.mean.proc |\n number : 0 }}%\n </div>\n <div class=\"table-cell\" ng-if=\"vm.mean.proc == null\">N/A</div>\n </div>\n <div class=\"table-row\" ng-if=\"arguments.meangpu || vm.gpus.length === 1\">\n <div class=\"table-cell text-left\">mem:</div>\n <div class=\"table-cell\" ng-class=\"vm.getMeanDecoration('mem')\" ng-if=\"vm.mean.mem != null\">{{ vm.mean.mem | number :\n 0 }}%\n </div>\n <div class=\"table-cell\" ng-if=\"vm.mean.mem == null\">N/A</div>\n </div>\n <div class=\"table-row\" ng-if=\"!arguments.meangpu && vm.gpus.length > 1\" ng-repeat=\"gpu in vm.gpus\">\n <div class=\"table-cell text-left\">\n {{ gpu.gpu_id }}:\n <span ng-class=\"vm.getDecoration(gpu.gpu_id, 'proc')\" ng-if=\"gpu.proc != null\">{{ gpu.proc | number : 0 }}%</span>\n <span ng-if=\"gpu.proc == null\">N/A</span>\n mem:\n <span ng-class=\"vm.getDecoration(gpu.gpu_id, 'mem')\" ng-if=\"gpu.mem != null\">{{ gpu.mem | number : 0 }}%</span>\n <span ng-if=\"gpu.mem == null\">N/A</span>\n </div>\n </div>\n </div>\n</section>\n";
var html = "<section id=\"gpu\" class=\"plugin\">\n <div class=\"gpu-name title\">\n {{ vm.name }}\n </div>\n <div class=\"table\">\n <div class=\"table-row\" ng-if=\"arguments.meangpu || vm.gpus.length === 1\">\n <div class=\"table-cell text-left\">proc:</div>\n <div class=\"table-cell\" ng-class=\"vm.getMeanDecoration('proc')\" ng-if=\"vm.mean.proc != null\">{{ vm.mean.proc |\n number : 0 }}%\n </div>\n <div class=\"table-cell\" ng-if=\"vm.mean.proc == null\">N/A</div>\n </div>\n <div class=\"table-row\" ng-if=\"arguments.meangpu || vm.gpus.length === 1\">\n <div class=\"table-cell text-left\">mem:</div>\n <div class=\"table-cell\" ng-class=\"vm.getMeanDecoration('mem')\" ng-if=\"vm.mean.mem != null\">{{ vm.mean.mem | number :\n 0 }}%\n </div>\n <div class=\"table-cell\" ng-if=\"vm.mean.mem == null\">N/A</div>\n </div>\n <div class=\"table-row\" ng-if=\"arguments.meangpu || vm.gpus.length === 1\">\n <div class=\"table-cell text-left\">temperature::</div>\n <div class=\"table-cell\" ng-class=\"vm.getMeanDecoration('temperature')\" ng-if=\"vm.mean.temperature != null\">{{ vm.mean.temperature | number\n :\n 0 }}%\n </div>\n <div class=\"table-cell\" ng-if=\"vm.mean.temperature == null\">N/A</div>\n </div>\n <div class=\"table-row\" ng-if=\"!arguments.meangpu && vm.gpus.length > 1\" ng-repeat=\"gpu in vm.gpus\">\n <div class=\"table-cell text-left\">\n {{ gpu.gpu_id }}:\n <span ng-class=\"vm.getDecoration(gpu.gpu_id, 'proc')\" ng-if=\"gpu.proc != null\">{{ gpu.proc | number : 0 }}%</span>\n <span ng-if=\"gpu.proc == null\">N/A</span>\n mem:\n <span ng-class=\"vm.getDecoration(gpu.gpu_id, 'mem')\" ng-if=\"gpu.mem != null\">{{ gpu.mem | number : 0 }}%</span>\n <span ng-if=\"gpu.mem == null\">N/A</span>\n temp:\n <span ng-class=\"vm.getDecoration(gpu.gpu_id, 'temperature')\" ng-if=\"gpu.temperature != null\">{{ gpu.temperature | number : 0 }}C</span>\n <span ng-if=\"gpu.temperature == null\">N/A</span>\n </div>\n </div>\n </div>\n</section>\n";
window.angular.module('ng').run(['$templateCache', function(c) { c.put(path, html) }]);
module.exports = path;

2
glances/outputs/static/public/glances.map.js vendored
View File

File diff suppressed because one or more lines are too long

32
glances/plugins/glances_gpu.py
View File

@ -88,6 +88,38 @@ class Plugin(GlancesPlugin):
stats = self.get_init_value()
if not self.nvml_ready:
# !!!
# Uncomment to test on computer without GPU
# One GPU sample:
# self.stats = [
# {
# "key": "gpu_id",
# "gpu_id": 0,
# "name": "Fake GeForce GTX",
# "mem": 5.792331695556641,
# "proc": 4,
# "temperature": 26
# }
# ]
# Two GPU sample:
# self.stats = [
# {
# "key": "gpu_id",
# "gpu_id": 0,
# "name": "Fake GeForce GTX1",
# "mem": 5.792331695556641,
# "proc": 4,
# "temperature": 26
# },
# {
# "key": "gpu_id",
# "gpu_id": 1,
# "name": "Fake GeForce GTX2",
# "mem": 15,
# "proc": 8,
# "temperature": 65
# }
# ]
return self.stats
if self.input_method == 'local':