Merge pull request #85 from RadeonOpenCompute/rocm4.5.2_update

update the dev and terminal dockerfile for ROCm4.5.2
2023-04-23 17:53:00 +03:00 · 2022-01-19 12:40:39 -06:00
parent 3dcec2f641 6518b21c32
commit aad81064b9
10 changed files with 86 additions and 103 deletions
--- a/build_all.sh
+++ b/build_all.sh
@@ -0,0 +1,36 @@
+ROCM_VERSION=4.5.2
+AMDGPU_VERSION=21.40.2
+cp -r scripts rocm-terminal
+cp -r scripts dev
+
+# build rocm-terminal
+cd rocm-terminal/
+sudo docker build . -f Dockerfile -t rocm/rocm-terminal:$ROCM_VERSION --no-cache --build-arg=ROCM_VERSION=$ROCM_VERSION --build-arg=AMDGPU_VERSION=$AMDGPU_VERSION
+sudo docker build . -f Dockerfile.post-install --build-arg=base_image=rocm/rocm-terminal:$ROCM_VERSION -t rocm/rocm-terminal:$ROCM_VERSION
+sudo docker tag rocm/rocm-terminal:$ROCM_VERSION rocm/rocm-terminal:latest
+
+#build dev dockers
+cd ../dev
+#centos-7
+sudo docker build . -f Dockerfile-centos-7 -t rocm/dev-centos-7:$ROCM_VERSION --no-cache --build-arg=ROCM_VERSION=$ROCM_VERSION  --build-arg=AMDGPU_VERSION=$AMDGPU_VERSION
+sudo docker build . -f Dockerfile.post-install-centos --build-arg=base_image=rocm/dev-centos-7:$ROCM_VERSION -t rocm/dev-centos-7:$ROCM_VERSION
+sudo docker tag rocm/dev-centos-7:$ROCM_VERSION rocm/dev-centos-7:latest
+
+#ubuntu20.04
+sudo docker build . -f Dockerfile-ubuntu-20.04 -t rocm/dev-ubuntu-20.04:$ROCM_VERSION --no-cache --build-arg=ROCM_VERSION=$ROCM_VERSION  --build-arg=AMDGPU_VERSION=$AMDGPU_VERSION
+sudo docker build . -f Dockerfile.post-install --build-arg=base_image=rocm/dev-ubuntu-20.04:$ROCM_VERSION -t rocm/dev-ubuntu-20.04:$ROCM_VERSION
+sudo docker tag rocm/dev-ubuntu-20.04:$ROCM_VERSION rocm/dev-ubuntu-20.04:latest
+
+#ubuntu18.04
+sudo docker build . -f Dockerfile-ubuntu-18.04 -t rocm/dev-ubuntu-18.04:$ROCM_VERSION --no-cache --build-arg=ROCM_VERSION=$ROCM_VERSION --build-arg=AMDGPU_VERSION=$AMDGPU_VERSION
+sudo docker build . -f Dockerfile.post-install --build-arg=base_image=rocm/dev-ubuntu-18.04:$ROCM_VERSION -t rocm/dev-ubuntu-18.04:$ROCM_VERSION
+sudo docker tag rocm/dev-ubuntu-18.04:$ROCM_VERSION rocm/dev-ubuntu-18.04:latest
+
+#ubuntu18.04 complete
+sudo docker build . -f Dockerfile-ubuntu-18.04-complete -t rocm/dev-ubuntu-18.04:$ROCM_VERSION-complete --no-cache --build-arg=ROCM_VERSION=$ROCM_VERSION --build-arg=AMDGPU_VERSION=$AMDGPU_VERSION
+sudo docker build . -f Dockerfile.post-install --build-arg=base_image=rocm/dev-ubuntu-18.04:$ROCM_VERSION-complete -t rocm/dev-ubuntu-18.04:$ROCM_VERSION-complete
+
+#ubuntu20.04 complete
+sudo docker build . -f Dockerfile-ubuntu-20.04-complete -t rocm/dev-ubuntu-20.04:$ROCM_VERSION-complete --no-cache --build-arg=ROCM_VERSION=$ROCM_VERSION --build-arg=AMDGPU_VERSION=$AMDGPU_VERSION
+sudo docker build . -f Dockerfile.post-install --build-arg=base_image=rocm/dev-ubuntu-20.04:$ROCM_VERSION-complete -t rocm/dev-ubuntu-20.04:$ROCM_VERSION-complete
+
--- a/dev/Dockerfile-centos-7
+++ b/dev/Dockerfile-centos-7
@@ -1,8 +1,8 @@
 FROM centos:7
 LABEL maintainer=peng.sun@amd.com

