Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2024-11-21 19:07:46 +01:00
Code Issues Projects Releases Wiki Activity

Cleanup error gpu (#11130)

Browse Source
This commit is contained in:
Nicolas Mowen 2024-04-27 10:26:51 -06:00 committed by GitHub
parent ab032aa004
commit f36e86feb6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frigate/stats/util.py
View File

@ -162,7 +162,7 @@ async def set_gpu_stats(
for args in hwaccel_args: for args in hwaccel_args:
if args in hwaccel_errors: if args in hwaccel_errors:
# known erroring args should automatically return as error # known erroring args should automatically return as error
stats["error-gpu"] = {"gpu": -1, "mem": -1} stats["error-gpu"] = {"gpu": "", "mem": ""}
elif "cuvid" in args or "nvidia" in args: elif "cuvid" in args or "nvidia" in args:
# nvidia GPU # nvidia GPU
nvidia_usage = get_nvidia_gpu_stats() nvidia_usage = get_nvidia_gpu_stats()
@ -177,7 +177,7 @@ async def set_gpu_stats(
} }
else: else:
stats["nvidia-gpu"] = {"gpu": -1, "mem": -1} stats["nvidia-gpu"] = {"gpu": "", "mem": ""}
hwaccel_errors.append(args) hwaccel_errors.append(args)
elif "nvmpi" in args or "jetson" in args: elif "nvmpi" in args or "jetson" in args:
# nvidia Jetson # nvidia Jetson
@ -186,7 +186,7 @@ async def set_gpu_stats(
if jetson_usage: if jetson_usage:
stats["jetson-gpu"] = jetson_usage stats["jetson-gpu"] = jetson_usage
else: else:
stats["jetson-gpu"] = {"gpu": -1, "mem": -1} stats["jetson-gpu"] = {"gpu": "", "mem": ""}
hwaccel_errors.append(args) hwaccel_errors.append(args)
elif "qsv" in args: elif "qsv" in args:
if not config.telemetry.stats.intel_gpu_stats: if not config.telemetry.stats.intel_gpu_stats:
@ -198,7 +198,7 @@ async def set_gpu_stats(
if intel_usage: if intel_usage:
stats["intel-qsv"] = intel_usage stats["intel-qsv"] = intel_usage
else: else:
stats["intel-qsv"] = {"gpu": -1, "mem": -1} stats["intel-qsv"] = {"gpu": "", "mem": ""}
hwaccel_errors.append(args) hwaccel_errors.append(args)
elif "vaapi" in args: elif "vaapi" in args:
if is_vaapi_amd_driver(): if is_vaapi_amd_driver():
@ -211,7 +211,7 @@ async def set_gpu_stats(
if amd_usage: if amd_usage:
stats["amd-vaapi"] = amd_usage stats["amd-vaapi"] = amd_usage
else: else:
stats["amd-vaapi"] = {"gpu": -1, "mem": -1} stats["amd-vaapi"] = {"gpu": "", "mem": ""}
hwaccel_errors.append(args) hwaccel_errors.append(args)
else: else:
if not config.telemetry.stats.intel_gpu_stats: if not config.telemetry.stats.intel_gpu_stats:
@ -223,11 +223,11 @@ async def set_gpu_stats(
if intel_usage: if intel_usage:
stats["intel-vaapi"] = intel_usage stats["intel-vaapi"] = intel_usage
else: else:
stats["intel-vaapi"] = {"gpu": -1, "mem": -1} stats["intel-vaapi"] = {"gpu": "", "mem": ""}
hwaccel_errors.append(args) hwaccel_errors.append(args)
elif "v4l2m2m" in args or "rpi" in args: elif "v4l2m2m" in args or "rpi" in args:
# RPi v4l2m2m is currently not able to get usage stats # RPi v4l2m2m is currently not able to get usage stats
stats["rpi-v4l2m2m"] = {"gpu": -1, "mem": -1} stats["rpi-v4l2m2m"] = {"gpu": "", "mem": ""}
if stats: if stats:
all_stats["gpu_usages"] = stats all_stats["gpu_usages"] = stats

22
web/src/views/system/GeneralMetrics.tsx
View File

@ -210,6 +210,7 @@ export default function GeneralMetrics({
const series: { const series: {
[key: string]: { name: string; data: { x: number; y: string }[] }; [key: string]: { name: string; data: { x: number; y: string }[] };
} = {}; } = {};
let hasValidGpu = false;
statsHistory.forEach((stats, statsIdx) => { statsHistory.forEach((stats, statsIdx) => {
if (!stats) { if (!stats) {
@ -221,9 +222,17 @@ export default function GeneralMetrics({
series[key] = { name: key, data: [] }; series[key] = { name: key, data: [] };
} }
series[key].data.push({ x: statsIdx + 1, y: stats.gpu.slice(0, -1) }); if (stats.gpu) {
hasValidGpu = true;
series[key].data.push({ x: statsIdx + 1, y: stats.gpu.slice(0, -1) });
}
}); });
}); });
if (!hasValidGpu) {
return [];
}
return Object.keys(series).length > 0 ? Object.values(series) : []; return Object.keys(series).length > 0 ? Object.values(series) : [];
}, [statsHistory]); }, [statsHistory]);
@ -243,6 +252,7 @@ export default function GeneralMetrics({
const series: { const series: {
[key: string]: { name: string; data: { x: number; y: string }[] }; [key: string]: { name: string; data: { x: number; y: string }[] };
} = {}; } = {};
let hasValidGpu = false;
statsHistory.forEach((stats, statsIdx) => { statsHistory.forEach((stats, statsIdx) => {
if (!stats) { if (!stats) {
@ -254,9 +264,17 @@ export default function GeneralMetrics({
series[key] = { name: key, data: [] }; series[key] = { name: key, data: [] };
} }
series[key].data.push({ x: statsIdx + 1, y: stats.mem.slice(0, -1) }); if (stats.mem) {
hasValidGpu = true;
series[key].data.push({ x: statsIdx + 1, y: stats.mem.slice(0, -1) });
}
}); });
}); });
if (!hasValidGpu) {
return [];
}
return Object.values(series); return Object.values(series);
}, [statsHistory]); }, [statsHistory]);