Skip to content

[rhoai-2.25] RHAIENG-6127: remove tf2onnx from ROCm TensorFlow images on rhoai-2.25 - #2456

Open
jiridanek wants to merge 2 commits into
rhoai-2.25from
fix/remove-tf2onnx-rocm-tf-rhoai-2.25
Open

[rhoai-2.25] RHAIENG-6127: remove tf2onnx from ROCm TensorFlow images on rhoai-2.25#2456
jiridanek wants to merge 2 commits into
rhoai-2.25from
fix/remove-tf2onnx-rocm-tf-rhoai-2.25

Conversation

@jiridanek

@jiridanek jiridanek commented Jul 7, 2026

Copy link
Copy Markdown
Member

Description

Backport RHAIENG-3019 / opendatahub-io#2987 to rhoai-2.25 — remove abandoned tf2onnx from ROCm TensorFlow workbench and runtime images.

Follows merged #2455 (papermill test fixes); this PR completes dependency removal.

Jira: RHAIENG-6127

Changes

Area Change
jupyter/rocm/tensorflow/.../pyproject.toml Remove tf2onnx; keep protobuf==6.31.1 (tensorflow-rocm vs kfp; RHAIENG-4324)
runtimes/rocm-tensorflow/.../pyproject.toml Remove tf2onnx + protobuf override → resolves to 5.29.6
test_notebook.ipynb Remove import tf2onnx and test_tf2onnx_conversion entirely
Runtime Dockerfiles Remove monkey_patch_protobuf_6x.py COPY (protobuf 5.x)
Both pylock.toml Regenerated

Workbench Dockerfiles still copy monkey_patch_protobuf_6x.py (needed for protobuf 6.31.1 + tensorflow-rocm).

How Has This Been Tested?

  • rocm-jupyter-tensorflow-ubi9-python-3.12 Build Notebooks matrix job
  • rocm-runtime-tensorflow-ubi9-python-3.12 build

Self checklist (all need to be checked):

  • Ensure that you have run make test (gmake on macOS) before asking for review
  • Changes to everything except Dockerfile.konflux files should be done in odh/notebooks and automatically synced to rhds/notebooks. For Konflux-specific changes, modify Dockerfile.konflux files directly in rhds/notebooks as these require special attention in the downstream repository and flow to the upcoming RHOAI release.

Merge criteria:

  • The commits are squashed in a cohesive manner and have meaningful messages.
  • Testing instructions have been added in the PR body (for PRs involving changes that are not immediately obvious).
  • The developer has manually tested the changes and verified that the changes work

Made with Cursor

Summary by CodeRabbit

  • Changes
    • Removed TensorFlow-to-ONNX conversion support and its associated package.
    • Updated the bundled protobuf version.
    • Removed legacy protobuf customization from the container setup.
    • Refreshed package metadata and locked artifacts to match the updated runtime configuration.
  • Tests
    • Removed the skipped TensorFlow-to-ONNX conversion test.

@openshift-ci
openshift-ci Bot requested review from atheo89 and dibryant July 7, 2026 20:30
@openshift-ci

openshift-ci Bot commented Jul 7, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign jesuino for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@coderabbitai

coderabbitai Bot commented Jul 7, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: b812333b-41a0-4892-8501-0eeb7c1acf5a

📥 Commits

Reviewing files that changed from the base of the PR and between f5f399f and 9205e2e.

📒 Files selected for processing (7)
  • jupyter/rocm/tensorflow/ubi9-python-3.12/pylock.toml
  • jupyter/rocm/tensorflow/ubi9-python-3.12/pyproject.toml
  • jupyter/rocm/tensorflow/ubi9-python-3.12/test/test_notebook.ipynb
  • runtimes/rocm-tensorflow/ubi9-python-3.12/Dockerfile.konflux.rocm
  • runtimes/rocm-tensorflow/ubi9-python-3.12/Dockerfile.rocm
  • runtimes/rocm-tensorflow/ubi9-python-3.12/pylock.toml
  • runtimes/rocm-tensorflow/ubi9-python-3.12/pyproject.toml
💤 Files with no reviewable changes (5)
  • runtimes/rocm-tensorflow/ubi9-python-3.12/Dockerfile.konflux.rocm
  • jupyter/rocm/tensorflow/ubi9-python-3.12/pylock.toml
  • runtimes/rocm-tensorflow/ubi9-python-3.12/pyproject.toml
  • runtimes/rocm-tensorflow/ubi9-python-3.12/Dockerfile.rocm
  • jupyter/rocm/tensorflow/ubi9-python-3.12/test/test_notebook.ipynb
