Skip to content

Commit 79cddf0

Browse files
moulalismoulalis
committed
Merge remote-tracking branch 'upstream/main' into rhoai-3.0
2 parents c42bf6b + 4b3f61f commit 79cddf0

File tree

25 files changed

+514
-101
lines changed

25 files changed

+514
-101
lines changed

‎.tekton/odh-base-image-rocm-6-3-py312-c9s-pull-request.yaml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# yamllint disable-file
2+
# This pipeline is autogenerated by scripts/generate_pull_request_pipelineruns.py
3+
---
4+
apiVersion: tekton.dev/v1
5+
kind: PipelineRun
6+
metadata:
7+
annotations:
8+
build.appstudio.openshift.io/repo: https://github.com/opendatahub-io/notebooks?rev={{revision}}
9+
build.appstudio.redhat.com/commit_sha: '{{revision}}'
10+
build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
11+
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
12+
pipelinesascode.tekton.dev/cancel-in-progress: 'true'
13+
pipelinesascode.tekton.dev/max-keep-runs: '3'
14+
pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-base\-image\-rocm\-py312\-c9s|base\-images/rocm/6\.3/c9s\-python\-3\.12)
15+
pipelinesascode.tekton.dev/on-cel-expression: |
16+
event == "pull_request" && target_branch == "main" && ( "base-images/rocm/6.3/c9s-python-3.12/**".pathChanged() || ".tekton/odh-base-image-rocm-6-3-py312-c9s-pull-request.yaml".pathChanged() )
17+
&& body.repository.full_name == "opendatahub-io/notebooks"
18+
labels:
19+
appstudio.openshift.io/application: opendatahub-release
20+
appstudio.openshift.io/component: odh-base-image-rocm-py312-c9s
21+
pipelines.appstudio.openshift.io/type: build
22+
name: odh-base-image-rocm-6-3-py312-c9s-on-pull-request
23+
namespace: open-data-hub-tenant
24+
spec:
25+
timeouts:
26+
pipeline: 3h
27+
params:
28+
- name: git-url
29+
value: '{{source_url}}'
30+
- name: revision
31+
value: '{{revision}}'
32+
- name: output-image
33+
value: quay.io/opendatahub/odh-base-image-rocm-py312-c9s:on-pr-{{revision}}
34+
- name: image-expires-after
35+
value: 5d
36+
- name: build-platforms
37+
value:
38+
- linux/x86_64
39+
- name: dockerfile
40+
value: base-images/rocm/6.3/c9s-python-3.12/Dockerfile.rocm
41+
- name: path-context
42+
value: .
43+
pipelineRef:
44+
name: multiarch-pull-request-pipeline
45+
taskRunTemplate:
46+
serviceAccountName: build-pipeline-odh-base-image-rocm-py312-c9s-poc
47+
workspaces:
48+
- name: git-auth
49+
secret:
50+
secretName: '{{ git_auth_secret }}'
51+
status: {}

‎.tekton/odh-base-image-rocm-6-3-py312-c9s-push.yaml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
apiVersion: tekton.dev/v1
2+
kind: PipelineRun
3+
metadata:
4+
annotations:
5+
build.appstudio.openshift.io/repo: https://github.com/opendatahub-io/notebooks?rev={{revision}}
6+
build.appstudio.redhat.com/commit_sha: '{{revision}}'
7+
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
8+
pipelinesascode.tekton.dev/cancel-in-progress: "false"
9+
pipelinesascode.tekton.dev/max-keep-runs: "3"
10+
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "main" && ( "base-images/rocm/6.3/c9s-python-3.12/**".pathChanged() || ".tekton/odh-base-image-rocm-6-3-py312-c9s-push.yaml".pathChanged() )
11+
creationTimestamp:
12+
labels:
13+
appstudio.openshift.io/application: opendatahub-release
14+
appstudio.openshift.io/component: odh-base-image-rocm-py312-c9s
15+
pipelines.appstudio.openshift.io/type: build
16+
name: odh-base-image-rocm-6-3-py312-c9s-on-push
17+
namespace: open-data-hub-tenant
18+
spec:
19+
params:
20+
- name: git-url
21+
value: '{{source_url}}'
22+
- name: revision
23+
value: '{{revision}}'
24+
- name: output-image
25+
value: quay.io/opendatahub/odh-base-image-rocm-py312-c9s:{{revision}}
26+
- name: dockerfile
27+
value: base-images/rocm/6.3/c9s-python-3.12/Dockerfile.rocm
28+
- name: path-context
29+
value: .
30+
- name: additional-tags
31+
value:
32+
- '{{target_branch}}-{{revision}}'
33+
- v6.3
34+
pipelineRef:
35+
name: singlearch-push-pipeline
36+
taskRunTemplate:
37+
serviceAccountName: build-pipeline-odh-base-image-rocm-py312-c9s-poc
38+
workspaces:
39+
- name: git-auth
40+
secret:
41+
secretName: '{{ git_auth_secret }}'
42+
status: {}