-ARG ROCM_VERSION=4.2
-
+ARG ROCM_VERSION=4.5.2
+ARG AMDGPU_VERSION=21.40.2
 # Base
 RUN yum -y install git java-1.8.0-openjdk python; yum clean all

@@ -78,6 +78,7 @@ RUN yum install -y devtoolset-7-libatomic-devel devtoolset-7-elfutils-libelf-dev
 # Install the ROCm rpms
 RUN yum clean all
 RUN echo -e "[ROCm]\nname=ROCm\nbaseurl=https://repo.radeon.com/rocm/yum/$ROCM_VERSION\nenabled=1\ngpgcheck=0" >> /etc/yum.repos.d/rocm.repo
+RUN echo -e "[amdgpu]\nname=amdgpu\nbaseurl=https://repo.radeon.com/amdgpu/$AMDGPU_VERSION/rhel/7.9/main/x86_64\nenabled=1\ngpgcheck=0" >> /etc/yum.repos.d/amdgpu.repo

 RUN yum install -y rocm-dev

--- a/dev/Dockerfile-centos-7-complete
+++ b/dev/Dockerfile-centos-7-complete
@@ -1,92 +0,0 @@
-FROM centos:7
-LABEL maintainer=peng.sun@amd.com
-
-ARG ROCM_VERSION=4.2
-
-# Base
-RUN yum -y install git java-1.8.0-openjdk python; yum clean all
-
-# Enable epel-release repositories
-RUN yum --enablerepo=extras install -y epel-release
-
-# Install required base build and packaging commands for ROCm
-RUN yum -y install \
-    ca-certificates \
-    bc \
-    bridge-utils \
-    cmake \
-    cmake3 \
-    devscripts \
-    dkms \
-    doxygen \
-    dpkg \
-    dpkg-dev \
-    dpkg-perl \
-    elfutils-libelf-devel \
-    expect \
-    file \
-    python3 \
-    python3-pip \
-    gettext \
-    gcc-c++ \
-    libgcc \
-    glibc.i686 \
-    libcxx-devel \
-    ncurses \
-    ncurses-base \
-    ncurses-libs \
-    numactl-devel \
-    numactl-libs \
-    libssh \
-    libunwind-devel \
-    libunwind \
-    llvm \
-    llvm-libs \
-    make \
-    openssl \
-    openssl-libs \
-    openssh \
-    openssh-clients \
-    pciutils \
-    pciutils-devel \
-    pciutils-libs \
-    python \
-    python-pip \
-    python-devel \
-    pkgconfig \
-    pth \
-    qemu-kvm \
-    re2c \
-    kmod \
-    file \
-    rpm \
-    rpm-build \
-    subversion \
-    wget
-
-# Enable the epel repository for fakeroot
-RUN yum --enablerepo=extras install -y fakeroot
-RUN yum clean all
-
-# On CentOS, install package centos-release-scl available in CentOS repository:
-RUN yum install -y centos-release-scl
-
-# Install the devtoolset-7 collection:
-RUN yum install -y devtoolset-7
-RUN yum install -y devtoolset-7-libatomic-devel devtoolset-7-elfutils-libelf-devel
-
-# Install the ROCm rpms
-RUN yum clean all
-RUN echo -e "[ROCm]\nname=ROCm\nbaseurl=https://repo.radeon.com/rocm/yum/$ROCM_VERSION\nenabled=1\ngpgcheck=0" >> /etc/yum.repos.d/rocm.repo
-
-RUN yum install -y rocm-dev rocm-libs
-
-# Set ENV to enable devtoolset7 by default 
-ENV PATH=/opt/rh/devtoolset-7/root/usr/bin:/opt/rocm/hcc/bin:/opt/rocm/hip/bin:/opt/rocm/bin:/opt/rocm/hcc/bin:${PATH:+:${PATH}}
-ENV MANPATH=/opt/rh/devtoolset-7/root/usr/share/man:${MANPATH}
-ENV INFOPATH=/opt/rh/devtoolset-7/root/usr/share/info${INFOPATH:+:${INFOPATH}}
-ENV PCP_DIR=/opt/rh/devtoolset-7/root
-ENV PERL5LIB=/opt/rh/devtoolset-7/root//usr/lib64/perl5/vendor_perl:/opt/rh/devtoolset-7/root/usr/lib/perl5:/opt/rh/devtoolset-7/root//usr/share/perl5/
-ENV LD_LIBRARY_PATH=/opt/rocm/lib:/usr/local/lib:/opt/rh/devtoolset-7/root$rpmlibdir$rpmlibdir32${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
-ENV PYTHONPATH=/opt/rh/devtoolset-7/root/usr/lib64/python$pythonvers/site-packages:/opt/rh/devtoolset-7/root/usr/lib/python$pythonvers/
-ENV LDFLAGS="-Wl,-rpath=/opt/rh/devtoolset-7/root/usr/lib64 -Wl,-rpath=/opt/rh/devtoolset-7/root/usr/lib"
--- a/dev/Dockerfile-ubuntu-18.04
+++ b/dev/Dockerfile-ubuntu-18.04
@@ -5,11 +5,15 @@ FROM ubuntu:18.04
 LABEL maintainer=peng.sun@amd.com

 # Register the ROCM package repository, and install rocm-dev package
-ARG ROCM_VERSION=4.2
+ARG ROCM_VERSION=4.5.2
+ARG AMDGPU_VERSION=21.40.2
+
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ca-certificates curl libnuma-dev gnupg \
  && curl -sL https://repo.radeon.com/rocm/rocm.gpg.key | apt-key add - \
  && printf "deb [arch=amd64] https://repo.radeon.com/rocm/apt/$ROCM_VERSION/ ubuntu main" | tee /etc/apt/sources.list.d/rocm.list \
-  && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+  && printf "deb [arch=amd64] https://repo.radeon.com/amdgpu/$AMDGPU_VERSION/ubuntu bionic main" | tee /etc/apt/sources.list.d/amdgpu.list \
+  && apt-get update \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
  sudo \
  libelf1 \
  kmod \
--- a/dev/Dockerfile-ubuntu-18.04-complete
+++ b/dev/Dockerfile-ubuntu-18.04-complete
@@ -5,10 +5,13 @@ FROM ubuntu:18.04
 LABEL maintainer=peng.sun@amd.com

 # Register the ROCM package repository, and install rocm-dev package
-ARG ROCM_VERSION=4.2
+ARG ROCM_VERSION=4.5.2
+ARG AMDGPU_VERSION=21.40.2
+
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ca-certificates curl libnuma-dev gnupg \
  && curl -sL https://repo.radeon.com/rocm/rocm.gpg.key | apt-key add - \
  && printf "deb [arch=amd64] https://repo.radeon.com/rocm/apt/$ROCM_VERSION/ ubuntu main" | tee /etc/apt/sources.list.d/rocm.list \
+  && printf "deb [arch=amd64] https://repo.radeon.com/amdgpu/$AMDGPU_VERSION/ubuntu bionic main" | tee /etc/apt/sources.list.d/amdgpu.list \
  && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
  sudo \
  libelf1 \
--- a/dev/Dockerfile-ubuntu-20.04
+++ b/dev/Dockerfile-ubuntu-20.04
@@ -5,10 +5,13 @@ FROM ubuntu:20.04
 LABEL maintainer=peng.sun@amd.com

 # Register the ROCM package repository, and install rocm-dev package
-ARG ROCM_VERSION=4.2
+ARG ROCM_VERSION=4.5.2
+ARG AMDGPU_VERSION=21.40.2
+
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ca-certificates curl libnuma-dev gnupg \
  && curl -sL https://repo.radeon.com/rocm/rocm.gpg.key | apt-key add - \
  && printf "deb [arch=amd64] https://repo.radeon.com/rocm/apt/$ROCM_VERSION/ ubuntu main" | tee /etc/apt/sources.list.d/rocm.list \
+  && printf "deb [arch=amd64] https://repo.radeon.com/amdgpu/$AMDGPU_VERSION/ubuntu focal main" | tee /etc/apt/sources.list.d/amdgpu.list
  && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
  sudo \
  libelf1 \
--- a/dev/Dockerfile-ubuntu-20.04-complete
+++ b/dev/Dockerfile-ubuntu-20.04-complete
@@ -5,11 +5,15 @@ FROM ubuntu:20.04
 LABEL maintainer=peng.sun@amd.com

 # Register the ROCM package repository, and install rocm-dev package
-ARG ROCM_VERSION=4.2
+ARG ROCM_VERSION=4.5.2
+ARG AMDGPU_VERSION=21.40.2
+
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ca-certificates curl libnuma-dev gnupg \
  && curl -sL https://repo.radeon.com/rocm/rocm.gpg.key | apt-key add - \
  && printf "deb [arch=amd64] https://repo.radeon.com/rocm/apt/$ROCM_VERSION/ ubuntu main" | tee /etc/apt/sources.list.d/rocm.list \
-  && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+  && printf "deb [arch=amd64] https://repo.radeon.com/amdgpu/$AMDGPU_VERSION/ubuntu focal main" | tee /etc/apt/sources.list.d/amdgpu.list \
+  && apt-get update \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
  sudo \
  libelf1 \
  kmod \
--- a/dev/Dockerfile.post-install
+++ b/dev/Dockerfile.post-install
@@ -9,4 +9,5 @@ RUN chmod a+x /opt/rocm/bin/rocm-compatibility-test.sh
 ENTRYPOINT ["/opt/rocm/bin/rocm-compatibility-test.sh"]

 # Default to a login shell
-CMD ["/bin/bash", "-l"] 
+CMD ["/bin/bash", "-l"]
+
--- a/push_all.sh
+++ b/push_all.sh
@@ -0,0 +1,20 @@
+ROCM_VERSION=4.5.2
+sudo docker push rocm/dev-ubuntu-18.04:$ROCM_VERSION
+sudo docker push rocm/dev-ubuntu-20.04:$ROCM_VERSION
+sudo docker push rocm/dev-centos-7:$ROCM_VERSION
+sudo docker push rocm/rocm-terminal:$ROCM_VERSION
+
+#ubuntu18.04 complete
+sudo docker push rocm/dev-ubuntu-18.04:$ROCM_VERSION-complete
+
+#ubuntu20.04 complete
+sudo docker push rocm/dev-ubuntu-20.04:$ROCM_VERSION-complete
+
+#centos complete
+#sudo docker push rocm/dev-centos-7:$ROCM_VERSION-complete
+
+sudo docker push rocm/dev-centos-7:latest
+sudo docker push rocm/dev-ubuntu-20.04:latest
+sudo docker push rocm/dev-ubuntu-18.04:latest
+sudo docker push rocm/rocm-terminal:latest
+
--- a/rocm-terminal/Dockerfile
+++ b/rocm-terminal/Dockerfile
@@ -15,10 +15,13 @@ MAINTAINER Peng Sun <Peng.Sun@amd.com>

 # Initialize the image
 # Modify to pre-install dev tools and ROCm packages
-ARG ROCM_VERSION=4.2
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends curl gnupg && \
+ARG ROCM_VERSION=4.5.2
+ARG AMDGPU_VERSION=21.40.2
+
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ca-certificates curl gnupg && \
  curl -sL http://repo.radeon.com/rocm/rocm.gpg.key | apt-key add - && \
  sh -c 'echo deb [arch=amd64] http://repo.radeon.com/rocm/apt/$ROCM_VERSION/ ubuntu main > /etc/apt/sources.list.d/rocm.list' && \
+  sh -c 'echo deb [arch=amd64] https://repo.radeon.com/amdgpu/$AMDGPU_VERSION/ubuntu bionic main > /etc/apt/sources.list.d/amdgpu.list' && \
  apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
  sudo \
  libelf1 \