Skip to content

RHAIENG-1724, RHAIENG-1723, RHAIENG-1730: chore(tensorflow(+runtime), rustyai): switch to installing from AIPCC wheels #1886

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.

Sign up for GitHub

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

Draft
jiridanek wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

RHAIENG-1724, RHAIENG-1723, RHAIENG-1730: chore(tensorflow(+runtime), rustyai): switch to installing from AIPCC wheels #1886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion jupyter/tensorflow/ubi9-python-3.12/Dockerfile.cuda
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ FROM cuda-jupyter-datascience AS cuda-jupyter-tensorflow
ARG JUPYTER_REUSABLE_UTILS=jupyter/utils
ARG DATASCIENCE_SOURCE_CODE=jupyter/datascience/ubi9-python-3.12
ARG TENSORFLOW_SOURCE_CODE=jupyter/tensorflow/ubi9-python-3.12
ARG PYLOCK_FLAVOR

WORKDIR /opt/app-root/bin

Expand All @@ -171,7 +172,7 @@ LABEL name="odh-notebook-cuda-jupyter-tensorflow-ubi9-python-3.12" \
io.openshift.build.image="quay.io/opendatahub/workbench-images:cuda-jupyter-tensorflow-ubi9-python-3.12"

# Install Python packages and Jupyterlab extensions from requirements.txt
COPY ${TENSORFLOW_SOURCE_CODE}/pylock.toml ./
COPY ${TENSORFLOW_SOURCE_CODE}/pylock.${PYLOCK_FLAVOR}.toml ./pylock.toml

RUN /bin/bash <<'EOF'
set -Eeuxo pipefail
Expand Down
3 changes: 2 additions & 1 deletion jupyter/tensorflow/ubi9-python-3.12/Dockerfile.konflux.cuda
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,12 @@ FROM cuda-jupyter-datascience AS cuda-jupyter-tensorflow
ARG JUPYTER_REUSABLE_UTILS=jupyter/utils
ARG DATASCIENCE_SOURCE_CODE=jupyter/datascience/ubi9-python-3.12
ARG TENSORFLOW_SOURCE_CODE=jupyter/tensorflow/ubi9-python-3.12
ARG PYLOCK_FLAVOR

WORKDIR /opt/app-root/bin

# Install Python packages and Jupyterlab extensions from requirements.txt
COPY ${TENSORFLOW_SOURCE_CODE}/pylock.toml ./
COPY ${TENSORFLOW_SOURCE_CODE}/pylock.${PYLOCK_FLAVOR}.toml ./pylock.toml

