Skip to content

Commit 88ee06d

Browse files
MioYuuIHMioYuuIH
authored
Merge pull request #146 from AMDResearch/develop
chore: merge develop to main
2 parents 1d78050 + 2c059c5 commit 88ee06d

5 files changed

Lines changed: 68 additions & 14 deletions

File tree

‎.github/workflows/docker-build.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -319,17 +319,18 @@ jobs:
319319
working-directory: runtime
320320
run: |
321321
pnpm install --frozen-lockfile --filter auplc-hub-link...
322-
rm -f code-server/extensions/auplc-hub-link/auplc-hub-link-0.0.0.vsix
322+
rm -f code-server/extensions/auplc-hub-link/auplc-hub-link-*.vsix
323+
HUB_LINK_VERSION=$(node -p "require('./code-server/extensions/auplc-hub-link/package.json').version")
323324
pnpm --filter @auplc/runtime-status run build
324325
pnpm --filter auplc-hub-link run build
325-
test -f code-server/extensions/auplc-hub-link/auplc-hub-link-0.0.0.vsix
326+
test -f "code-server/extensions/auplc-hub-link/auplc-hub-link-${HUB_LINK_VERSION}.vsix"
326327
327328
- name: Clean Hub link build artifacts
328329
if: always()
329330
run: |
330331
rm -rf runtime/code-server/extensions/auplc-hub-link/node_modules
331332
rm -rf runtime/code-server/extensions/auplc-hub-link/out
332-
rm -rf runtime/code-server/extensions/auplc-hub-link/auplc-hub-link-0.0.0.vsix
333+
rm -f runtime/code-server/extensions/auplc-hub-link/auplc-hub-link-*.vsix
333334
334335
- name: Set up Docker Buildx
335336
uses: docker/setup-buildx-action@v3
@@ -491,17 +492,18 @@ jobs:
491492
working-directory: runtime
492493
run: |
493494
pnpm install --frozen-lockfile --filter auplc-hub-link...
494-
rm -f code-server/extensions/auplc-hub-link/auplc-hub-link-0.0.0.vsix
495+
rm -f code-server/extensions/auplc-hub-link/auplc-hub-link-*.vsix
496+
HUB_LINK_VERSION=$(node -p "require('./code-server/extensions/auplc-hub-link/package.json').version")
495497
pnpm --filter @auplc/runtime-status run build
496498
pnpm --filter auplc-hub-link run build
497-
test -f code-server/extensions/auplc-hub-link/auplc-hub-link-0.0.0.vsix
499+
test -f "code-server/extensions/auplc-hub-link/auplc-hub-link-${HUB_LINK_VERSION}.vsix"
498500
499501
- name: Clean Hub link build artifacts
500502
if: always()
501503
run: |
502504
rm -rf runtime/code-server/extensions/auplc-hub-link/node_modules
503505
rm -rf runtime/code-server/extensions/auplc-hub-link/out
504-
rm -rf runtime/code-server/extensions/auplc-hub-link/auplc-hub-link-0.0.0.vsix
506+
rm -f runtime/code-server/extensions/auplc-hub-link/auplc-hub-link-*.vsix
505507
506508
- name: Set up Docker Buildx
507509
uses: docker/setup-buildx-action@v3

‎dockerfiles/Code/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ RUN if [ -n "${NPM_REGISTRY}" ]; then pnpm config set registry "${NPM_REGISTRY}"
3939
pnpm install --frozen-lockfile --prod=false --filter auplc-hub-link...
4040
RUN pnpm --filter @auplc/runtime-status run build && \
4141
pnpm --filter auplc-hub-link run build && \
42-
test -f code-server/extensions/auplc-hub-link/auplc-hub-link-0.0.0.vsix
42+
test -f code-server/extensions/auplc-hub-link/auplc-hub-link-0.0.1.vsix
4343

4444
FROM ${BASE_IMAGE}
4545

@@ -76,7 +76,7 @@ ENV PATH=/home/jovyan/.local/bin:/home/jovyan/.pixi/bin:${PATH}
7676

7777
COPY dockerfiles/Code/extensions.txt /opt/auplc/extensions/extensions.txt
7878
COPY dockerfiles/Code/extensions/ /opt/auplc/extensions/local/
79-
COPY --from=hub-link-builder /build/runtime/code-server/extensions/auplc-hub-link/auplc-hub-link-0.0.0.vsix /opt/auplc/extensions/local/auplc-hub-link-0.0.0.vsix
79+
COPY --from=hub-link-builder /build/runtime/code-server/extensions/auplc-hub-link/auplc-hub-link-0.0.1.vsix /opt/auplc/extensions/local/auplc-hub-link-0.0.1.vsix
8080
COPY dockerfiles/Code/start-code-server.sh /usr/local/bin/start-code-server.sh
8181

8282
RUN chmod +x /usr/local/bin/start-code-server.sh && \

