Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migration from Jupyterlab v3 to v4 #169

Merged
merged 54 commits into from
Dec 12, 2023
Merged
Show file tree
Hide file tree
Changes from 43 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
11bc7de
add updated extension
AjayThorve Sep 28, 2023
ec4b3b5
update UI components
AjayThorve Sep 28, 2023
06fafd1
fix style dir
AjayThorve Sep 28, 2023
a69c39d
add server config file
AjayThorve Sep 28, 2023
8d7bbdd
set max bar width and turn animation off
AjayThorve Sep 28, 2023
d2df280
fix conda and pypi builds
AjayThorve Sep 28, 2023
aae0a01
consistent naming
AjayThorve Oct 17, 2023
f6334a5
fixes
AjayThorve Oct 17, 2023
fc307eb
renamed jupyterlab_nvdashboard to jupyterlab-nvdashboard
AjayThorve Oct 17, 2023
97ffb16
Update readme and screenshots
AjayThorve Oct 18, 2023
1300ecf
fix links
AjayThorve Oct 18, 2023
4386f2d
Update dimensions
AjayThorve Oct 18, 2023
b425bf6
add developer guide
AjayThorve Oct 19, 2023
65bc91e
fix numbering
AjayThorve Oct 19, 2023
969a64a
support gpuCI, undo changes
AjayThorve Oct 19, 2023
5c685c7
building conda package requires jlab>4
AjayThorve Oct 19, 2023
f9aec1b
fix naming for python package
AjayThorve Nov 27, 2023
06c2272
add --no-test flag for cpu nodes
AjayThorve Nov 27, 2023
d6ecf55
add python tests
AjayThorve Nov 30, 2023
5421a21
add ci scripts
AjayThorve Dec 1, 2023
26f404b
add styl checks and dependencies.yaml
AjayThorve Dec 1, 2023
9f6e162
add blank lines at eof
AjayThorve Dec 1, 2023
476807f
update workflows
AjayThorve Dec 1, 2023
a3bd122
add blank lines at eof
AjayThorve Dec 1, 2023
745a265
fix python build script
AjayThorve Dec 4, 2023
f7b87fd
uncomment download command
AjayThorve Dec 4, 2023
bbc6385
remove incorrect python_channel
AjayThorve Dec 4, 2023
63bc718
rm unused scripts
AjayThorve Dec 4, 2023
f96ed6e
try custom gh-action workflow
AjayThorve Dec 4, 2023
a757ab4
add correct branch type
AjayThorve Dec 5, 2023
4018b38
fix max_bw not found for systems with no nvlink
AjayThorve Dec 5, 2023
9b23b24
add defaults and permissions
AjayThorve Dec 5, 2023
0d7c3ff
fix ci scripts and workflows
AjayThorve Dec 5, 2023
fea52b1
fix eslint
AjayThorve Dec 5, 2023
f3555ce
run eslint locally
AjayThorve Dec 5, 2023
651c37f
fix constants naming convention
AjayThorve Dec 5, 2023
f82723b
add jlpm dependency to checks
AjayThorve Dec 5, 2023
e2d01ad
add eslint tests to checks
AjayThorve Dec 5, 2023
a74533d
Update style checks
AjayThorve Dec 5, 2023
1c23a2b
rm labeler, keep it manual
AjayThorve Dec 5, 2023
552b8d5
apply suggestions
AjayThorve Dec 5, 2023
471e807
need:checks for builds
AjayThorve Dec 5, 2023
e97b14a
fix tags as per suggestions
AjayThorve Dec 5, 2023
5388c17
update aws-action version
AjayThorve Dec 6, 2023
c9d4915
use shared-action workflows
AjayThorve Dec 6, 2023
fe8650b
fix hierarchy
AjayThorve Dec 6, 2023
b0468dc
Update .github/workflows/build.yaml
ajschmidt8 Dec 6, 2023
8e3f66e
Update .github/workflows/build.yaml
ajschmidt8 Dec 6, 2023
4405dfe
Update .github/workflows/pr.yaml
ajschmidt8 Dec 6, 2023
fb2292e
matrix filter for conda build machines as well
AjayThorve Dec 6, 2023
ea21a88
fix matrix filter to select correct amd64 machines
AjayThorve Dec 7, 2023
cb84676
old filter for wheel-build
AjayThorve Dec 7, 2023
9698cf0
fix square brackets
AjayThorve Dec 7, 2023
1351a83
combine two maps into one
AjayThorve Dec 7, 2023
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
11 changes: 9 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,16 @@ module.exports = {
},
plugins: ['@typescript-eslint'],
rules: {
'@typescript-eslint/interface-name-prefix': [
'@typescript-eslint/naming-convention': [
'error',
{ prefixWithI: 'always' }
{
selector: 'interface',
format: ['PascalCase'],
custom: {
regex: '^I[A-Z]',
match: true
}
}
],
'@typescript-eslint/no-unused-vars': ['warn', { args: 'none' }],
'@typescript-eslint/no-explicit-any': 'off',
Expand Down
10 changes: 10 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Copyright (c) 2023, NVIDIA CORPORATION.

[flake8]
filename = *.py,
exclude = __init__.py, *.egg, build, docs, .git
ignore =
# line break before binary operator
W503,
# whitespace before :
E203
58 changes: 58 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: build

on:
push:
branches:
- "branch-*"
tags:
- "v**"
- "!v**a"
workflow_dispatch:
inputs:
branch:
required: true
type: string
date:
required: true
type: string
sha:
required: true
type: string
build_type:
type: string
default: nightly

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
cancel-in-progress: true

jobs:
python-build:
AjayThorve marked this conversation as resolved.
Show resolved Hide resolved
secrets: inherit
uses: ./.github/workflows/conda-build.yaml
with:
build_type: ${{ inputs.build_type || 'branch' }}
upload-conda:
needs: [python-build]
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
date: ${{ inputs.date }}
sha: ${{ inputs.sha }}
wheel-build:
secrets: inherit
uses: ./.github/workflows/wheel-build.yaml
with:
build_type: ${{ inputs.build_type || 'branch' }}
wheel-publish:
needs: wheel-build
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
sha: ${{ inputs.sha }}
date: ${{ inputs.date }}
package-name: jupyterlab-nvdashboard
54 changes: 54 additions & 0 deletions .github/workflows/conda-build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
on:
workflow_call:
inputs:
build_type:
required: true
type: string

defaults:
run:
shell: bash

permissions:
actions: read
checks: none
contents: read
deployments: none
discussions: none
id-token: write
issues: none
packages: read
pages: none
pull-requests: read
repository-projects: none
security-events: none
statuses: none

jobs:
build:
runs-on: 'linux-amd64-cpu8'
container:
image: rapidsai/ci-conda:latest
env:
RAPIDS_BUILD_TYPE: ${{ inputs.build_type }}
PARALLEL_LEVEL: ${{ env.PARALLEL_LEVEL }}
steps:
- uses: aws-actions/configure-aws-credentials@v3
AjayThorve marked this conversation as resolved.
Show resolved Hide resolved
with:
role-to-assume: ${{ vars.AWS_ROLE_ARN }}
aws-region: ${{ vars.AWS_REGION }}
role-duration-seconds: 1200 # 20 minutes
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Standardize repository information
uses: rapidsai/shared-actions/rapids-github-info@main
with:
repo: ${{ inputs.repo }}
branch: ${{ inputs.branch }}
date: ${{ inputs.date }}
sha: ${{ inputs.sha }}
- name: Python build
run: ci/build_python.sh
env:
GH_TOKEN: ${{ github.token }}
113 changes: 113 additions & 0 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
name: pr

on:
push:
branches:
- 'pull-request/[0-9]+'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

defaults:
run:
shell: bash

permissions:
actions: read
checks: none
contents: read
deployments: none
discussions: none
id-token: write
issues: none
packages: read
pages: none
pull-requests: read
repository-projects: none
security-events: none
statuses: none

jobs:
pr-builder:
needs:
- checks
- conda-python-build
- conda-python-tests
- wheel-build
- wheel-tests
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
checks:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
conda-python-build:
needs: checks
secrets: inherit
uses: ./.github/workflows/conda-build.yaml
with:
build_type: pull-request
conda-python-tests:
needs: conda-python-build
runs-on: 'linux-amd64-gpu-v100-latest-1'
container:
image: rapidsai/ci-conda:latest
env:
RAPIDS_BUILD_TYPE: pull-request
PARALLEL_LEVEL: ${{ env.PARALLEL_LEVEL }}
NVIDIA_VISIBLE_DEVICES: ${{ env.NVIDIA_VISIBLE_DEVICES }}
steps:
- uses: aws-actions/configure-aws-credentials@v3
AjayThorve marked this conversation as resolved.
Show resolved Hide resolved
with:
role-to-assume: ${{ vars.AWS_ROLE_ARN }}
aws-region: ${{ vars.AWS_REGION }}
role-duration-seconds: 1200 # 20 minutes
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Standardize repository information
uses: rapidsai/shared-actions/rapids-github-info@main
with:
repo: ${{ inputs.repo }}
branch: ${{ inputs.branch }}
date: ${{ inputs.date }}
sha: ${{ inputs.sha }}
- name: Python tests
run: ci/test_python.sh
env:
GH_TOKEN: ${{ github.token }}
wheel-build:
needs: checks
secrets: inherit
uses: ./.github/workflows/wheel-build.yaml
with:
build_type: pull-request
wheel-tests:
needs: wheel-build
runs-on: 'linux-amd64-gpu-v100-latest-1'
container:
image: rapidsai/ci-wheel:latest
env:
RAPIDS_BUILD_TYPE: pull-request
PARALLEL_LEVEL: ${{ env.PARALLEL_LEVEL }}
NVIDIA_VISIBLE_DEVICES: ${{ env.NVIDIA_VISIBLE_DEVICES }}
steps:
- uses: aws-actions/configure-aws-credentials@v3
AjayThorve marked this conversation as resolved.
Show resolved Hide resolved
with:
role-to-assume: ${{ vars.AWS_ROLE_ARN }}
aws-region: ${{ vars.AWS_REGION }}
role-duration-seconds: 1200 # 20 minutes
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Standardize repository information
uses: rapidsai/shared-actions/rapids-github-info@main
with:
repo: ${{ inputs.repo }}
branch: ${{ inputs.branch }}
date: ${{ inputs.date }}
sha: ${{ inputs.sha }}
- name: Python tests
run: ci/test_wheel.sh
env:
GH_TOKEN: ${{ github.token }}
54 changes: 54 additions & 0 deletions .github/workflows/wheel-build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
on:
workflow_call:
inputs:
build_type:
required: true
type: string

defaults:
run:
shell: bash

permissions:
actions: read
checks: none
contents: read
deployments: none
discussions: none
id-token: write
issues: none
packages: read
pages: none
pull-requests: read
repository-projects: none
security-events: none
statuses: none

jobs:
build:
runs-on: 'linux-amd64-cpu8'
container:
image: rapidsai/ci-wheel:latest
env:
RAPIDS_BUILD_TYPE: ${{ inputs.build_type }}
PARALLEL_LEVEL: ${{ env.PARALLEL_LEVEL }}
steps:
- uses: aws-actions/configure-aws-credentials@v3
AjayThorve marked this conversation as resolved.
Show resolved Hide resolved
with:
role-to-assume: ${{ vars.AWS_ROLE_ARN }}
aws-region: ${{ vars.AWS_REGION }}
role-duration-seconds: 1200 # 20 minutes
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Standardize repository information
uses: rapidsai/shared-actions/rapids-github-info@main
with:
repo: ${{ inputs.repo }}
branch: ${{ inputs.branch }}
date: ${{ inputs.date }}
sha: ${{ inputs.sha }}
- name: Python build
run: ci/build_wheel.sh
env:
GH_TOKEN: ${{ github.token }}
11 changes: 9 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
*.bundle.*
lib/
node_modules/
*.log
.eslintcache
.stylelintcache
*.egg-info/
.ipynb_checkpoints
*.tsbuildinfo
jupyterlab_nvdashboard/labextension
# Version file is handled by hatchling
jupyterlab_nvdashboard/_version.py

# Created by https://www.gitignore.io/api/python
# Edit at https://www.gitignore.io/?templates=python
Expand All @@ -14,8 +19,6 @@ jupyterlab_nvdashboard/labextension
__pycache__/
*.py[cod]
*$py.class
dask-worker-space/
.pytest_cache/

# C extensions
*.so
Expand Down Expand Up @@ -58,6 +61,7 @@ htmlcov/
.coverage.*
.cache
nosetests.xml
coverage/
coverage.xml
*.cover
.hypothesis/
Expand Down Expand Up @@ -112,3 +116,6 @@ dmypy.json

# OSX files
.DS_Store

# Yarn cache
.yarn/
23 changes: 23 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Copyright (c) 2023, NVIDIA CORPORATION.

repos:
- repo: https://github.com/psf/black
rev: 23.11.0
hooks:
- id: black
files: jupyterlab_nvdashboard/.*
# Explicitly specify the pyproject.toml at the repo root, not per-project.
args: ['--config', 'pyproject.toml']
- repo: https://github.com/PyCQA/flake8
rev: 6.1.0
hooks:
- id: flake8
args: ['--config=.flake8']
files: jupyterlab_nvdashboard/.*$
- repo: https://github.com/rapidsai/dependency-file-generator
rev: v1.7.1
hooks:
- id: rapids-dependency-file-generator
args: ['--clean']
default_language_version:
python: python3
1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
Loading