From 82f4fb934d8264d55f44476e97a276609c108cbd Mon Sep 17 00:00:00 2001 From: sunway513 Date: Tue, 10 Jan 2023 21:05:21 +0000 Subject: [PATCH 1/4] update for rocm5.4 --- build_all.sh | 4 ++-- push_all.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build_all.sh b/build_all.sh index 012dbdd..c9c5367 100755 --- a/build_all.sh +++ b/build_all.sh @@ -1,5 +1,5 @@ -ROCM_VERSION=5.3 -AMDGPU_VERSION=5.3 +ROCM_VERSION=5.4 +AMDGPU_VERSION=5.4 cp -r scripts rocm-terminal cp -r scripts dev diff --git a/push_all.sh b/push_all.sh index 7401986..b28575f 100755 --- a/push_all.sh +++ b/push_all.sh @@ -1,4 +1,4 @@ -ROCM_VERSION=5.3 +ROCM_VERSION=5.4 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 From 37d587ad98f944da278f61c7fe2f9b4059a54def Mon Sep 17 00:00:00 2001 From: sunway513 Date: Tue, 28 Mar 2023 23:02:32 +0000 Subject: [PATCH 2/4] update centos docker to use devtoolset9;update to build with ROCm5.4.3 --- build_all.sh | 16 ++++++++-------- dev/Dockerfile-centos-7 | 26 +++++++++++++++----------- push_all.sh | 7 +++---- 3 files changed, 26 insertions(+), 23 deletions(-) diff --git a/build_all.sh b/build_all.sh index c9c5367..e629207 100755 --- a/build_all.sh +++ b/build_all.sh @@ -1,5 +1,5 @@ -ROCM_VERSION=5.4 -AMDGPU_VERSION=5.4 +ROCM_VERSION=5.4.3 +AMDGPU_VERSION=5.4.3 cp -r scripts rocm-terminal cp -r scripts dev @@ -8,22 +8,22 @@ cd rocm-terminal/ sudo docker build . -f Dockerfile -t rocm/rocm-terminal:$ROCM_VERSION --build-arg=ROCM_VERSION=$ROCM_VERSION --build-arg=AMDGPU_VERSION=$AMDGPU_VERSION sudo docker tag rocm/rocm-terminal:$ROCM_VERSION rocm/rocm-terminal:latest -#build dev dockers +# build dev dockers cd ../dev -#centos-7 +# centos-7 sudo docker build . -f Dockerfile-centos-7 -t rocm/dev-centos-7:$ROCM_VERSION --build-arg=ROCM_VERSION=$ROCM_VERSION --build-arg=AMDGPU_VERSION=$AMDGPU_VERSION sudo docker tag rocm/dev-centos-7:$ROCM_VERSION rocm/dev-centos-7:latest -#ubuntu20.04 +# ubuntu20.04 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 -#ubuntu22.04 +# 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 --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 +# 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 --build-arg=APT_PREF="Package: *\nPin: release o=repo.radeon.com\nPin-Priority: 600" -#ubuntu20.04 complete +# 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 cad9946..791cb9f 100644 --- a/dev/Dockerfile-centos-7 +++ b/dev/Dockerfile-centos-7 @@ -71,9 +71,13 @@ 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 devtoolset-9 collection: +#RUN yum install -y devtoolset-9 +#RUN yum install -y devtoolset-9-libatomic-devel devtoolset-9-elfutils-libelf-devel + +# Install the devtoolset-9 collection: +RUN yum install -y devtoolset-9 +RUN yum install -y devtoolset-9-libatomic-devel devtoolset-9-elfutils-libelf-devel # Install the ROCm rpms RUN yum clean all @@ -83,11 +87,11 @@ RUN echo -e "[amdgpu]\nname=amdgpu\nbaseurl=https://repo.radeon.com/amdgpu/$AMDG RUN yum install -y rocm-dev # 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" +ENV PATH=/opt/rh/devtoolset-9/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-9/root/usr/share/man:${MANPATH} +ENV INFOPATH=/opt/rh/devtoolset-9/root/usr/share/info${INFOPATH:+:${INFOPATH}} +ENV PCP_DIR=/opt/rh/devtoolset-9/root +ENV PERL5LIB=/opt/rh/devtoolset-9/root//usr/lib64/perl5/vendor_perl:/opt/rh/devtoolset-9/root/usr/lib/perl5:/opt/rh/devtoolset-9/root//usr/share/perl5/ +ENV LD_LIBRARY_PATH=/opt/rocm/lib:/usr/local/lib:/opt/rh/devtoolset-9/root$rpmlibdir$rpmlibdir32${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} +ENV PYTHONPATH=/opt/rh/devtoolset-9/root/usr/lib64/python$pythonvers/site-packages:/opt/rh/devtoolset-9/root/usr/lib/python$pythonvers/ +ENV LDFLAGS="-Wl,-rpath=/opt/rh/devtoolset-9/root/usr/lib64 -Wl,-rpath=/opt/rh/devtoolset-9/root/usr/lib" diff --git a/push_all.sh b/push_all.sh index b28575f..9b6d7e2 100755 --- a/push_all.sh +++ b/push_all.sh @@ -1,18 +1,17 @@ -ROCM_VERSION=5.4 +ROCM_VERSION=5.4.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 -#ubuntu20.04 complete +# ubuntu20.04 complete sudo docker push rocm/dev-ubuntu-20.04:$ROCM_VERSION-complete -#ubuntu22.04 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-22.04:latest From 9a2e8befdaa7ca5bd9753cf8db0b67e1ad2e8ea6 Mon Sep 17 00:00:00 2001 From: sunway513 Date: Tue, 6 Jun 2023 16:19:09 +0000 Subject: [PATCH 3/4] Update for ROCm5.5.1 --- build_all.sh | 4 ++-- push_all.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build_all.sh b/build_all.sh index e629207..be23358 100755 --- a/build_all.sh +++ b/build_all.sh @@ -1,5 +1,5 @@ -ROCM_VERSION=5.4.3 -AMDGPU_VERSION=5.4.3 +ROCM_VERSION=5.5.1 +AMDGPU_VERSION=5.5.1 cp -r scripts rocm-terminal cp -r scripts dev diff --git a/push_all.sh b/push_all.sh index 9b6d7e2..dd18637 100755 --- a/push_all.sh +++ b/push_all.sh @@ -1,4 +1,4 @@ -ROCM_VERSION=5.4.3 +ROCM_VERSION=5.5.1 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 From b3895bbbcde9a39072824d2677026fac926bb95c Mon Sep 17 00:00:00 2001 From: sunway513 Date: Sat, 16 Sep 2023 18:56:33 +0000 Subject: [PATCH 4/4] update for rocm5.7 --- build_all.sh | 4 ++-- push_all.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build_all.sh b/build_all.sh index 24e7b02..e5d73af 100755 --- a/build_all.sh +++ b/build_all.sh @@ -1,5 +1,5 @@ -ROCM_VERSION=5.5.1 -AMDGPU_VERSION=5.5.1 +ROCM_VERSION=5.7 +AMDGPU_VERSION=5.7 cp -r scripts rocm-terminal cp -r scripts dev diff --git a/push_all.sh b/push_all.sh index ee701b5..e6ba032 100755 --- a/push_all.sh +++ b/push_all.sh @@ -1,4 +1,4 @@ -ROCM_VERSION=5.5.1 +ROCM_VERSION=5.7 # ubuntu 20.04 base sudo docker push rocm/dev-ubuntu-20.04:$ROCM_VERSION