🚧 Files skipped from review as they are similar to previous changes (2)
  • jupyter/rocm/tensorflow/ubi9-python-3.12/pyproject.toml
  • runtimes/rocm-tensorflow/ubi9-python-3.12/pylock.toml

📝 Walkthrough

Walkthrough

The ROCm TensorFlow Python 3.12 configurations remove tf2onnx, update the runtime protobuf lock to 5.29.6, remove protobuf customization files from the images, and delete the related notebook conversion test.

Changes

ROCm TensorFlow dependency cleanup

Layer / File(s) Summary
Dependency, lockfile, and notebook test alignment
jupyter/rocm/tensorflow/ubi9-python-3.12/pyproject.toml, jupyter/rocm/tensorflow/ubi9-python-3.12/pylock.toml, jupyter/rocm/tensorflow/ubi9-python-3.12/test/test_notebook.ipynb, runtimes/rocm-tensorflow/ubi9-python-3.12/pyproject.toml, runtimes/rocm-tensorflow/ubi9-python-3.12/pylock.toml
Removes the tf2onnx dependencies, lock entries, import, and conversion test. The runtime lock changes protobuf from 6.31.1 to 5.29.6.
Runtime image cleanup
runtimes/rocm-tensorflow/ubi9-python-3.12/Dockerfile.konflux.rocm, runtimes/rocm-tensorflow/ubi9-python-3.12/Dockerfile.rocm
Removes the Dockerfile steps that copy usercustomize.pth and monkey_patch_protobuf_6x.py into site-packages.

Estimated code review effort: 2 (Simple) | ~10 minutes

Possibly related PRs

Suggested reviewers: atheo89, dibryant, daniellutz

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly identifies the removal of tf2onnx from ROCm TensorFlow images and the target rhoai-2.25 branch.
Description check ✅ Passed The description includes the required sections, detailed file changes, testing instructions, and checklist status; incomplete testing is explicitly identified.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch fix/remove-tf2onnx-rocm-tf-rhoai-2.25

Comment @coderabbitai help to get the list of available commands.

@jiridanek jiridanek changed the title RHAIENG-6127: remove tf2onnx from ROCm TensorFlow images on rhoai-2.25 [rhoai-2.25] RHAIENG-6127: remove tf2onnx from ROCm TensorFlow images on rhoai-2.25 Jul 9, 2026
@jiridanek
jiridanek force-pushed the fix/remove-tf2onnx-rocm-tf-rhoai-2.25 branch from bd8ad7b to 6c93482 Compare August 3, 2026 08:43
@jiridanek

Copy link
Copy Markdown
Member Author

/build-konflux

@github-actions

github-actions Bot commented Aug 3, 2026

Copy link
Copy Markdown

Superseded by newer run: https://github.com/red-hat-data-services/notebooks/actions/runs/30798495172

CI status [antigravity]

Run: Build Notebooks (push) #307984923522/2 complete · 2 skipped
Last updated: 2026-08-03T08:43:46Z

Workflow completed with skipped jobs.

@jiridanek

Copy link
Copy Markdown
Member Author

Done. Summary:

Rebase

Rebased fix/remove-tf2onnx-rocm-tf-rhoai-2.25 onto current rhoai-2.25 and resolved conflicts in:

  • jupyter/rocm/tensorflow/ubi9-python-3.12/pyproject.toml
  • runtimes/rocm-tensorflow/ubi9-python-3.12/pyproject.toml
  • both pylock.toml files (regenerated via pylocks_generator.py)

Conflict resolution kept rhoai-2.25 CVE pins (cryptography>=46.0.7, keras>=3.14.0) while applying the tf2onnx removal and updated protobuf comment on the workbench.

Force-push

Pushed to rhds/fix/remove-tf2onnx-rocm-tf-rhoai-2.25:

  • bd8ad7b6c93482c

Konflux trigger

Posted /build-konflux on #2456.

