Skip to content

Commit e59ac77

Browse files
atheo89jiridanek
atheo89
authored and
jiridanek
committed
RHAIENG-332: (feat): add makefile and manifests for llmcompressor inclusion (opendatahub-io#1972)
1 parent 6ec1d24 commit e59ac77

File tree

9 files changed

+160
-15
lines changed

9 files changed

+160
-15
lines changed

‎Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,6 @@ ifeq ($(PYTHON_VERSION), 3.11)
407407
jupyter/pytorch/ubi9-python-$(PYTHON_VERSION) \
408408
jupyter/tensorflow/ubi9-python-$(PYTHON_VERSION) \
409409
jupyter/trustyai/ubi9-python-$(PYTHON_VERSION) \
410-
jupyter/pytorch+llmcompressor/ubi9-python-$(PYTHON_VERSION) \
411410
jupyter/rocm/tensorflow/ubi9-python-$(PYTHON_VERSION) \
412411
jupyter/rocm/pytorch/ubi9-python-$(PYTHON_VERSION) \
413412
codeserver/ubi9-python-$(PYTHON_VERSION) \
@@ -416,7 +415,6 @@ ifeq ($(PYTHON_VERSION), 3.11)
416415
runtimes/minimal/ubi9-python-$(PYTHON_VERSION) \
417416
runtimes/datascience/ubi9-python-$(PYTHON_VERSION) \
418417
runtimes/pytorch/ubi9-python-$(PYTHON_VERSION) \
419-
runtimes/pytorch+llmcompressor/ubi9-python-$(PYTHON_VERSION) \
420418
runtimes/tensorflow/ubi9-python-$(PYTHON_VERSION) \
421419
runtimes/rocm-tensorflow/ubi9-python-$(PYTHON_VERSION) \
422420
runtimes/rocm-pytorch/ubi9-python-$(PYTHON_VERSION)
@@ -428,12 +426,14 @@ else ifeq ($(PYTHON_VERSION), 3.12)
428426
jupyter/tensorflow/ubi9-python-$(PYTHON_VERSION) \
429427
jupyter/trustyai/ubi9-python-$(PYTHON_VERSION) \
430428
jupyter/rocm/pytorch/ubi9-python-$(PYTHON_VERSION) \
429+
jupyter/pytorch+llmcompressor/ubi9-python-$(PYTHON_VERSION) \
431430
codeserver/ubi9-python-$(PYTHON_VERSION) \
432431
runtimes/minimal/ubi9-python-$(PYTHON_VERSION) \
433432
runtimes/datascience/ubi9-python-$(PYTHON_VERSION) \
434433
runtimes/pytorch/ubi9-python-$(PYTHON_VERSION) \
435434
runtimes/tensorflow/ubi9-python-$(PYTHON_VERSION) \
436-
runtimes/rocm-pytorch/ubi9-python-$(PYTHON_VERSION)
435+
runtimes/rocm-pytorch/ubi9-python-$(PYTHON_VERSION) \
436+
runtimes/pytorch+llmcompressor/ubi9-python-$(PYTHON_VERSION)
437437
# runtimes/rocm-tensorflow/ubi9-python-$(PYTHON_VERSION)
438438
# jupyter/rocm/tensorflow/ubi9-python-$(PYTHON_VERSION)
439439
# rstudio/rhel9-python-$(PYTHON_VERSION)
@@ -494,12 +494,10 @@ all-images: \
494494
cuda-jupyter-minimal-ubi9-python-$(RELEASE_PYTHON_VERSION) \
495495
cuda-jupyter-tensorflow-ubi9-python-$(RELEASE_PYTHON_VERSION) \
496496
cuda-jupyter-pytorch-ubi9-python-$(RELEASE_PYTHON_VERSION) \
497-
cuda-jupyter-pytorch-llmcompressor-ubi9-python-$(RELEASE_PYTHON_VERSION) \
498497
jupyter-trustyai-ubi9-python-$(RELEASE_PYTHON_VERSION) \
499498
runtime-minimal-ubi9-python-$(RELEASE_PYTHON_VERSION) \
500499
runtime-datascience-ubi9-python-$(RELEASE_PYTHON_VERSION) \
501500
runtime-cuda-pytorch-ubi9-python-$(RELEASE_PYTHON_VERSION) \
502-
runtime-cuda-pytorch-llmcompressor-ubi9-python-$(RELEASE_PYTHON_VERSION) \
503501
runtime-cuda-tensorflow-ubi9-python-$(RELEASE_PYTHON_VERSION) \
504502
codeserver-ubi9-python-$(RELEASE_PYTHON_VERSION) \
505503
rstudio-c9s-python-$(RELEASE_PYTHON_VERSION) \
@@ -518,12 +516,14 @@ all-images: \
518516
cuda-jupyter-minimal-ubi9-python-$(RELEASE_PYTHON_VERSION) \
519517
cuda-jupyter-tensorflow-ubi9-python-$(RELEASE_PYTHON_VERSION) \
520518
cuda-jupyter-pytorch-ubi9-python-$(RELEASE_PYTHON_VERSION) \
519+
cuda-jupyter-pytorch-llmcompressor-ubi9-python-$(RELEASE_PYTHON_VERSION) \
521520
codeserver-ubi9-python-$(RELEASE_PYTHON_VERSION) \
522521
jupyter-trustyai-ubi9-python-$(RELEASE_PYTHON_VERSION) \
523522
runtime-minimal-ubi9-python-$(RELEASE_PYTHON_VERSION) \
524523
runtime-datascience-ubi9-python-$(RELEASE_PYTHON_VERSION) \
525524
runtime-cuda-pytorch-ubi9-python-$(RELEASE_PYTHON_VERSION) \
526525
runtime-cuda-tensorflow-ubi9-python-$(RELEASE_PYTHON_VERSION) \
526+
runtime-cuda-pytorch-llmcompressor-ubi9-python-$(RELEASE_PYTHON_VERSION) \
527527
rocm-jupyter-minimal-ubi9-python-$(RELEASE_PYTHON_VERSION) \
528528
rocm-jupyter-pytorch-ubi9-python-$(RELEASE_PYTHON_VERSION) \
529529
rocm-runtime-pytorch-ubi9-python-$(RELEASE_PYTHON_VERSION)

‎jupyter/pytorch+llmcompressor/ubi9-python-3.12/Pipfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ verify_ssl = true
44
name = "pypi"
55

66
[[source]]
7-
url = "https://download.pytorch.org/whl/cu126"
7+
url = "https://download.pytorch.org/whl/cu124"
88
verify_ssl = true
99
name = "pytorch"
1010

@@ -15,8 +15,8 @@ vllm = "~=0.8.5"
1515
[packages]
1616
# PyTorch packages
1717
tensorboard = "~=2.19.0"
18-
torch = {version = "==2.6.0+cu126", index = "pytorch"}
19-
torchvision = {version = "==0.21.0+cu126", index = "pytorch"}
18+
torch = {version = "==2.6.0", index = "pytorch"}
19+
torchvision = {version = "==0.21.0", index = "pytorch"}
2020

2121
# llmcompressor packages
2222
llmcompressor = "~=0.5.1"
@@ -62,8 +62,8 @@ jupyter-server = "~=2.16.0"
6262
jupyter-server-proxy = "~=4.4.0"
6363
jupyter-server-terminals = "~=0.5.3"
6464
jupyterlab-git = "~=0.51.1"
65-
jupyterlab-lsp = "~=5.1.1"
66-
jupyterlab-widgets = "~=3.0.15"
65+
jupyterlab-lsp = "~=5.1.0"
66+
jupyterlab-widgets = "~=3.0.13"
6767
jupyter-resource-usage = "~=1.1.1"
6868
nbdime = "~=4.0.2"
6969
nbgitpuller = "~=1.2.2"

‎manifests/base/commit-latest.env

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,13 @@ odh-workbench-jupyter-minimal-rocm-py312-ubi9-commit-n=a30b3c0
2222
odh-workbench-jupyter-datascience-cpu-py312-ubi9-commit-n=a30b3c0
2323
odh-workbench-jupyter-pytorch-cuda-py312-ubi9-commit-n=4073758
2424
odh-workbench-jupyter-pytorch-rocm-py312-ubi9-commit-n=80cffeb
25-
odh-workbench-jupyter-tensorflow-cuda-py312-ubi9-commit-n=4073758
25+
odh-workbench-jupyter-tensorflow-cuda-py312-ubi9-commit-n=80cffeb
26+
odh-workbench-jupyter-pytorch-llmcompressor-cuda-py312-ubi9-commit-n=aaaaaaa
2627
odh-pipeline-runtime-datascience-cpu-py312-ubi9-commit-n=97aa71c
2728
odh-workbench-jupyter-trustyai-cpu-py312-ubi9-commit-n=a30b3c0
2829
odh-workbench-codeserver-datascience-cpu-py312-ubi9-commit-n=a30b3c0
2930
odh-pipeline-runtime-minimal-cpu-py312-ubi9-commit-n=97aa71c
3031
odh-pipeline-runtime-pytorch-cuda-py312-ubi9-commit-n=a30b3c0
3132
odh-pipeline-runtime-tensorflow-cuda-py312-ubi9-commit-n=a30b3c0
3233
odh-pipeline-runtime-pytorch-rocm-py312-ubi9-commit-n=a30b3c0
34+
odh-pipeline-runtime-pytorch-llmcompressor-cuda-py312-ubi9-commit-n=aaaaaaa

‎manifests/base/params-latest.env

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ odh-workbench-jupyter-datascience-cpu-py312-ubi9-n=quay.io/opendatahub/odh-workb
4444

4545
odh-workbench-jupyter-pytorch-cuda-py312-ubi9-n=quay.io/opendatahub/odh-workbench-jupyter-pytorch-cuda-py312-ubi9@sha256:86074ee0c503664fd8ceb09d31280a94216c3ea65b24129d76ab8c63f07088de
4646

47+
odh-workbench-jupyter-pytorch-llmcompressor-cuda-py312-ubi9-n=quay.io/opendatahub/odh-workbench-jupyter-pytorch-llmcompressor-cuda-py312-ubi9@sha256:cc97aa8ac408d1cecd5ba3a67336ee0299a94dbcce11e4372c6dc90064b3f779
48+
4749
odh-workbench-jupyter-pytorch-rocm-py312-ubi9-n=quay.io/opendatahub/odh-workbench-jupyter-pytorch-rocm-py312-ubi9@sha256:cc97aa8ac408d1cecd5ba3a67336ee0299a94dbcce11e4372c6dc90064b3f779
4850

4951
odh-workbench-jupyter-tensorflow-cuda-py312-ubi9-n=quay.io/opendatahub/odh-workbench-jupyter-tensorflow-cuda-py312-ubi9@sha256:1d3984ecc5e9fd3b77d17666b2d185b443615dde3c751647163be861045bf051
@@ -61,3 +63,5 @@ odh-pipeline-runtime-pytorch-cuda-py312-ubi9-n=quay.io/opendatahub/odh-pipeline-
6163
odh-pipeline-runtime-tensorflow-cuda-py312-ubi9-n=quay.io/opendatahub/odh-pipeline-runtime-tensorflow-cuda-py312-ubi9@sha256:3a4bb55169ba632ffdb7595087058e1c745887467aedb7ef7c6fab31480c2c87
6264

6365
odh-pipeline-runtime-pytorch-rocm-py312-ubi9-n=quay.io/opendatahub/odh-pipeline-runtime-pytorch-rocm-py312-ubi9@sha256:ab4c0a1a6f229ada9826a61af3aa9273eaef64c353512e06ac2b3e5f67b0242e
66+
67+
odh-pipeline-runtime-pytorch-llmcompressor-cuda-py312-ubi9-n=quay.io/opendatahub/odh-pipeline-runtime-pytorch-llmcompressor-cuda-py312-ubi9@sha256:cc97aa8ac408d1cecd5ba3a67336ee0299a94dbcce11e4372c6dc90064b3f779

‎manifests/overlays/additional/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@ Notebooks:
1616
- jupyter-rocm-tensorflow-notebook-imagestream-beta
1717
- jupyter-tensorflow-notebook-imagestream-beta
1818
- jupyter-trustyai-notebook-imagestream-beta
19+
- jupyter-pytorch-llmcompressor-py312-ubi9-beta
1920

2021
**Note:** These images are the beta version of the 2025.b release based on Python 3.12.

‎manifests/overlays/additional/jupyter-pytorch-llmcompressor-cuda-py312-ubi9-imagestream.yaml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
---
2+
apiVersion: image.openshift.io/v1
3+
kind: ImageStream
4+
metadata:
5+
labels:
6+
opendatahub.io/notebook-image: "true"
7+
annotations:
8+
opendatahub.io/notebook-image-url: "https://github.com/opendatahub-io/notebooks/tree/main/jupyter/pytorch+llmcompressor/ubi9-python-3.12"
9+
opendatahub.io/notebook-image-name: "Jupyter | PyTorch LLM Compressor | CUDA | Python 3.12"
10+
opendatahub.io/notebook-image-desc: "Jupyter notebook image with PyTorch LLM Compressor libraries and dependencies to start experimenting with advanced AI/ML notebooks."
11+
opendatahub.io/notebook-image-order: "22"
12+
opendatahub.io/recommended-accelerators: '["nvidia.com/gpu"]'
13+
name: jupyter-pytorch-llmcompressor-cuda-py312-ubi9
14+
spec:
15+
lookupPolicy:
16+
local: true
17+
tags:
18+
- annotations:
19+
# language=json
20+
opendatahub.io/notebook-software: |
21+
[
22+
{"name": "CUDA", "version": "12.6"},
23+
{"name": "Python", "version": "v3.12"},
24+
{"name": "PyTorch", "version": "2.6"},
25+
{"name": "LLM-Compressor", "version": "0.6"}
26+
]
27+
# language=json
28+
opendatahub.io/notebook-python-dependencies: |
29+
[
30+
{"name": "JupyterLab","version": "4.4"},
31+
{"name": "PyTorch", "version": "2.6"},
32+
{"name": "LLM-Compressor", "version": "0.6"},
33+
{"name": "Tensorboard", "version": "2.19"},
34+
{"name": "Boto3", "version": "1.37"},
35+
{"name": "Kafka-Python-ng", "version": "2.2"},
36+
{"name": "Kfp", "version": "2.12"},
37+
{"name": "Matplotlib", "version": "3.10"},
38+
{"name": "Numpy", "version": "1.26"},
39+
{"name": "Pandas", "version": "2.2"},
40+
{"name": "Scikit-learn", "version": "1.6"},
41+
{"name": "Scipy", "version": "1.15"},
42+
{"name": "Odh-Elyra", "version": "4.2"},
43+
{"name": "PyMongo", "version": "4.11"},
44+
{"name": "Pyodbc", "version": "5.2"},
45+
{"name": "Codeflare-SDK", "version": "0.29"},
46+
{"name": "Sklearn-onnx", "version": "1.18"},
47+
{"name": "Psycopg", "version": "3.2"},
48+
{"name": "MySQL Connector/Python", "version": "9.3"},
49+
{"name": "Kubeflow-Training", "version": "1.9"}
50+
]
51+
openshift.io/imported-from: quay.io/opendatahub/workbench-images
52+
opendatahub.io/workbench-image-recommended: 'true'
53+
opendatahub.io/notebook-build-commit: odh-workbench-jupyter-pytorch-llmcompressor-cuda-py312-ubi9-commit-n_PLACEHOLDER
54+
from:
55+
kind: DockerImage
56+
name: odh-workbench-jupyter-pytorch-llmcompressor-cuda-py312-ubi9-n_PLACEHOLDER
57+
name: "2025.1"
58+
referencePolicy:
59+
type: Source

‎manifests/overlays/additional/kustomization.yaml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@ resources:
1313
- jupyter-pytorch-rocm-py312-ubi9-imagestream.yaml
1414
- jupyter-tensorflow-cuda-py312-ubi9-imagestream.yaml
1515
- jupyter-trustyai-cpu-py312-ubi9-imagestream.yaml
16+
- jupyter-pytorch-llmcompressor-cuda-py312-ubi9-imagestream.yaml
1617
- runtime-datascience-cpu-py312-ubi9-imagestream.yaml
1718
- runtime-minimal-cpu-py312-ubi9-imagestream.yaml
1819
- runtime-pytorch-cuda-py312-ubi9-imagestream.yaml
1920
- runtime-pytorch-rocm-py312-ubi9-imagestream.yaml
2021
- runtime-tensorflow-cuda-py312-ubi9-imagestream.yaml
22+
- runtime-pytorch-llmcompressor-cuda-py312-ubi9-imagestream.yaml
2123

2224
labels:
2325
- includeSelectors: true
@@ -64,6 +66,19 @@ replacements:
6466
kind: ImageStream
6567
name: jupyter-minimal-cuda-py312-ubi9
6668
version: v1
69+
- source:
70+
fieldPath: data.odh-workbench-jupyter-pytorch-llmcompressor-cuda-py312-ubi9-n
71+
kind: ConfigMap
72+
name: notebook-image-params
73+
version: v1
74+
targets:
75+
- fieldPaths:
76+
- spec.tags.0.from.name
77+
select:
78+
group: image.openshift.io
79+
kind: ImageStream
80+
name: jupyter-pytorch-llmcompressor-cuda-py312-ubi9
81+
version: v1
6782
- source:
6883
fieldPath: data.odh-workbench-jupyter-pytorch-cuda-py312-ubi9-n
6984
kind: ConfigMap
@@ -181,6 +196,19 @@ replacements:
181196
kind: ImageStream
182197
name: jupyter-minimal-cuda-py312-ubi9
183198
version: v1
199+
- source:
200+
fieldPath: data.odh-workbench-jupyter-pytorch-llmcompressor-cuda-py312-ubi9-commit-n
201+
kind: ConfigMap
202+
name: notebook-image-commithash
203+
version: v1
204+
targets:
205+
- fieldPaths:
206+
- spec.tags.0.annotations.[opendatahub.io/notebook-build-commit]
207+
select:
208+
group: image.openshift.io
209+
kind: ImageStream
210+
name: jupyter-pytorch-llmcompressor-cuda-py312-ubi9
211+
version: v1
184212
- source:
185213
fieldPath: data.odh-workbench-jupyter-pytorch-cuda-py312-ubi9-commit-n
186214
kind: ConfigMap
@@ -285,6 +313,19 @@ replacements:
285313
kind: ImageStream
286314
name: runtime-datascience-cpu-py312-ubi9
287315
version: v1
316+
- source:
317+
fieldPath: data.odh-pipeline-runtime-pytorch-llmcompressor-cuda-py312-ubi9-n
318+
kind: ConfigMap
319+
name: notebook-image-params
320+
version: v1
321+
targets:
322+
- fieldPaths:
323+
- spec.tags.0.from.name
324+
select:
325+
group: image.openshift.io
326+
kind: ImageStream
327+
name: runtime-pytorch-llmcompressor-cuda-py312-ubi9
328+
version: v1
288329
- source:
289330
fieldPath: data.odh-pipeline-runtime-pytorch-cuda-py312-ubi9-n
290331
kind: ConfigMap

‎manifests/overlays/additional/runtime-pytorch-llmcompressor-cuda-py312-ubi9-imagestream.yaml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
---
2+
apiVersion: image.openshift.io/v1
3+
kind: ImageStream
4+
metadata:
5+
labels:
6+
opendatahub.io/runtime-image: "true"
7+
annotations:
8+
opendatahub.io/runtime-image-url: "https://github.com/opendatahub-io/notebooks/tree/main/runtimes"
9+
opendatahub.io/runtime-image-name: "Runtime | PyTorch LLM Compressor | CUDA | Python 3.12"
10+
opendatahub.io/runtime-image-desc: "PyTorch runtime image for Elyra, enabling pipeline execution from Workbenches with PyTorch libraries and dependencies, supporting different runtimes for various pipeline nodes."
11+
name: runtime-pytorch-llmcompressor-cuda-py312-ubi9
12+
spec:
13+
lookupPolicy:
14+
local: true
15+
tags:
16+
- annotations:
17+
# language=json
18+
opendatahub.io/runtime-image-metadata: |
19+
[
20+
{
21+
"display_name": "Runtime | PyTorch LLM Compressor | CUDA | Python 3.12",
22+
"metadata": {
23+
"tags": [
24+
"pytorch"
25+
],
26+
"display_name": "Runtime | PyTorch LLM Compressor | CUDA | Python 3.12",
27+
"pull_policy": "IfNotPresent"
28+
},
29+
"schema_name": "runtime-image"
30+
}
31+
]
32+
openshift.io/imported-from: quay.io/opendatahub/workbench-images
33+
from:
34+
kind: DockerImage
35+
name: odh-pipeline-runtime-pytorch-llmcompressor-cuda-py312-ubi9-n_PLACEHOLDER
36+
name: "pytorch"
37+
referencePolicy:
38+
type: Source

‎runtimes/pytorch+llmcompressor/ubi9-python-3.12/Pipfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ verify_ssl = true
44
name = "pypi"
55

66
[[source]]
7-
url = "https://download.pytorch.org/whl/cu126"
7+
url = "https://download.pytorch.org/whl/cu124"
88
verify_ssl = true
99
name = "pytorch"
1010

@@ -15,8 +15,8 @@ vllm = "~=0.8.5"
1515
[packages]
1616
# PyTorch packages
1717
tensorboard = "~=2.19.0"
18-
torch = {version = "==2.6.0+cu126", index = "pytorch"}
19-
torchvision = {version = "==0.21.0+cu126", index = "pytorch"}
18+
torch = {version = "==2.6.0", index = "pytorch"}
19+
torchvision = {version = "==0.21.0", index = "pytorch"}
2020

2121
# llmcompressor packages
2222
llmcompressor = "~=0.5.1"
@@ -67,7 +67,7 @@ prompt-toolkit = "~=3.0.50"
6767
requests = "~=2.32.3"
6868
tornado = "~=6.5.2"
6969
traitlets = "~=5.14.3"
70-
urllib3 = "~=2.5.0"
70+
urllib3 = "~=2.3.0"
7171

7272
# Base packages
7373
setuptools = "~=78.1.1"

0 commit comments

Comments
 (0)