Skip to content

Commit 6ec1d24

Browse files
atheo89jiridanek
authored andcommitted
RHAIENG-332: (feat): update LLMCompressor image for 3.12 and ImageStream (opendatahub-io#1972)
# Conflicts: # jupyter/pytorch+llmcompressor/ubi9-python-3.12/Pipfile.lock # jupyter/pytorch+llmcompressor/ubi9-python-3.12/requirements.txt
1 parent c2a68a9 commit 6ec1d24

File tree

25 files changed

+56
-51
lines changed

25 files changed

+56
-51
lines changed

jupyter/pytorch+llmcompressor/ubi9-python-3.11/runtime-images/llmcompressor-pytorch-ubi9-py311.json

Lines changed: 0 additions & 12 deletions
This file was deleted.

jupyter/pytorch+llmcompressor/ubi9-python-3.11/Dockerfile.cuda renamed to jupyter/pytorch+llmcompressor/ubi9-python-3.12/Dockerfile.cuda

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN cd ./mongodb-cli-mongocli-v${MONGOCLI_VERSION}/ && \
1414
####################
1515
# base #
1616
####################
17-
FROM registry.access.redhat.com/ubi9/python-311:latest AS base
17+
FROM registry.access.redhat.com/ubi9/python-312:latest AS base
1818

1919
WORKDIR /opt/app-root/bin
2020

@@ -142,7 +142,7 @@ WORKDIR /opt/app-root/src
142142
FROM cuda-base AS cuda-jupyter-minimal
143143

144144
ARG JUPYTER_REUSABLE_UTILS=jupyter/utils
145-
ARG MINIMAL_SOURCE_CODE=jupyter/minimal/ubi9-python-3.11
145+
ARG MINIMAL_SOURCE_CODE=jupyter/minimal/ubi9-python-3.12
146146

147147
WORKDIR /opt/app-root/bin
148148

@@ -168,7 +168,7 @@ ENTRYPOINT ["start-notebook.sh"]
168168
#############################
169169
FROM cuda-jupyter-minimal AS cuda-jupyter-datascience
170170

171-
ARG DATASCIENCE_SOURCE_CODE=jupyter/datascience/ubi9-python-3.11
171+
ARG DATASCIENCE_SOURCE_CODE=jupyter/datascience/ubi9-python-3.12
172172

173173
WORKDIR /opt/app-root/bin
174174

@@ -201,20 +201,20 @@ WORKDIR /opt/app-root/src
201201
#############################
202202
FROM cuda-jupyter-datascience AS cuda-jupyter-pytorch
203203

204-
ARG DATASCIENCE_SOURCE_CODE=jupyter/datascience/ubi9-python-3.11
205-
ARG PYTORCH_SOURCE_CODE=jupyter/pytorch+llmcompressor/ubi9-python-3.11
204+
ARG DATASCIENCE_SOURCE_CODE=jupyter/datascience/ubi9-python-3.12
205+
ARG PYTORCH_SOURCE_CODE=jupyter/pytorch+llmcompressor/ubi9-python-3.12
206206

207207
WORKDIR /opt/app-root/bin
208208

209-
LABEL name="odh-notebook-jupyter-cuda-pytorch-ubi9-python-3.11" \
209+
LABEL name="odh-notebook-jupyter-cuda-pytorch-ubi9-python-3.12" \
210210
summary="Jupyter CUDA pytorch notebook image for ODH notebooks" \
211-
description="Jupyter CUDA pytorch notebook image with base Python 3.11 builder image based on UBI9 for ODH notebooks" \
211+
description="Jupyter CUDA pytorch notebook image with base Python 3.12 builder image based on UBI9 for ODH notebooks" \
212212
io.k8s.display-name="Jupyter CUDA pytorch notebook image for ODH notebooks" \
213-
io.k8s.description="Jupyter CUDA pytorch notebook image with base Python 3.11 builder image based on UBI9 for ODH notebooks" \
213+
io.k8s.description="Jupyter CUDA pytorch notebook image with base Python 3.12 builder image based on UBI9 for ODH notebooks" \
214214
authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
215215
io.openshift.build.commit.ref="main" \
216-
io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/jupyter/pytorch/ubi9-python-3.11" \
217-
io.openshift.build.image="quay.io/opendatahub/workbench-images:cuda-jupyter-pytorch-ubi9-python-3.11"
216+
io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/jupyter/pytorch/ubi9-python-3.12" \
217+
io.openshift.build.image="quay.io/opendatahub/workbench-images:cuda-jupyter-pytorch-ubi9-python-3.12"
218218

219219
# Install Python packages and Jupyterlab extensions from Pipfile.lock
220220
COPY ${PYTORCH_SOURCE_CODE}/Pipfile.lock ./
@@ -235,7 +235,7 @@ RUN echo "Installing softwares and packages" && \
235235
# Apply JupyterLab addons \
236236
/opt/app-root/bin/utils/addons/apply.sh && \
237237
# Fix permissions to support pip in Openshift environments \
238-
chmod -R g+w /opt/app-root/lib/python3.11/site-packages && \
238+
chmod -R g+w /opt/app-root/lib/python3.12/site-packages && \
239239
fix-permissions /opt/app-root -P
240240

241241
# Copy Elyra runtime-images definitions and set the version

jupyter/pytorch+llmcompressor/ubi9-python-3.11/Pipfile renamed to jupyter/pytorch+llmcompressor/ubi9-python-3.12/Pipfile

Lines changed: 7 additions & 7 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/cu124"
7+
url = "https://download.pytorch.org/whl/cu126"
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", index = "pytorch"}
19-
torchvision = {version = "==0.21.0", index = "pytorch"}
18+
torch = {version = "==2.6.0+cu126", index = "pytorch"}
19+
torchvision = {version = "==0.21.0+cu126", index = "pytorch"}
2020

2121
# llmcompressor packages
2222
llmcompressor = "~=0.5.1"
@@ -37,7 +37,7 @@ boto3 = "~=1.37.8"
3737
kafka-python-ng = "~=2.2.3"
3838
kfp = "~=2.12.1"
3939
matplotlib = "~=3.10.1"
40-
numpy = "<2.0"
40+
numpy = "<2.0.0"
4141
pandas = "~=2.2.3"
4242
plotly = "~=6.0.0"
4343
scikit-learn = "~=1.6.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.0"
66-
jupyterlab-widgets = "~=3.0.13"
65+
jupyterlab-lsp = "~=5.1.1"
66+
jupyterlab-widgets = "~=3.0.15"
6767
jupyter-resource-usage = "~=1.1.1"
6868
nbdime = "~=4.0.2"
6969
nbgitpuller = "~=1.2.2"
@@ -73,4 +73,4 @@ wheel = "~=0.45.1"
7373
setuptools = "~=78.1.1"
7474

7575
[requires]
76-
python_version = "3.11"
76+
python_version = "3.12"
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
---
22
apiVersion: kustomize.config.k8s.io/v1beta1
33
kind: Kustomization
4-
namePrefix: jupyter-pytorch-llmcompressor-ubi9-python-3-11-
4+
namePrefix: jupyter-pytorch-llmcompressor-ubi9-python-3-12-
55
labels:
66
- includeSelectors: true
77
pairs:
8-
app: jupyter-pytorch-llmcompressor-ubi9-python-3-11
8+
app: jupyter-pytorch-llmcompressor-ubi9-python-3-12
99
resources:
1010
- service.yaml
1111
- statefulset.yaml
1212
images:
1313
- name: quay.io/opendatahub/workbench-images
1414
newName: quay.io/opendatahub/workbench-images
15-
newTag: jupyter-pytorch-llmcompressor-ubi9-python-3.11
15+
newTag: jupyter-pytorch-llmcompressor-ubi9-python-3.12

jupyter/pytorch+llmcompressor/ubi9-python-3.11/kustomize/base/statefulset.yaml renamed to jupyter/pytorch+llmcompressor/ubi9-python-3.12/kustomize/base/statefulset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ spec:
1717
spec:
1818
containers:
1919
- name: notebook
20-
image: quay.io/opendatahub/workbench-images:jupyter-pytorch-llmcompressor-ubi9-python-3.11
20+
image: quay.io/opendatahub/workbench-images:jupyter-pytorch-llmcompressor-ubi9-python-3.12
2121
imagePullPolicy: Always
2222
workingDir: /opt/app-root/src
2323
env:

0 commit comments

Comments
 (0)