diff --git a/ci-common/Dockerfile b/ci-common/Dockerfile index 7b744a3f..80f3517e 100644 --- a/ci-common/Dockerfile +++ b/ci-common/Dockerfile @@ -17,6 +17,7 @@ ARG ASWF_CCACHE_VERSION ARG ASWF_DTS_VERSION ARG ASWF_SONAR_VERSION ARG ASWF_CONAN_VERSION +ARG ASWF_ROCM_VERSION ARG ASWF_CONAN_PYTHON_VERSION @@ -40,6 +41,7 @@ ARG ASWF_CCACHE_VERSION ARG ASWF_DTS_VERSION ARG ASWF_SONAR_VERSION ARG ASWF_CONAN_VERSION +ARG ASWF_ROCM_VERSION ARG ASWF_CONAN_PYTHON_VERSION @@ -61,6 +63,7 @@ LABEL io.aswf.docker.versions.ccache="$ASWF_CCACHE_VERSION" LABEL io.aswf.docker.versions.dts="$ASWF_DTS_VERSION" LABEL io.aswf.docker.versions.sonar="$ASWF_SONAR_VERSION" LABEL io.aswf.docker.versions.conan="$ASWF_CONAN_VERSION" +LABEL io.aswf.docker.versions.rocm="$ASWF_ROCM_VERSION" ENV ASWF_ORG=${ASWF_ORG} @@ -74,6 +77,7 @@ ENV ASWF_CCACHE_VERSION=$ASWF_CCACHE_VERSION ENV ASWF_DTS_VERSION=$ASWF_DTS_VERSION ENV ASWF_SONAR_VERSION=$ASWF_SONAR_VERSION ENV ASWF_CONAN_VERSION=$ASWF_CONAN_VERSION +ENV ASWF_ROCM_VERSION=$ASWF_ROCM_VERSION ENV ASWF_CONAN_PYTHON_VERSION=$ASWF_CONAN_PYTHON_VERSION @@ -92,8 +96,8 @@ RUN /tmp/install_yumpackages.sh 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} \ + 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 diff --git a/ci-common/README.md b/ci-common/README.md index 39ce77f3..ab2e49c5 100644 --- a/ci-common/README.md +++ b/ci-common/README.md @@ -27,6 +27,7 @@ Contains: * dts-6 * sonar-4.6.2.2472 * conan-1.42.0 +* rocm-4.5 ## [aswf/ci-common:1-clang7.8](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=1-clang7.8) @@ -38,6 +39,7 @@ Contains: * dts-6 * sonar-4.6.2.2472 * conan-1.42.0 +* rocm-4.5 ## [aswf/ci-common:1-clang8.8](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=1-clang8.8) @@ -49,6 +51,7 @@ Contains: * dts-6 * sonar-4.6.2.2472 * conan-1.42.0 +* rocm-4.5 ## [aswf/ci-common:1-clang9.8](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=1-clang9.8) @@ -60,6 +63,7 @@ Contains: * dts-6 * sonar-4.6.2.2472 * conan-1.42.0 +* rocm-4.5 ## [aswf/ci-common:1-clang10.8](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=1-clang10.8) @@ -71,6 +75,7 @@ Contains: * dts-6 * sonar-4.6.2.2472 * conan-1.42.0 +* rocm-4.5 ## [aswf/ci-common:2-clang10.4](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=2-clang10.4) @@ -82,6 +87,7 @@ Contains: * dts-9 * sonar-4.6.2.2472 * conan-1.42.0 +* rocm-4.5 ## [aswf/ci-common:2-clang11.4](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=2-clang11.4) @@ -93,4 +99,5 @@ Contains: * dts-9 * sonar-4.6.2.2472 * conan-1.42.0 +* rocm-4.5 diff --git a/ci-common/image.yaml b/ci-common/image.yaml index 264cca49..12670677 100644 --- a/ci-common/image.yaml +++ b/ci-common/image.yaml @@ -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: | @@ -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} \ + 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 diff --git a/packages/common/Dockerfile b/packages/common/Dockerfile index 9ebbbbf2..9a68c1ba 100644 --- a/packages/common/Dockerfile +++ b/packages/common/Dockerfile @@ -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 #################### @@ -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/ diff --git a/python/aswfdocker/data/versions.yaml b/python/aswfdocker/data/versions.yaml index 8c25bbe2..4e6558a1 100644 --- a/python/aswfdocker/data/versions.yaml +++ b/python/aswfdocker/data/versions.yaml @@ -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" @@ -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" diff --git a/scripts/common/install_yumpackages.sh b/scripts/common/install_yumpackages.sh index a8690b0f..2d889462 100755 --- a/scripts/common/install_yumpackages.sh +++ b/scripts/common/install_yumpackages.sh @@ -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