Skip to content
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.

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

[RHOAI] Updated image manifests with AMD images for minimal pytorch and tensorflow #361

Merged
merged 1 commit into from
Sep 27, 2024

Conversation

dibryant
Copy link

Fixes for https://issues.redhat.com/browse/RHOAIENG-6447
Updated imagestream for AMD minimal pytorch and tensorflow for users that want OOTB workbench images with AMD libraries & package

@openshift-ci openshift-ci bot requested review from caponetto and jiridanek August 26, 2024 16:24
Copy link
Member

@atheo89 atheo89 left a comment

Choose a reason for hiding this comment

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

Hi Diamond, we need to modify as well the kustomization.yaml file to incorporate the new images. Moreover, I left some more comments on the review.

manifests/base/rstudio-buildconfig.yaml Outdated Show resolved Hide resolved
rstudio/rhel9-python-3.9/Dockerfile Outdated Show resolved Hide resolved
Copy link
Member

@jstourac jstourac left a comment

Choose a reason for hiding this comment

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

Put some comments. Also, I think that this is missing the changes for kustomization.yaml?

@dibryant dibryant force-pushed the amd branch 2 times, most recently from a4b2fdb to 2a0f1c7 Compare August 28, 2024 12:55
manifests/base/params.env Outdated Show resolved Hide resolved
manifests/base/commit.env Outdated Show resolved Hide resolved
@dibryant dibryant force-pushed the amd branch 5 times, most recently from 58f9423 to abb29d9 Compare September 5, 2024 13:21
;;
odh-rocm-tensorflow-notebook-image-n)
expected_name="odh-notebook-jupyter-rocm-tensorflow-ubi9-python-3.9"
expected_commitref="2024a"
Copy link
Member

@jstourac jstourac Sep 11, 2024

Choose a reason for hiding this comment

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

As we plan to include these images in 2024b and we don't have any image build for 2024a anyway, keep the following there for now so this CI pass and we'll update later:

#expected_commitref="release-2024b"
expected_commitref="main"

@dibryant dibryant force-pushed the amd branch 2 times, most recently from 2de578e to aa22626 Compare September 11, 2024 13:36
@jstourac
Copy link
Member

@atheo89 a curious question - since these will be part of 2024b, are we sure we want the rocm records mentioned in the following files?

Will the relevant 2024b configuration be copied from main or 2024a files there?

@atheo89
Copy link
Member

atheo89 commented Sep 13, 2024

@atheo89 a curious question - since these will be part of 2024b, are we sure we want the rocm records mentioned in the following files?

Hey @jstourac, correct. We should remove them from 2024a, probably we had to keep them only in main till the 2024b branch be ready

@atheo89
Copy link
Member

atheo89 commented Sep 16, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Sep 16, 2024
Copy link
Member

@harshad16 harshad16 left a comment

Choose a reason for hiding this comment

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

Lets upgrade to python 3.11, so we are ready for 2024b release.

Comment on lines 28 to 30
odh-rocm-minimal-notebook-image-commit-n=6be50fc
odh-rocm-pytorch-notebook-image-commit-n=6be50fc
odh-rocm-tensorflow-notebook-image-commit-n=6be50fc
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
odh-rocm-minimal-notebook-image-commit-n=6be50fc
odh-rocm-pytorch-notebook-image-commit-n=6be50fc
odh-rocm-tensorflow-notebook-image-commit-n=6be50fc
odh-rocm-minimal-notebook-image-commit-n=31ad6bc
odh-rocm-pytorch-notebook-image-commit-n=31ad6bc
odh-rocm-tensorflow-notebook-image-commit-n=31ad6bc

Comment on lines 228 to 242
odh-rocm-minimal-notebook-image-n)
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
#expected_commitref="2024b"
expected_commitref="main"
expected_build_name="rocm-jupyter-minimal-ubi9-python-3.9-amd64"
;;
odh-rocm-pytorch-notebook-image-n)
expected_name="odh-notebook-jupyter-rocm-pytorch-ubi9-python-3.9"
#expected_commitref="2024b"
expected_commitref="main"
expected_build_name="rocm-jupyter-pytorch-ubi9-python-3.9-amd64"
;;
odh-rocm-tensorflow-notebook-image-n)
expected_name="odh-notebook-jupyter-rocm-tensorflow-ubi9-python-3.9"
#expected_commitref="2024b"
expected_commitref="main"
expected_build_name="rocm-jupyter-tensorflow-ubi9-python-3.9-amd64"
;;
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
odh-rocm-minimal-notebook-image-n)
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
#expected_commitref="2024b"
expected_commitref="main"
expected_build_name="rocm-jupyter-minimal-ubi9-python-3.9-amd64"
;;
odh-rocm-pytorch-notebook-image-n)
expected_name="odh-notebook-jupyter-rocm-pytorch-ubi9-python-3.9"
#expected_commitref="2024b"
expected_commitref="main"
expected_build_name="rocm-jupyter-pytorch-ubi9-python-3.9-amd64"
;;
odh-rocm-tensorflow-notebook-image-n)
expected_name="odh-notebook-jupyter-rocm-tensorflow-ubi9-python-3.9"
#expected_commitref="2024b"
expected_commitref="main"
expected_build_name="rocm-jupyter-tensorflow-ubi9-python-3.9-amd64"
;;
odh-rocm-minimal-notebook-image-n)
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.11"
#expected_commitref="2024b"
expected_commitref="main"
expected_build_name="rocm-jupyter-minimal-ubi9-python-3.11-amd64"
;;
odh-rocm-pytorch-notebook-image-n)
expected_name="odh-notebook-jupyter-rocm-pytorch-ubi9-python-3.11"
#expected_commitref="2024b"
expected_commitref="main"
expected_build_name="rocm-jupyter-pytorch-ubi9-python-3.11-amd64"
;;
odh-rocm-tensorflow-notebook-image-n)
expected_name="odh-notebook-jupyter-rocm-tensorflow-ubi9-python-3.11"
#expected_commitref="2024b"
expected_commitref="main"
expected_build_name="rocm-jupyter-tensorflow-ubi9-python-3.11-amd64"
;;