‎.tekton/odh-base-image-rocm-6-3-py312-ubi9-pull-request.yaml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# yamllint disable-file
2+
# This pipeline is autogenerated by scripts/generate_pull_request_pipelineruns.py
3+
---
4+
apiVersion: tekton.dev/v1
5+
kind: PipelineRun
6+
metadata:
7+
annotations:
8+
build.appstudio.openshift.io/repo: https://github.com/opendatahub-io/notebooks?rev={{revision}}
9+
build.appstudio.redhat.com/commit_sha: '{{revision}}'
10+
build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
11+
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
12+
pipelinesascode.tekton.dev/cancel-in-progress: 'true'
13+
pipelinesascode.tekton.dev/max-keep-runs: '3'
14+
pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-base\-image\-rocm\-py312\-ubi9|base\-images/rocm/6\.3/ubi9\-python\-3\.12)
15+
pipelinesascode.tekton.dev/on-cel-expression: |
16+
event == "pull_request" && target_branch == "main" && ( "base-images/rocm/6.3/ubi9-python-3.12/**".pathChanged() || ".tekton/odh-base-image-rocm-6-3-py312-ubi9-pull-request.yaml".pathChanged() )
17+
&& body.repository.full_name == "opendatahub-io/notebooks"
18+
labels:
19+
appstudio.openshift.io/application: opendatahub-release
20+
appstudio.openshift.io/component: odh-base-image-rocm-py312-ubi9
21+
pipelines.appstudio.openshift.io/type: build
22+
name: odh-base-image-rocm-6-3-py312-ubi9-on-pull-request
23+
namespace: open-data-hub-tenant
24+
spec:
25+
timeouts:
26+
pipeline: 3h
27+
params:
28+
- name: git-url
29+
value: '{{source_url}}'
30+
- name: revision
31+
value: '{{revision}}'
32+
- name: output-image
33+
value: quay.io/opendatahub/odh-base-image-rocm-py312-ubi9:on-pr-{{revision}}
34+
- name: image-expires-after
35+
value: 5d
36+
- name: build-platforms
37+
value:
38+
- linux/x86_64
39+
- name: dockerfile
40+
value: base-images/rocm/6.3/ubi9-python-3.12/Dockerfile.rocm
41+
- name: path-context
42+
value: .
43+
pipelineRef:
44+
name: multiarch-pull-request-pipeline
45+
taskRunTemplate:
46+
serviceAccountName: build-pipeline-odh-base-image-rocm-py312-ubi9-poc
47+
workspaces:
48+
- name: git-auth
49+
secret:
50+
secretName: '{{ git_auth_secret }}'
51+
status: {}