RUN /bin/bash <<'EOF'
set -Eeuxo pipefail
Expand Down
5,915 changes: 0 additions & 5,915 deletions jupyter/tensorflow/ubi9-python-3.12/pylock.toml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions jupyter/tensorflow/ubi9-python-3.12/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies = [
"tf2onnx~=1.16.1",

# TensorFlow packages
"tensorflow[and-cuda]~=2.20.0",
"tensorflow~=2.20.0",
"tensorboard~=2.20.0",

# Datascience and useful extensions
Expand Down Expand Up @@ -50,7 +50,7 @@ odh-notebooks-meta-workbench-datascience-deps = { path = "../../../dependencies/

override-dependencies = [
# tf2onnx has pinned protobuf version, that causes conflict with other packages
"protobuf==6.31.1",
"protobuf==6.33.5",
"keras~=3.13.2",
# RHAIENG-2458: CVE-2025-66418 urllib3 - override needed because odh-elyra pulls in
# appengine-python-standard which has an obnoxious urllib3<2 constraint
Expand Down
1,883 changes: 1,883 additions & 0 deletions jupyter/tensorflow/ubi9-python-3.12/uv.lock.d/pylock.cuda.toml
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 2 additions & 9 deletions jupyter/trustyai/ubi9-python-3.12/Dockerfile.cpu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,17 +187,10 @@ FROM jupyter-datascience AS jupyter-trustyai

ARG DATASCIENCE_SOURCE_CODE=jupyter/datascience/ubi9-python-3.12
ARG TRUSTYAI_SOURCE_CODE=jupyter/trustyai/ubi9-python-3.12
ARG PYLOCK_FLAVOR

ENV LD_LIBRARY_PATH=/usr/lib:/usr/lib64${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}

### BEGIN RHAIENG-2189: this is AIPCC migration phase 1.5
ENV PIP_INDEX_URL=https://pypi.org/simple
# UV_INDEX_URL is deprecated in favor of UV_DEFAULT_INDEX
ENV UV_INDEX_URL=https://pypi.org/simple
# https://docs.astral.sh/uv/reference/environment/#uv_default_index
ENV UV_DEFAULT_INDEX=https://pypi.org/simple
### END RHAIENG-2189: this is AIPCC migration phase 1.5

LABEL name="odh-notebook-jupyter-trustyai-ubi9-python-3.12" \
summary="Jupyter trustyai notebook image for ODH notebooks" \
description="Jupyter trustyai notebook image with base Python 3.12 builder image based on UBI9 for ODH notebooks" \
Expand Down Expand Up @@ -230,7 +223,7 @@ fi
EOF

# Install Python packages and Jupyterlab extensions from requirements.txt
COPY ${TRUSTYAI_SOURCE_CODE}/pylock.toml ./
COPY ${TRUSTYAI_SOURCE_CODE}/pylock.${PYLOCK_FLAVOR}.toml ./pylock.toml

# install openblas for ppc64le
RUN --mount=type=cache,from=whl-cache,source=/root/OpenBLAS/,target=/OpenBlas/,rw /bin/bash <<'EOF'
Expand Down
11 changes: 2 additions & 9 deletions jupyter/trustyai/ubi9-python-3.12/Dockerfile.konflux.cpu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,17 +186,10 @@ FROM jupyter-datascience AS jupyter-trustyai

ARG DATASCIENCE_SOURCE_CODE=jupyter/datascience/ubi9-python-3.12
ARG TRUSTYAI_SOURCE_CODE=jupyter/trustyai/ubi9-python-3.12
ARG PYLOCK_FLAVOR

ENV LD_LIBRARY_PATH=/usr/lib:/usr/lib64${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}

### BEGIN RHAIENG-2189: this is AIPCC migration phase 1.5
ENV PIP_INDEX_URL=https://pypi.org/simple
# UV_INDEX_URL is deprecated in favor of UV_DEFAULT_INDEX
ENV UV_INDEX_URL=https://pypi.org/simple
# https://docs.astral.sh/uv/reference/environment/#uv_default_index
ENV UV_DEFAULT_INDEX=https://pypi.org/simple
### END RHAIENG-2189: this is AIPCC migration phase 1.5

LABEL name="rhoai/odh-workbench-jupyter-trustyai-cpu-py312-rhel9" \
com.redhat.component="odh-workbench-jupyter-trustyai-cpu-py312-rhel9" \
io.k8s.display-name="odh-workbench-jupyter-trustyai-cpu-py312-rhel9" \
Expand Down Expand Up @@ -227,7 +220,7 @@ fi
EOF

# Install Python packages and Jupyterlab extensions from requirements.txt
COPY ${TRUSTYAI_SOURCE_CODE}/pylock.toml ./
COPY ${TRUSTYAI_SOURCE_CODE}/pylock.${PYLOCK_FLAVOR}.toml ./pylock.toml

# install openblas for ppc64le
RUN --mount=type=cache,from=whl-cache,source=/root/OpenBLAS/,target=/OpenBlas/,rw /bin/bash <<'EOF'
Expand Down
5,383 changes: 0 additions & 5,383 deletions jupyter/trustyai/ubi9-python-3.12/pylock.toml
View file
Open in desktop

This file was deleted.

15 changes: 4 additions & 11 deletions jupyter/trustyai/ubi9-python-3.12/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ requires-python = "==3.12.*"

dependencies = [
# PyTorch packages
"torch==2.7.1+cu128; platform_machine != 'ppc64le' and platform_machine != 's390x'",
"torch==2.9.0; platform_machine != 'ppc64le' and platform_machine != 's390x'",

# Triton here is a dependency of torch, and is just being
# explicitly re-declared so that the index to pull it from can be
Expand All @@ -18,14 +18,14 @@ dependencies = [
#
# Since it's a dependency of torch, I've also added same platform
# exclusion marker to omit for ppc64le.
"triton==3.3.1; platform_machine != 'ppc64le' and platform_machine != 's390x'",
"triton==3.5.0; platform_machine != 'ppc64le' and platform_machine != 's390x'",

# TrustyAI packages
# More information available at:
# - https://pypi.org/project/trustyai/
# - https://github.com/trustyai-explainability/trustyai-explainability-python/blob/main/requirements.txt
"transformers~=4.57.3",
"datasets~=4.4.1",
"transformers~=5.0.0",
"datasets~=4.5.0",
"accelerate~=1.12.0; platform_machine != 'ppc64le' and platform_machine != 's390x'",
"trustyai~=0.6.3",

Expand Down Expand Up @@ -76,11 +76,4 @@ override-dependencies = [
]

[tool.uv.sources]
torch = { index = "pytorch-cuda" }
triton = { index = "pytorch-cuda" }
odh-notebooks-meta-workbench-datascience-deps = { path = "../../../dependencies/odh-notebooks-meta-workbench-datascience-deps" }

[[tool.uv.index]]
name = "pytorch-cuda"
url = "https://download.pytorch.org/whl/cu128"
explicit = true
Loading
Loading