tags:
# N Version of the image
- annotations:
opendatahub.io/notebook-software: '[{"name":"ROCm","version":"6.1"},{"name":"Python","version":"v3.9"}]'
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
opendatahub.io/notebook-software: '[{"name":"ROCm","version":"6.1"},{"name":"Python","version":"v3.9"}]'
opendatahub.io/notebook-software: '[{"name":"ROCm","version":"6.1"},{"name":"Python","version":"v3.11"}]'

tags:
# N Version of the image
- annotations:
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"},{"name":"ROCm-PyTorch","version":"2.3"}]'
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"},{"name":"ROCm-PyTorch","version":"2.3"}]'
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.11"},{"name":"ROCm-PyTorch","version":"2.3"}]'

tags:
# N Version of the image
- annotations:
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"},{"name":"ROCm-TensorFlow","version":"2.15"}]'
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"},{"name":"ROCm-TensorFlow","version":"2.15"}]'
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.11"},{"name":"ROCm-TensorFlow","version":"2.15"}]'

Comment on lines 28 to 30
odh-rocm-minimal-notebook-image-n=quay.io/modh/rocm-notebooks@sha256:41983cdadfb53478115d1e80bafc8489adb4a94ef794b6823b7a30f6aa1809b9
odh-rocm-pytorch-notebook-image-n=quay.io/modh/rocm-notebooks@sha256:807fb7cfc41aaeb3a81bea658fd429604b23582b6b4793c567b2b6f9f9ebbcf6
odh-rocm-tensorflow-notebook-image-n=quay.io/modh/rocm-notebooks@sha256:4f9694eeda941989d30bf8d59c056c73ed9ed4f4a623a578d48ac5ad0a4d9d14
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
odh-rocm-minimal-notebook-image-n=quay.io/modh/rocm-notebooks@sha256:41983cdadfb53478115d1e80bafc8489adb4a94ef794b6823b7a30f6aa1809b9
odh-rocm-pytorch-notebook-image-n=quay.io/modh/rocm-notebooks@sha256:807fb7cfc41aaeb3a81bea658fd429604b23582b6b4793c567b2b6f9f9ebbcf6
odh-rocm-tensorflow-notebook-image-n=quay.io/modh/rocm-notebooks@sha256:4f9694eeda941989d30bf8d59c056c73ed9ed4f4a623a578d48ac5ad0a4d9d14
odh-rocm-minimal-notebook-image-n=quay.io/modh/rocm-notebooks@sha256:64a90dbbe594463ff4ee6974fe8e555dc71b93fe3c3a53330b0e760784b717c0
odh-rocm-pytorch-notebook-image-n=quay.io/modh/rocm-notebooks@sha256:49b4c02cc00cbc4a1b1fd2b446e086d3f5ebbd987f998431d036b5c7208cab06
odh-rocm-tensorflow-notebook-image-n=quay.io/modh/rocm-notebooks@sha256:1eda675fa9b67ac3c71d29b7391a8142946972bb92912908927d9fa5bf7ef4aa

@openshift-ci openshift-ci bot removed the lgtm label Sep 25, 2024
@dibryant dibryant force-pushed the amd branch 3 times, most recently from 8db13dc to 70c7592 Compare September 25, 2024 13:28
@jiridanek
Copy link
Member

@jiridanek
Copy link
Member

managed to reproduce for myself

$ mkdir amd
$ git diff --name-only origin/main amd
fatal: ambiguous argument 'amd': both revision and filename
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'

The fix is, as the error says, to do

$ git diff --name-only origin/main amd --

@jiridanek
Copy link
Member

@jiridanek
Copy link
Member

/lgtm

Copy link
Member

@harshad16 harshad16 left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

thanks for the work 💯

Copy link

openshift-ci bot commented Sep 27, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: harshad16

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

The pull request process is described here

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

@jiridanek
Copy link
Member

/override "Generate job matrix"

Copy link

openshift-ci bot commented Sep 27, 2024

@jiridanek: Overrode contexts on behalf of jiridanek: Generate job matrix

In response to this:

/override "Generate job matrix"

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
Member

/override "Generate job matrix (pull_request)"

Copy link

openshift-ci bot commented Sep 27, 2024

@jiridanek: /override requires failed status contexts, check run or a prowjob name to operate on.
The following unknown contexts/checkruns were given:

  • Generate job matrix (pull_request)

Only the following failed contexts/checkruns were expected:

  • build
  • ci/prow/images
  • code/snyk (Red Hat OpenShift AI (RHOAI))
  • pull-ci-red-hat-data-services-notebooks-main-images
  • tide

If you are trying to override a checkrun that has a space in it, you must put a double quote on the context.

In response to this:

/override "Generate job matrix (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-merge-bot openshift-merge-bot bot merged commit f53511d into red-hat-data-services:main Sep 27, 2024
9 of 10 checks passed
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.

6 participants