From 30a31eda81f45a6b2310f315f6cd754abbf554a5 Mon Sep 17 00:00:00 2001 From: Detian Shi Date: Sat, 2 Nov 2024 16:48:42 -0700 Subject: [PATCH 1/2] add comparable NVML_LIB check for Windows --- glances/plugins/gpu/cards/nvidia.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/glances/plugins/gpu/cards/nvidia.py b/glances/plugins/gpu/cards/nvidia.py index d0f7dd66..85c02662 100644 --- a/glances/plugins/gpu/cards/nvidia.py +++ b/glances/plugins/gpu/cards/nvidia.py @@ -8,6 +8,9 @@ """NVidia Extension unit for Glances' GPU plugin.""" +import os +import sys + from glances.globals import nativestr from glances.logger import logger @@ -17,7 +20,13 @@ try: # Avoid importing pynvml if NVML_LIB is not installed from ctypes import CDLL - CDLL(NVML_LIB) + if (sys.platform[:3] == "win"): + try: + CDLL(os.path.join(os.getenv("WINDIR", "C:/Windows"), "System32/nvml.dll")) + except OSError as ose: + CDLL(os.path.join(os.getenv("ProgramFiles", "C:/Program Files"), "NVIDIA Corporation/NVSMI/nvml.dll")) + else: + CDLL(NVML_LIB) import pynvml except OSError: nvidia_gpu_enable = False From bcd7b3d9c6578149d36f881d5271947e3932bb1c Mon Sep 17 00:00:00 2001 From: Detian Shi Date: Sat, 2 Nov 2024 17:06:17 -0700 Subject: [PATCH 2/2] remove unused variable --- glances/plugins/gpu/cards/nvidia.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glances/plugins/gpu/cards/nvidia.py b/glances/plugins/gpu/cards/nvidia.py index 85c02662..996ec057 100644 --- a/glances/plugins/gpu/cards/nvidia.py +++ b/glances/plugins/gpu/cards/nvidia.py @@ -23,7 +23,7 @@ try: if (sys.platform[:3] == "win"): try: CDLL(os.path.join(os.getenv("WINDIR", "C:/Windows"), "System32/nvml.dll")) - except OSError as ose: + except OSError: CDLL(os.path.join(os.getenv("ProgramFiles", "C:/Program Files"), "NVIDIA Corporation/NVSMI/nvml.dll")) else: CDLL(NVML_LIB)