Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ concurrency:
jobs:
conda-python-build:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.10
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.02
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -40,15 +40,15 @@ jobs:
upload-conda:
needs: conda-python-build
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-24.10
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-25.02
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
date: ${{ inputs.date }}
sha: ${{ inputs.sha }}
wheel-build:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.10
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.02
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -60,10 +60,11 @@ jobs:
wheel-publish:
needs: wheel-build
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.10
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.02
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
sha: ${{ inputs.sha }}
date: ${{ inputs.date }}
package-name: jupyterlab-nvdashboard
publish_to_pypi: true
12 changes: 6 additions & 6 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,30 +18,30 @@ jobs:
- wheel-build
- wheel-tests
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.10
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-25.02
checks:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.10
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-25.02
conda-python-build:
needs: checks
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.10
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.02
with:
build_type: pull-request
# This selects "ARCH=amd64 + the latest supported Python + CUDA".
matrix_filter: map(select(.ARCH == "amd64")) | max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]) | [.]
conda-python-tests:
needs: conda-python-build
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.10
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.02
with:
build_type: pull-request
# This selects "ARCH=amd64 + the latest supported Python + CUDA".
matrix_filter: map(select(.ARCH == "amd64")) | max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]) | [.]
wheel-build:
needs: checks
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.10
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.02
with:
build_type: pull-request
# This selects the latest supported Python + CUDA
Expand All @@ -50,7 +50,7 @@ jobs:
wheel-tests:
needs: wheel-build
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.02
with:
build_type: pull-request
# This selects the latest supported Python + CUDA
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/trigger-breaking-change-alert.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
trigger-notifier:
if: contains(github.event.pull_request.labels.*.name, 'breaking')
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@branch-24.12
uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@branch-25.02
with:
sender_login: ${{ github.event.sender.login }}
sender_avatar: ${{ github.event.sender.avatar_url }}
Expand Down
2 changes: 1 addition & 1 deletion ci/build_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ echo "__version__ = '$version'" > jupyterlab_nvdashboard/_version.py
# TODO: Remove `--no-test` flag once importing on a CPU
# node works correctly
rapids-logger "Building JupyterLab NVDashboard conda package"
RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild --no-test conda/recipes/jupyterlab-nvdashboard
RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry build --no-test conda/recipes/jupyterlab-nvdashboard

rapids-logger "Uploading JupyterLab NVDashboard conda package to S3"
rapids-upload-conda-to-s3 python
2 changes: 1 addition & 1 deletion conda/environments/all_arch-any.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/jupyterlab-nvdashboard/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
2 changes: 1 addition & 1 deletion dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions jupyterlab_nvdashboard/apps/gpu.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

try:
pynvml.nvmlInit()
except pynvml.nvml.NVMLError_LibraryNotFound:
except pynvml.NVMLError_LibraryNotFound:
ngpus = 0
gpu_handles = []
else:
Expand All @@ -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


Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jupyterlab-nvdashboard",
"version": "0.12.0",
"version": "0.13.0",
"description": "A JupyterLab extension for displaying GPU usage dashboards",
"keywords": [
"jupyter",
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

Expand Down
Loading