From 04e64d71ddc9546b1eed81b166793b7afc0f143a Mon Sep 17 00:00:00 2001 From: sunway513 Date: Sat, 1 Oct 2022 17:49:59 -0700 Subject: [PATCH 1/4] Upgrade rocm-terminal to ubuntu20.04 --- build_all.sh | 4 ++-- rocm-terminal/Dockerfile | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build_all.sh b/build_all.sh index c89e473..368b2f1 100755 --- a/build_all.sh +++ b/build_all.sh @@ -1,5 +1,5 @@ -ROCM_VERSION=5.2.3 -AMDGPU_VERSION=22.20.3 +ROCM_VERSION=5.3 +AMDGPU_VERSION=5.3 cp -r scripts rocm-terminal cp -r scripts dev diff --git a/rocm-terminal/Dockerfile b/rocm-terminal/Dockerfile index e9fe270..c380032 100644 --- a/rocm-terminal/Dockerfile +++ b/rocm-terminal/Dockerfile @@ -10,18 +10,18 @@ # If it is desired to run the container manually through the docker command-line, the following is an example # 'docker run -it --rm -v [host/directory]:[container/directory]:ro /'. -FROM ubuntu:18.04 +FROM ubuntu:20.04 MAINTAINER Peng Sun # Initialize the image # Modify to pre-install dev tools and ROCm packages -ARG ROCM_VERSION=4.5.2 -ARG AMDGPU_VERSION=21.40.2 +ARG ROCM_VERSION=5.3 +ARG AMDGPU_VERSION=5.3 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' && \ + sh -c 'echo deb [arch=amd64] http://repo.radeon.com/rocm/apt/$ROCM_VERSION/ focal main > /etc/apt/sources.list.d/rocm.list' && \ + sh -c 'echo deb [arch=amd64] https://repo.radeon.com/amdgpu/$AMDGPU_VERSION/ubuntu focal main > /etc/apt/sources.list.d/amdgpu.list' && \ apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ sudo \ libelf1 \ From 20a178cd0d79fc7d4c8b90d12f3bb78e7b24a499 Mon Sep 17 00:00:00 2001 From: sunway513 Date: Sun, 2 Oct 2022 01:16:38 +0000 Subject: [PATCH 2/4] Add ubuntu22.04 base dockers --- build_all.sh | 10 +++++----- ...ubuntu-18.04-complete => Dockerfile-ubuntu-22.04} | 12 ++++++------ ...ubuntu-18.04 => Dockerfile-ubuntu-22.04-complete} | 12 +++++++----- 3 files changed, 18 insertions(+), 16 deletions(-) rename dev/{Dockerfile-ubuntu-18.04-complete => Dockerfile-ubuntu-22.04} (78%) rename dev/{Dockerfile-ubuntu-18.04 => Dockerfile-ubuntu-22.04-complete} (77%) diff --git a/build_all.sh b/build_all.sh index 368b2f1..90d220a 100755 --- a/build_all.sh +++ b/build_all.sh @@ -18,12 +18,12 @@ sudo docker tag rocm/dev-centos-7:$ROCM_VERSION rocm/dev-centos-7:latest sudo docker build . -f Dockerfile-ubuntu-20.04 -t rocm/dev-ubuntu-20.04:$ROCM_VERSION --build-arg=ROCM_VERSION=$ROCM_VERSION --build-arg=AMDGPU_VERSION=$AMDGPU_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 --build-arg=ROCM_VERSION=$ROCM_VERSION --build-arg=AMDGPU_VERSION=$AMDGPU_VERSION -sudo docker tag rocm/dev-ubuntu-18.04:$ROCM_VERSION rocm/dev-ubuntu-18.04:latest +#ubuntu22.04 +sudo docker build . -f Dockerfile-ubuntu-22.04 -t rocm/dev-ubuntu-22.04:$ROCM_VERSION --build-arg=ROCM_VERSION=$ROCM_VERSION --build-arg=AMDGPU_VERSION=$AMDGPU_VERSION +sudo docker tag rocm/dev-ubuntu-22.04:$ROCM_VERSION rocm/dev-ubuntu-22.04:latest -#ubuntu18.04 complete -sudo docker build . -f Dockerfile-ubuntu-18.04-complete -t rocm/dev-ubuntu-18.04:$ROCM_VERSION-complete --build-arg=ROCM_VERSION=$ROCM_VERSION --build-arg=AMDGPU_VERSION=$AMDGPU_VERSION +#ubuntu22.04 complete +sudo docker build . -f Dockerfile-ubuntu-22.04-complete -t rocm/dev-ubuntu-22.04:$ROCM_VERSION-complete --build-arg=ROCM_VERSION=$ROCM_VERSION --build-arg=AMDGPU_VERSION=$AMDGPU_VERSION #ubuntu20.04 complete sudo docker build . -f Dockerfile-ubuntu-20.04-complete -t rocm/dev-ubuntu-20.04:$ROCM_VERSION-complete --build-arg=ROCM_VERSION=$ROCM_VERSION --build-arg=AMDGPU_VERSION=$AMDGPU_VERSION diff --git a/dev/Dockerfile-ubuntu-18.04-complete b/dev/Dockerfile-ubuntu-22.04 similarity index 78% rename from dev/Dockerfile-ubuntu-18.04-complete rename to dev/Dockerfile-ubuntu-22.04 index a132702..c797f21 100644 --- a/dev/Dockerfile-ubuntu-18.04-complete +++ b/dev/Dockerfile-ubuntu-22.04 @@ -1,17 +1,17 @@ # This dockerfile is meant to serve as a rocm base image. It registers the debian rocm package repository, and # installs the rocm-dev package. -FROM ubuntu:18.04 +FROM ubuntu:22.04 LABEL maintainer=peng.sun@amd.com # Register the ROCM package repository, and install rocm-dev package -ARG ROCM_VERSION=5.1.3 -ARG AMDGPU_VERSION=22.10.3 +ARG ROCM_VERSION=5.3 +ARG AMDGPU_VERSION=5.3 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 \ + && printf "deb [arch=amd64] https://repo.radeon.com/rocm/apt/$ROCM_VERSION/ jammy main" | tee /etc/apt/sources.list.d/rocm.list \ + && printf "deb [arch=amd64] https://repo.radeon.com/amdgpu/$AMDGPU_VERSION/ubuntu jammy main" | tee /etc/apt/sources.list.d/amdgpu.list \ && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ sudo \ libelf1 \ @@ -20,7 +20,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins python3 \ python3-pip \ rocm-dev \ - rocm-libs \ build-essential && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* +RUN groupadd -g 109 render diff --git a/dev/Dockerfile-ubuntu-18.04 b/dev/Dockerfile-ubuntu-22.04-complete similarity index 77% rename from dev/Dockerfile-ubuntu-18.04 rename to dev/Dockerfile-ubuntu-22.04-complete index 50185d6..80a2de6 100644 --- a/dev/Dockerfile-ubuntu-18.04 +++ b/dev/Dockerfile-ubuntu-22.04-complete @@ -1,17 +1,17 @@ # This dockerfile is meant to serve as a rocm base image. It registers the debian rocm package repository, and # installs the rocm-dev package. -FROM ubuntu:18.04 +FROM ubuntu:22.04 LABEL maintainer=peng.sun@amd.com # Register the ROCM package repository, and install rocm-dev package -ARG ROCM_VERSION=5.1.3 -ARG AMDGPU_VERSION=22.10.3 +ARG ROCM_VERSION=5.3 +ARG AMDGPU_VERSION=5.3 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 \ + && printf "deb [arch=amd64] https://repo.radeon.com/rocm/apt/$ROCM_VERSION/ jammy main" | tee /etc/apt/sources.list.d/rocm.list \ + && printf "deb [arch=amd64] https://repo.radeon.com/amdgpu/$AMDGPU_VERSION/ubuntu jammy main" | tee /etc/apt/sources.list.d/amdgpu.list \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ sudo \ @@ -21,6 +21,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins python3 \ python3-pip \ rocm-dev \ + rocm-libs \ build-essential && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* +RUN groupadd -g 109 render From 0e8a9398abb39e234b80e2d285128555a0f48bfd Mon Sep 17 00:00:00 2001 From: sunway513 Date: Sun, 2 Oct 2022 01:20:13 +0000 Subject: [PATCH 3/4] update for push_all script --- push_all.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/push_all.sh b/push_all.sh index 91f4b5b..7401986 100755 --- a/push_all.sh +++ b/push_all.sh @@ -1,19 +1,19 @@ -ROCM_VERSION=5.2.3 -sudo docker push rocm/dev-ubuntu-18.04:$ROCM_VERSION +ROCM_VERSION=5.3 sudo docker push rocm/dev-ubuntu-20.04:$ROCM_VERSION +sudo docker push rocm/dev-ubuntu-22.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 +#ubuntu22.04 complete +sudo docker push rocm/dev-ubuntu-22.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/dev-ubuntu-22.04:latest sudo docker push rocm/rocm-terminal:latest From a22917e4fb3134be42a164496ebe471b63403303 Mon Sep 17 00:00:00 2001 From: sunway513 Date: Sat, 8 Oct 2022 03:11:05 +0000 Subject: [PATCH 4/4] update scripts for ROCm5.3 --- build_all.sh | 4 ++-- dev/Dockerfile-centos-7 | 4 ++-- dev/Dockerfile-ubuntu-20.04 | 4 ++-- dev/Dockerfile-ubuntu-20.04-complete | 4 ++-- dev/Dockerfile-ubuntu-22.04 | 3 +++ dev/Dockerfile-ubuntu-22.04-complete | 6 ++++-- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/build_all.sh b/build_all.sh index 90d220a..012dbdd 100755 --- a/build_all.sh +++ b/build_all.sh @@ -19,11 +19,11 @@ sudo docker build . -f Dockerfile-ubuntu-20.04 -t rocm/dev-ubuntu-20.04:$ROCM_VE sudo docker tag rocm/dev-ubuntu-20.04:$ROCM_VERSION rocm/dev-ubuntu-20.04:latest #ubuntu22.04 -sudo docker build . -f Dockerfile-ubuntu-22.04 -t rocm/dev-ubuntu-22.04:$ROCM_VERSION --build-arg=ROCM_VERSION=$ROCM_VERSION --build-arg=AMDGPU_VERSION=$AMDGPU_VERSION +sudo docker build . -f Dockerfile-ubuntu-22.04 -t rocm/dev-ubuntu-22.04:$ROCM_VERSION --build-arg=ROCM_VERSION=$ROCM_VERSION --build-arg=AMDGPU_VERSION=$AMDGPU_VERSION --build-arg=APT_PREF="Package: *\nPin: release o=repo.radeon.com\nPin-Priority: 600" sudo docker tag rocm/dev-ubuntu-22.04:$ROCM_VERSION rocm/dev-ubuntu-22.04:latest #ubuntu22.04 complete -sudo docker build . -f Dockerfile-ubuntu-22.04-complete -t rocm/dev-ubuntu-22.04:$ROCM_VERSION-complete --build-arg=ROCM_VERSION=$ROCM_VERSION --build-arg=AMDGPU_VERSION=$AMDGPU_VERSION +sudo docker build . -f Dockerfile-ubuntu-22.04-complete -t rocm/dev-ubuntu-22.04:$ROCM_VERSION-complete --build-arg=ROCM_VERSION=$ROCM_VERSION --build-arg=AMDGPU_VERSION=$AMDGPU_VERSION --build-arg=APT_PREF="Package: *\nPin: release o=repo.radeon.com\nPin-Priority: 600" #ubuntu20.04 complete sudo docker build . -f Dockerfile-ubuntu-20.04-complete -t rocm/dev-ubuntu-20.04:$ROCM_VERSION-complete --build-arg=ROCM_VERSION=$ROCM_VERSION --build-arg=AMDGPU_VERSION=$AMDGPU_VERSION diff --git a/dev/Dockerfile-centos-7 b/dev/Dockerfile-centos-7 index eda596e..cad9946 100644 --- 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=5.1.3 -ARG AMDGPU_VERSION=22.10.3 +ARG ROCM_VERSION=5.3 +ARG AMDGPU_VERSION=5.3 # Base RUN yum -y install git java-1.8.0-openjdk python; yum clean all diff --git a/dev/Dockerfile-ubuntu-20.04 b/dev/Dockerfile-ubuntu-20.04 index e5f7866..74345ba 100644 --- a/dev/Dockerfile-ubuntu-20.04 +++ b/dev/Dockerfile-ubuntu-20.04 @@ -5,8 +5,8 @@ FROM ubuntu:20.04 LABEL maintainer=peng.sun@amd.com # Register the ROCM package repository, and install rocm-dev package -ARG ROCM_VERSION=5.1.3 -ARG AMDGPU_VERSION=22.10.3 +ARG ROCM_VERSION=5.3 +ARG AMDGPU_VERSION=5.3 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 - \ diff --git a/dev/Dockerfile-ubuntu-20.04-complete b/dev/Dockerfile-ubuntu-20.04-complete index b1fa355..9be7e0b 100644 --- a/dev/Dockerfile-ubuntu-20.04-complete +++ b/dev/Dockerfile-ubuntu-20.04-complete @@ -5,8 +5,8 @@ FROM ubuntu:20.04 LABEL maintainer=peng.sun@amd.com # Register the ROCM package repository, and install rocm-dev package -ARG ROCM_VERSION=5.1.3 -ARG AMDGPU_VERSION=22.10.3 +ARG ROCM_VERSION=5.3 +ARG AMDGPU_VERSION=5.3 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 - \ diff --git a/dev/Dockerfile-ubuntu-22.04 b/dev/Dockerfile-ubuntu-22.04 index c797f21..424c8fa 100644 --- a/dev/Dockerfile-ubuntu-22.04 +++ b/dev/Dockerfile-ubuntu-22.04 @@ -8,6 +8,8 @@ LABEL maintainer=peng.sun@amd.com ARG ROCM_VERSION=5.3 ARG AMDGPU_VERSION=5.3 +ARG APT_PREF +RUN echo "$APT_PREF" > /etc/apt/preferences.d/rocm-pin-600 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/ jammy main" | tee /etc/apt/sources.list.d/rocm.list \ @@ -23,4 +25,5 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins build-essential && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* + RUN groupadd -g 109 render diff --git a/dev/Dockerfile-ubuntu-22.04-complete b/dev/Dockerfile-ubuntu-22.04-complete index 80a2de6..4fff83d 100644 --- a/dev/Dockerfile-ubuntu-22.04-complete +++ b/dev/Dockerfile-ubuntu-22.04-complete @@ -8,12 +8,13 @@ LABEL maintainer=peng.sun@amd.com ARG ROCM_VERSION=5.3 ARG AMDGPU_VERSION=5.3 +ARG APT_PREF +RUN echo "$APT_PREF" > /etc/apt/preferences.d/rocm-pin-600 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/ jammy main" | tee /etc/apt/sources.list.d/rocm.list \ && printf "deb [arch=amd64] https://repo.radeon.com/amdgpu/$AMDGPU_VERSION/ubuntu jammy main" | tee /etc/apt/sources.list.d/amdgpu.list \ - && apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ sudo \ libelf1 \ kmod \ @@ -25,4 +26,5 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins build-essential && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* + RUN groupadd -g 109 render