summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKiskae <Kiskae@users.noreply.github.com>2024-03-03 14:40:43 +0100
committerKiskae <Kiskae@users.noreply.github.com>2024-03-03 14:58:06 +0100
commita8cc610ec185f19303e3d19f9e87ad847be49083 (patch)
tree0f58be7212c3d86b7808fa497d6164e07650ec7d
parent753e9f2d974eef022251b5b539abfae22439c5b1 (diff)
Replace `py3nvml` with `nvidia-ml-py`
-rw-r--r--glances/plugins/gpu/__init__.py3
-rw-r--r--optional-requirements.txt2
-rwxr-xr-xsetup.py2
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'],