‎.tekton/odh-base-image-rocm-6-3-py312-ubi9-push.yaml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
apiVersion: tekton.dev/v1
2+
kind: PipelineRun
3+
metadata:
4+
annotations:
5+
build.appstudio.openshift.io/repo: https://github.com/opendatahub-io/notebooks?rev={{revision}}
6+
build.appstudio.redhat.com/commit_sha: '{{revision}}'
7+
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
8+
pipelinesascode.tekton.dev/cancel-in-progress: "false"
9+
pipelinesascode.tekton.dev/max-keep-runs: "3"
10+
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "main" && ( "base-images/rocm/6.3/ubi9-python-3.12/**".pathChanged() || ".tekton/odh-base-image-rocm-6-3-py312-ubi9-push.yaml".pathChanged() )
11+
creationTimestamp:
12+
labels:
13+
appstudio.openshift.io/application: opendatahub-release
14+
appstudio.openshift.io/component: odh-base-image-rocm-py312-ubi9
15+
pipelines.appstudio.openshift.io/type: build
16+
name: odh-base-image-rocm-6-3-py312-ubi9-on-push
17+
namespace: open-data-hub-tenant
18+
spec:
19+
params:
20+
- name: git-url
21+
value: '{{source_url}}'
22+
- name: revision
23+
value: '{{revision}}'
24+
- name: output-image
25+
value: quay.io/opendatahub/odh-base-image-rocm-py312-ubi9:{{revision}}
26+
- name: dockerfile
27+
value: base-images/rocm/6.3/ubi9-python-3.12/Dockerfile.rocm
28+
- name: path-context
29+
value: .
30+
- name: additional-tags
31+
value:
32+
- '{{target_branch}}-{{revision}}'
33+
- v6.3
34+
pipelineRef:
35+
name: singlearch-push-pipeline
36+
taskRunTemplate:
37+
serviceAccountName: build-pipeline-odh-base-image-rocm-py312-ubi9-poc
38+
workspaces:
39+
- name: git-auth
40+
secret:
41+
secretName: '{{ git_auth_secret }}'
42+
status: {}

‎base-images/rocm/6.3/c9s-python-3.12/Dockerfile.rocm‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
####################
2+
# base #
3+
####################
4+
FROM quay.io/sclorg/python-312-c9s:c9s AS base
5+
6+
WORKDIR /opt/app-root/bin
7+
8+
########################
9+
# rocm-base #
10+
########################
11+
FROM base AS rocm-base
12+
13+
USER 0
14+
WORKDIR /opt/app-root/bin
15+
16+
# Please keep in sync with ROCm/python3.12 dependent images
17+
ARG ROCM_VERSION=6.3.4
18+
ARG AMDGPU_VERSION=6.3.4
19+
20+
# Install the ROCm rpms
21+
# ref: https://github.com/ROCm/ROCm-docker/blob/master/dev/Dockerfile-centos-7-complete
22+
# Note: Based on 6.4 above new package mivisionx is a pre-requistes, which bring in more dependent packages
23+
# so we are only installing meta packages of rocm
24+
# ref: https://rocm.docs.amd.com/projects/install-on-linux/en/develop/reference/package-manager-integration.html#packages-in-rocm-programming-models
25+
RUN echo "[ROCm]" > /etc/yum.repos.d/rocm.repo && \
26+
echo "name=ROCm" >> /etc/yum.repos.d/rocm.repo && \
27+
echo "baseurl=https://repo.radeon.com/rocm/rhel9/$ROCM_VERSION/main" >> /etc/yum.repos.d/rocm.repo && \
28+
echo "enabled=1" >> /etc/yum.repos.d/rocm.repo && \
29+
echo "gpgcheck=0" >> /etc/yum.repos.d/rocm.repo && \
30+
echo "[amdgpu]" > /etc/yum.repos.d/amdgpu.repo && \
31+
echo "name=amdgpu" >> /etc/yum.repos.d/amdgpu.repo && \
32+
echo "baseurl=https://repo.radeon.com/amdgpu/$AMDGPU_VERSION/rhel/9.4/main/x86_64" >> /etc/yum.repos.d/amdgpu.repo && \
33+
echo "enabled=1" >> /etc/yum.repos.d/amdgpu.repo && \
34+
echo "gpgcheck=0" >> /etc/yum.repos.d/amdgpu.repo && \
35+
dnf install -y \
36+
rocm-core hip-runtime-amd \
37+
# system utilities
38+
rocm-smi-lib rocminfo \
39+
rocblas rocsolver rocfft rocrand rocsparse miopen-hip rccl \
40+
# HIP (Heterogeneous-compute Interface for Portability)
41+
hipblas hipblaslt hipfft hipsparse hiprand hipsolver \
42+
# suitesparse's /lib64/libspqr.so.2.0.9 needs libtbb.so.2
43+
tbb && \
44+
dnf clean all && rm -rf /var/cache/yum
45+
46+
# https://rocm.docs.amd.com/projects/install-on-linux/en/latest/install/post-install.html#configure-rocm-shared-objects
47+
RUN tee --append /etc/ld.so.conf.d/rocm.conf <<EOF
48+
/opt/rocm/lib
49+
/opt/rocm/lib64
50+
EOF
51+
52+
RUN ldconfig
53+
54+
# Restore user workspace
55+
USER 1001
56+
WORKDIR /opt/app-root/src