‎runtime/code-server/extensions/auplc-hub-link/package.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "auplc-hub-link",
33
"displayName": "AUPLC Back to Hub",
44
"description": "Adds a status bar shortcut back to JupyterHub.",
5-
"version": "0.0.0",
5+
"version": "0.0.1",
66
"publisher": "amdresearch",
77
"license": "MIT",
88
"repository": {
@@ -29,9 +29,9 @@
2929
]
3030
},
3131
"scripts": {
32-
"compile": "tsc -p .",
33-
"package": "vsce package --no-dependencies",
34-
"build": "tsc -p . && vsce package --no-dependencies"
32+
"compile": "tsc --noEmit -p . && esbuild src/extension.ts --bundle --platform=node --format=cjs --target=node18 --external:vscode --sourcemap --outfile=out/extension.js",
33+
"package": "pnpm run compile && vsce package --no-dependencies",
34+
"build": "pnpm run package"
3535
},
3636
"dependencies": {
3737
"@auplc/runtime-status": "workspace:*"
@@ -40,6 +40,7 @@
4040
"@types/vscode": "^1.80.0",
4141
"@types/node": "^22.15.30",
4242
"@vscode/vsce": "^3.7.0",
43+
"esbuild": "^0.27.3",
4344
"typescript": "^5.4.5"
4445
},
4546
"files": [

‎runtime/pnpm-lock.yaml‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎runtime/values-multi-nodes.yaml.example‎

Lines changed: 50 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,8 @@ custom:
197197
Course-DL: "ghcr.io/amdresearch/auplc-dl:latest"
198198
Course-LLM: "ghcr.io/amdresearch/auplc-llm:latest"
199199
Course-PhySim: "ghcr.io/amdresearch/auplc-physim:latest"
200+
code-cpu: "ghcr.io/amdresearch/auplc-code-cpu:latest"
201+
code-gpu: "ghcr.io/amdresearch/auplc-code-gpu:latest"
200202

201203
requirements:
202204
cpu:
@@ -222,6 +224,13 @@ custom:
222224
cpu: "0"
223225
memory: "0Gi"
224226
amd.com/gpu: "1"
227+
code-cpu:
228+
cpu: "0"
229+
memory: "0Gi"
230+
code-gpu:
231+
cpu: "0"
232+
memory: "0Gi"
233+
amd.com/gpu: "1"
225234
none:
226235
cpu: "0"
227236
memory: "0Gi"
@@ -234,6 +243,16 @@ custom:
234243
accelerator: ""
235244
acceleratorKeys: []
236245
allowGitClone: true
246+
resourceType: "notebook"
247+
code-cpu:
248+
group: "DEVELOPMENT"
249+
description: "VSCode Server CPU Environment"
250+
subDescription: "CPU-only development workspace"
251+
accelerator: ""
252+
acceleratorKeys: []
253+
allowGitClone: true
254+
launchMode: "code-server"
255+
resourceType: "browser-ide"
237256
gpu:
238257
group: "CUSTOM REPO"
239258
description: "Basic GPU Environment"
@@ -242,13 +261,25 @@ custom:
242261
acceleratorKeys:
243262
- strix-halo
244263
allowGitClone: true
264+
resourceType: "notebook"
265+
code-gpu:
266+
group: "DEVELOPMENT"
267+
description: "VSCode Server GPU Environment"
268+
subDescription: "GPU-accelerated development workspace"
269+
accelerator: "GPU"
270+
acceleratorKeys:
271+
- strix-halo
272+
allowGitClone: true
273+
launchMode: "code-server"
274+
resourceType: "browser-ide"
245275
Course-CV:
246276
group: "COURSE"
247277
description: "Computer Vision Course"
248278
subDescription: "Suitable for CV experiments with GPU"
249279
accelerator: "GPU"
250280
acceleratorKeys:
251281
- strix-halo
282+
resourceType: "notebook"
252283
# acceleratorOverrides: (optional) per-accelerator image and env overrides
253284
# Use this when one course is available on multiple GPU targets with
254285
# different image tags.
@@ -265,20 +296,23 @@ custom:
265296
accelerator: "GPU"
266297
acceleratorKeys:
267298
- strix-halo
299+
resourceType: "notebook"
268300
Course-LLM:
269301
group: "COURSE"
270302
description: "Large Language Models Course"
271303
subDescription: "Suitable for LLM experiments with GPU"
272304
accelerator: "GPU"
273305
acceleratorKeys:
274306
- strix-halo
307+
resourceType: "notebook"
275308
Course-PhySim:
276309
group: "COURSE"
277310
description: "Genesis Physical Simulation Course"
278311
subDescription: "Suitable for physical simulation experiments with GPU"
279312
accelerator: "GPU"
280313
acceleratorKeys:
281314
- strix-halo
315+
resourceType: "notebook"
282316

283317
# --------------------------------------------------------------------------
284318
# Team Permission Configuration
@@ -287,14 +321,18 @@ custom:
287321
mapping:
288322
cpu:
289323
- cpu
324+
- code-cpu
290325
gpu:
326+
- code-gpu
291327
- Course-CV
292328
- Course-DL
293329
- Course-LLM
294330
- Course-PhySim
295331
official:
296332
- cpu
297333
- gpu
334+
- code-cpu
335+
- code-gpu
298336
- Course-CV
299337
- Course-DL
300338
- Course-LLM
@@ -305,15 +343,19 @@ custom:
305343
- Course-LLM
306344
- Course-PhySim
307345
native-users:
346+
- cpu
347+
- gpu
348+
- code-cpu
349+
- code-gpu
308350
- Course-CV
309351
- Course-DL
310352
- Course-LLM
311353
- Course-PhySim
312-
- cpu
313-
- gpu
314354
github-users:
315355
- cpu
316356
- gpu
357+
- code-cpu
358+
- code-gpu
317359
- Course-CV
318360
- Course-DL
319361
- Course-LLM
@@ -499,6 +541,12 @@ prePuller:
499541
auplc-physim:
500542
name: ghcr.io/amdresearch/auplc-physim
501543
tag: latest
544+
auplc-code-cpu:
545+
name: ghcr.io/amdresearch/auplc-code-cpu
546+
tag: latest
547+
auplc-code-gpu:
548+
name: ghcr.io/amdresearch/auplc-code-gpu
549+
tag: latest
502550
auplc-hub:
503551
name: ghcr.io/amdresearch/auplc-hub
504552
tag: latest

0 commit comments

Comments
 (0)