Skip to content

Adding AMD ROCm 4.5 to the common image. #141

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

Open
boberfly wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Adding AMD ROCm 4.5 to the common image. #141

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
8 changes: 6 additions & 2 deletions ci-common/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions ci-common/README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions ci-common/image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ implicit_packages:
- dts
- sonar
- conan
- rocm
docker_from: nvidia/cudagl:${ASWF_CUDA_VERSION}-devel-centos7
docker_package_version: $CI_COMMON_VERSION
docker_commands: |
Expand All @@ -24,8 +25,8 @@ docker_commands: |
RUN mkdir /opt/aswf
WORKDIR /opt/aswf

ENV LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib64:/opt/rh/httpd24/root/usr/lib64:/opt/rh/devtoolset-${ASWF_DTS_VERSION}/root/usr/lib64:/opt/rh/devtoolset-${ASWF_DTS_VERSION}/root/usr/lib:${LD_LIBRARY_PATH} \
PATH=/opt/rh/rh-git218/root/usr/bin:/usr/local/bin:/opt/rh/devtoolset-${ASWF_DTS_VERSION}/root/usr/bin:/opt/app-root/src/bin:/opt/rh/devtoolset-${ASWF_DTS_VERSION}/root/usr/bin/:/usr/local/sbin:/usr/sbin:/usr/bin:/sbin:/bin \
ENV LD_LIBRARY_PATH=/opt/rocm/lib:/usr/local/lib:/usr/local/lib64:/opt/rh/httpd24/root/usr/lib64:/opt/rh/devtoolset-${ASWF_DTS_VERSION}/root/usr/lib64:/opt/rh/devtoolset-${ASWF_DTS_VERSION}/root/usr/lib:${LD_LIBRARY_PATH} \
Copy link
Contributor

@aloysbaillet aloysbaillet Nov 12, 2021

Choose a reason for hiding this comment

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

For safety I would prefer if you added the rocm path at the end of the LD_LIBRARY_PATH

PATH=/opt/rh/rh-git218/root/usr/bin:/usr/local/bin:/opt/rh/devtoolset-${ASWF_DTS_VERSION}/root/usr/bin:/opt/app-root/src/bin:/opt/rh/devtoolset-${ASWF_DTS_VERSION}/root/usr/bin/:/opt/rocm/hcc/bin:/opt/rocm/hip/bin:/opt/rocm/bin:/opt/rocm/hcc/bin:/usr/local/sbin:/usr/sbin:/usr/bin:/sbin:/bin \
PERL5LIB=/opt/rh/rh-git218/root/usr/share/perl5/vendor_perl \
MANPATH=/opt/rh/rh-git218/root/usr/share/man

Expand Down
3 changes: 3 additions & 0 deletions packages/common/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ ARG ASWF_CLANG_VERSION
ARG ASWF_CUDA_VERSION
ARG ASWF_DTS_VERSION
ARG ASWF_NINJA_VERSION
ARG ASWF_ROCM_VERSION


#################### ci-centos7-gl-os ####################
Expand All @@ -24,6 +25,8 @@ ARG ASWF_CUDA_VERSION
ENV ASWF_CUDA_VERSION=${ASWF_CUDA_VERSION}
ARG ASWF_DTS_VERSION
ENV ASWF_DTS_VERSION=${ASWF_DTS_VERSION}
ARG ASWF_ROCM_VERSION
ENV ASWF_ROCM_VERSION=${ASWF_ROCM_VERSION}

COPY ../scripts/common/install_yumpackages.sh \
/tmp/
Expand Down
2 changes: 2 additions & 0 deletions python/aswfdocker/data/versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ versions:
ASWF_CONAN_PYTHON_VERSION: "3.9.5"
ASWF_NINJA_VERSION: "1.10.1"
ASWF_SONAR_VERSION: "4.6.2.2472"
ASWF_ROCM_VERSION: "4.5"
"1-clang6":
parent_versions: ["1"]
major_version: "1"
Expand Down Expand Up @@ -66,6 +67,7 @@ versions:
ASWF_CCACHE_VERSION: "4.0"
ASWF_NINJA_VERSION: "1.10.1"
ASWF_SONAR_VERSION: "4.6.2.2472"
ASWF_ROCM_VERSION: "4.5"
"2-clang10":
parent_versions: ["2"]
major_version: "2"
Expand Down
4 changes: 4 additions & 0 deletions scripts/common/install_yumpackages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,4 +205,8 @@ yum install -y \
yasm-devel \
zvbi-devel

# Install AMD ROCm
echo -e "[ROCm]\nname=ROCm\nbaseurl=https://repo.radeon.com/rocm/yum/$ASWF_ROCM_VERSION\nenabled=1\ngpgcheck=0" >> /etc/yum.repos.d/rocm.repo
yum install -y rocm-dev rocm-libs

yum clean all