Merge pull request #215 from jakirkham/use_pynvml_12

rapidsai · Dec 21, 2024 · b5fdd67 · b5fdd67
2 parents d9746ae + eb3ae7d
commit b5fdd67
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/conda/environments/all_arch-any.yaml b/conda/environments/all_arch-any.yaml
@@ -10,7 +10,7 @@ dependencies:
 - nodejs=18
 - pre-commit
 - psutil
-- pynvml>=11.0.0,<12.0.0a0
+- pynvml>=12.0.0,<13.0.0a0
 - pytest
 - pytest-asyncio
 - pytest-jupyter[server]>=0.6.0

diff --git a/conda/recipes/jupyterlab-nvdashboard/meta.yaml b/conda/recipes/jupyterlab-nvdashboard/meta.yaml
@@ -26,7 +26,7 @@ requirements:
   run:
     - python >=3.8
     - jupyterlab >=4
-    - pynvml >=11.0.0,<12.0.0a0
+    - pynvml >=12.0.0,<13.0.0a0
     - psutil
 
 

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -72,7 +72,7 @@ dependencies:
       - output_types: [conda, requirements, pyproject]
         packages:
           - jupyterlab>=4
-          - pynvml>=11.0.0,<12.0.0a0
+          - pynvml>=12.0.0,<13.0.0a0
           - psutil
   test_python:
     common:

diff --git a/jupyterlab_nvdashboard/apps/gpu.py b/jupyterlab_nvdashboard/apps/gpu.py
@@ -5,7 +5,7 @@
 
 try:
     pynvml.nvmlInit()
-except pynvml.nvml.NVMLError_LibraryNotFound:
+except pynvml.NVMLError_LibraryNotFound:
     ngpus = 0
     gpu_handles = []
 else:
@@ -29,12 +29,12 @@
             max(sum(i.value.ullVal for i in bw) * 1024**2 for bw in bandwidth)
             / 2
         )
-    except (IndexError, pynvml.nvml.NVMLError_NotSupported):
+    except (IndexError, pynvml.NVMLError_NotSupported):
         nvlink_ver = None
         max_bw = []
     try:
         pci_gen = pynvml.nvmlDeviceGetMaxPcieLinkGeneration(gpu_handles[0])
-    except (IndexError, pynvml.nvml.NVMLError_NotSupported):
+    except (IndexError, pynvml.NVMLError_NotSupported):
         pci_gen = None
 
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -31,7 +31,7 @@ classifiers = [
 dependencies = [
     "jupyterlab>=4",
     "psutil",
-    "pynvml>=11.0.0,<12.0.0a0",
+    "pynvml>=12.0.0,<13.0.0a0",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit dependencies.yaml and run `rapids-dependency-file-generator`.
 dynamic = ["version", "description", "authors", "urls", "keywords"]