From a8cc610ec185f19303e3d19f9e87ad847be49083 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Sun, 3 Mar 2024 14:40:43 +0100 Subject: Replace `py3nvml` with `nvidia-ml-py` --- glances/plugins/gpu/__init__.py | 3 +-- optional-requirements.txt | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/glances/plugins/gpu/__init__.py b/glances/plugins/gpu/__init__.py index b807c51e..4d11ce9f 100644 --- a/glances/plugins/gpu/__init__.py +++ b/glances/plugins/gpu/__init__.py @@ -13,9 +13,8 @@ from glances.globals import nativestr, to_fahrenheit from glances.logger import logger from glances.plugins.plugin.model import GlancesPluginModel -# In Glances 3.1.4 or higher, we use the py3nvml lib (see issue #1523) try: - import py3nvml.py3nvml as pynvml + import pynvml except Exception as e: import_error_tag = True # Display debug message if import KeyError diff --git a/optional-requirements.txt b/optional-requirements.txt index c1cc69c1..309353e7 100644 --- a/optional-requirements.txt +++ b/optional-requirements.txt @@ -26,7 +26,7 @@ pycouchdb pygal pymdstat pymongo; python_version >= "3.7" -py3nvml; python_version >= "3.5" +nvidia-ml-py; python_version >= "3.5" pysnmp pySMART.smartx python-dateutil diff --git a/setup.py b/setup.py index c32e6e86..a70a0d1c 100755 --- a/setup.py +++ b/setup.py @@ -63,7 +63,7 @@ def get_install_extras_require(): 'ibmcloudant', 'influxdb>=1.0.0', 'influxdb-client', 'pymongo', 'kafka-python', 'pika', 'paho-mqtt', 'potsdb', 'prometheus_client', 'pyzmq', 'statsd'], - 'gpu': ['py3nvml'], + 'gpu': ['nvidia-ml-py'], 'graph': ['pygal'], 'ip': ['netifaces'], 'raid': ['pymdstat'], -- cgit v1.2.3