‎base-images/rocm/6.3/ubi9-python-3.12/Dockerfile.rocm‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
####################
2+
# base #
3+
####################
4+
FROM registry.access.redhat.com/ubi9/python-312:latest AS base
5+
6+
WORKDIR /opt/app-root/bin
7+
8+
########################
9+
# rocm-base #
10+
########################
11+
FROM base AS rocm-base
12+
13+
USER 0
14+
WORKDIR /opt/app-root/bin
15+
16+
# Please keep in sync with ROCm/python3.12 dependent images
17+
ARG ROCM_VERSION=6.3.4
18+
ARG AMDGPU_VERSION=6.3.4
19+
20+
# Install the ROCm rpms
21+
# ref: https://github.com/ROCm/ROCm-docker/blob/master/dev/Dockerfile-centos-7-complete
22+
# Note: Based on 6.4 above new package mivisionx is a pre-requistes, which bring in more dependent packages
23+
# so we are only installing meta packages of rocm
24+
# ref: https://rocm.docs.amd.com/projects/install-on-linux/en/develop/reference/package-manager-integration.html#packages-in-rocm-programming-models
25+
RUN echo "[ROCm]" > /etc/yum.repos.d/rocm.repo && \
26+
echo "name=ROCm" >> /etc/yum.repos.d/rocm.repo && \
27+
echo "baseurl=https://repo.radeon.com/rocm/rhel9/$ROCM_VERSION/main" >> /etc/yum.repos.d/rocm.repo && \
28+
echo "enabled=1" >> /etc/yum.repos.d/rocm.repo && \
29+
echo "gpgcheck=0" >> /etc/yum.repos.d/rocm.repo && \
30+
echo "[amdgpu]" > /etc/yum.repos.d/amdgpu.repo && \
31+
echo "name=amdgpu" >> /etc/yum.repos.d/amdgpu.repo && \
32+
echo "baseurl=https://repo.radeon.com/amdgpu/$AMDGPU_VERSION/rhel/9.4/main/x86_64" >> /etc/yum.repos.d/amdgpu.repo && \
33+
echo "enabled=1" >> /etc/yum.repos.d/amdgpu.repo && \
34+
echo "gpgcheck=0" >> /etc/yum.repos.d/amdgpu.repo && \
35+
dnf install -y \
36+
rocm-core hip-runtime-amd \
37+
# system utilities
38+
rocm-smi-lib rocminfo \
39+
rocblas rocsolver rocfft rocrand rocsparse miopen-hip rccl \
40+
# HIP (Heterogeneous-compute Interface for Portability)
41+
hipblas hipblaslt hipfft hipsparse hiprand hipsolver \
42+
# suitesparse's /lib64/libspqr.so.2.0.9 needs libtbb.so.2
43+
tbb && \
44+
dnf clean all && rm -rf /var/cache/yum
45+
46+
# https://rocm.docs.amd.com/projects/install-on-linux/en/latest/install/post-install.html#configure-rocm-shared-objects
47+
RUN tee --append /etc/ld.so.conf.d/rocm.conf <<EOF
48+
/opt/rocm/lib
49+
/opt/rocm/lib64
50+
EOF
51+
52+
RUN ldconfig
53+
54+
# Restore user workspace
55+
USER 1001
56+
WORKDIR /opt/app-root/src

0 commit comments

Comments
 (0)