The rebased commit is much smaller now (7 files, +8/−44) because lockfiles were regenerated cleanly against the current base instead of carrying the old broad upgrades.

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@jupyter/rocm/tensorflow/ubi9-python-3.12/pylock.toml`:
- Line 2: Update the pylock regeneration command comment to include an explicit
override input for the project’s protobuf override, using the existing override
file or configuration that enforces protobuf==6.31.1. Ensure regenerated
dependencies retain protobuf version 6.31.1.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 62fbabb4-87db-4c72-978c-fef692466b16

📥 Commits

Reviewing files that changed from the base of the PR and between 763378f and 6c93482.

📒 Files selected for processing (7)
  • jupyter/rocm/tensorflow/ubi9-python-3.12/pylock.toml
  • jupyter/rocm/tensorflow/ubi9-python-3.12/pyproject.toml
  • jupyter/rocm/tensorflow/ubi9-python-3.12/test/test_notebook.ipynb
  • runtimes/rocm-tensorflow/ubi9-python-3.12/Dockerfile.konflux.rocm
  • runtimes/rocm-tensorflow/ubi9-python-3.12/Dockerfile.rocm
  • runtimes/rocm-tensorflow/ubi9-python-3.12/pylock.toml
  • runtimes/rocm-tensorflow/ubi9-python-3.12/pyproject.toml
💤 Files with no reviewable changes (4)
  • runtimes/rocm-tensorflow/ubi9-python-3.12/Dockerfile.rocm
  • runtimes/rocm-tensorflow/ubi9-python-3.12/Dockerfile.konflux.rocm
  • jupyter/rocm/tensorflow/ubi9-python-3.12/test/test_notebook.ipynb
  • runtimes/rocm-tensorflow/ubi9-python-3.12/pyproject.toml

Comment thread jupyter/rocm/tensorflow/ubi9-python-3.12/pylock.toml Outdated
@jiridanek

Copy link
Copy Markdown
Member Author

/build-konflux

@github-actions

github-actions Bot commented Aug 3, 2026

Copy link
Copy Markdown

Superseded by newer run: https://github.com/red-hat-data-services/notebooks/actions/runs/30799009588

CI status [antigravity]

Run: Build Notebooks (pr) #307984951723/3 complete · 1 passed · 2 cancelled
Last updated: 2026-08-03T08:52:11Z after workflow update completed

Failures so far

Job Failed step Link
rocm-runtime-tensorflow-ubi9-python-3.12 · linux/amd64 [rhoai] / build Run actions/checkout@3d3c42e logs
rocm-jupyter-tensorflow-ubi9-python-3.12 · linux/amd64 [rhoai] / build Run actions/checkout@3d3c42e logs

Likely root causes

  • The workflow runs (rocm-runtime-tensorflow-ubi9-python-3.12 · linux/amd64 [rhoai] / build and rocm-jupyter-tensorflow-ubi9-python-3.12 · linux/amd64 [rhoai] / build) were cancelled during the actions/checkout step while fetching submodules (specifically cloning codeserver/ubi9-python-3.12/prefetch-input/code-server/lib/vscode).
  • There is no code or dependency failure in the pull request changes; the build jobs were explicitly cancelled or interrupted during checkout.

Suggested next steps

  • Re-run the cancelled workflow jobs to complete the build.

@jiridanek

Copy link
Copy Markdown
Member Author

/test odh-pipeline-runtime-pytorch-llmcompressor-cuda-py312-on-pull-request odh-pipeline-runtime-pytorch-llmcompressor-cuda-py312-on-pull-request

@openshift-ci

openshift-ci Bot commented Aug 3, 2026

Copy link
Copy Markdown

@jiridanek: No presubmit jobs available for red-hat-data-services/notebooks@rhoai-2.25

Details

In response to this:

/test odh-pipeline-runtime-pytorch-llmcompressor-cuda-py312-on-pull-request odh-pipeline-runtime-pytorch-llmcompressor-cuda-py312-on-pull-request

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@jiridanek

Copy link
Copy Markdown
Member Author

/retest odh-pipeline-runtime-pytorch-llmcompressor-cuda-py312-on-pull-request

@openshift-ci

openshift-ci Bot commented Aug 3, 2026

Copy link
Copy Markdown

@jiridanek: No presubmit jobs available for red-hat-data-services/notebooks@rhoai-2.25

Details

In response to this:

/retest odh-pipeline-runtime-pytorch-llmcompressor-cuda-py312-on-pull-request

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@github-actions

github-actions Bot commented Aug 3, 2026

Copy link
Copy Markdown

Superseded by newer run: https://github.com/red-hat-data-services/notebooks/actions/runs/30800968193

CI status [antigravity]

Run: Build Notebooks (pr) #307990095883/3 passed
Last updated: 2026-08-03T09:18:48Z

All matrix jobs completed successfully.

@github-actions

github-actions Bot commented Aug 3, 2026

Copy link
Copy Markdown

📋 Review Summary

This pull request correctly backports the removal of the abandoned tf2onnx package from the ROCm TensorFlow workbench and runtime images for rhoai-2.25. The dependency updates, lock files, Dockerfiles, and test notebook cleanups are consistent and complete.

🔍 General Feedback

  • The changes successfully decouple tf2onnx from the ROCm TensorFlow stack, resolving build conflicts and ensuring clean package metadata sync across pyproject.toml and pylock.toml.

I did not post any inline review comments as no real issues or concrete improvements were found in the changed files.

jiridanek and others added 2 commits August 3, 2026 11:20
Backport RHAIENG-3019 / opendatahub-io#2987 to rhoai-2.25:
- Drop tf2onnx from jupyter and runtime pyproject.toml
- Keep jupyter protobuf override at 6.31.1 (kfp vs tensorflow-rocm; RHAIENG-4324)
- Remove runtime protobuf override (resolves to 5.29.6 without kfp)
- Remove tf2onnx test/import from test_notebook.ipynb (builds on #2455)
- Drop runtime monkey_patch_protobuf COPY from Dockerfiles
- Regenerate pylock.toml for both images

Co-authored-by: Cursor <cursoragent@cursor.com>
…code

Regenerate pylock.toml comment headers via ci/generate_code.sh so they match
sync-python-lockfiles.sh output expected by CI (no pylocks_generator extras).

Co-authored-by: Cursor <cursoragent@cursor.com>
@jiridanek
jiridanek force-pushed the fix/remove-tf2onnx-rocm-tf-rhoai-2.25 branch from f5f399f to 9205e2e Compare August 3, 2026 09:20
@jiridanek

Copy link
Copy Markdown
Member Author

/retest odh-pipeline-runtime-pytorch-llmcompressor-cuda-py312-on-pull-request

@openshift-ci

openshift-ci Bot commented Aug 3, 2026

Copy link
Copy Markdown

@jiridanek: No presubmit jobs available for red-hat-data-services/notebooks@rhoai-2.25

Details

In response to this:

/retest odh-pipeline-runtime-pytorch-llmcompressor-cuda-py312-on-pull-request

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@jiridanek

Copy link
Copy Markdown
Member Author

/test odh-pipeline-runtime-pytorch-llmcompressor-cuda-py312-on-pull-request odh-pipeline-runtime-pytorch-llmcompressor-cuda-py312-on-pull-request

@openshift-ci

openshift-ci Bot commented Aug 3, 2026

Copy link
Copy Markdown

@jiridanek: No presubmit jobs available for red-hat-data-services/notebooks@rhoai-2.25

Details

In response to this:

/test odh-pipeline-runtime-pytorch-llmcompressor-cuda-py312-on-pull-request odh-pipeline-runtime-pytorch-llmcompressor-cuda-py312-on-pull-request

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@jiridanek

Copy link
Copy Markdown
Member Author

/build-konflux

@github-actions

github-actions Bot commented Aug 3, 2026

Copy link
Copy Markdown

Superseded by newer run: https://github.com/red-hat-data-services/notebooks/actions/runs/30800970549

CI status [antigravity]

Run: Build Notebooks (push) #308009681932/2 complete · 2 skipped
Last updated: 2026-08-03T09:21:01Z

Workflow completed with skipped jobs.

@github-actions

github-actions Bot commented Aug 3, 2026

Copy link
Copy Markdown

CI status [antigravity]

Run: Build Notebooks (pr) #308009705493/3 passed
Last updated: 2026-08-03T13:00:14Z

All matrix jobs completed successfully.

@jiridanek

Copy link
Copy Markdown
Member Author

/test odh-pipeline-runtime-tensorflow-rocm-py312-on-pull-request

@openshift-ci

openshift-ci Bot commented Aug 3, 2026

Copy link
Copy Markdown

@jiridanek: No presubmit jobs available for red-hat-data-services/notebooks@rhoai-2.25

Details

In response to this:

/test odh-pipeline-runtime-tensorflow-rocm-py312-on-pull-request

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-ci

openshift-ci Bot commented Aug 6, 2026

Copy link
Copy Markdown

PR needs rebase.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant