1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 -rw-r--r-- | glances/plugins/gpu/__init__.py | 3 | ||||
| -rw-r--r-- | optional-requirements.txt | 2 | ||||
| -rwxr-xr-x | 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 @@ -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'], |