diff --git a/build_all.sh b/build_all.sh index b94c6cd..e5d73af 100755 --- a/build_all.sh +++ b/build_all.sh @@ -1,5 +1,6 @@ -ROCM_VERSION=5.4.2 -AMDGPU_VERSION=5.4.2 +ROCM_VERSION=5.7 +AMDGPU_VERSION=5.7 + cp -r scripts rocm-terminal cp -r scripts dev @@ -8,30 +9,29 @@ 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 -#centos-7 complete +# centos-7 complete sudo docker build . -f Dockerfile-centos-7-complete -t rocm/dev-centos-7:$ROCM_VERSION-complete --build-arg=ROCM_VERSION=$ROCM_VERSION --build-arg=AMDGPU_VERSION=$AMDGPU_VERSION -#manylinux2014_x86_64 +# manylinux2014_x86_64 sudo docker build . -f Dockerfile-manylinux2014_x86_64 -t rocm/dev-manylinux2014_x86_64:$ROCM_VERSION --build-arg=ROCM_VERSION=$ROCM_VERSION --build-arg=AMDGPU_VERSION=$AMDGPU_VERSION sudo docker tag rocm/dev-manylinux2014_x86_64:$ROCM_VERSION rocm/dev-manylinux2014_x86_64: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 -#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 -#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" - 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 85672ca..e6ba032 100755 --- a/push_all.sh +++ b/push_all.sh @@ -1,12 +1,30 @@ -ROCM_VERSION=5.3 +ROCM_VERSION=5.7 + +# ubuntu 20.04 base sudo docker push rocm/dev-ubuntu-20.04:$ROCM_VERSION -sudo docker push rocm/dev-ubuntu-20.04:$ROCM_VERSION-complete sudo docker push rocm/dev-ubuntu-20.04:latest + +# ubuntu 22.04 base sudo docker push rocm/dev-ubuntu-22.04:$ROCM_VERSION -sudo docker push rocm/dev-ubuntu-22.04:$ROCM_VERSION-complete sudo docker push rocm/dev-ubuntu-22.04:latest + +# centos base sudo docker push rocm/dev-centos-7:$ROCM_VERSION -sudo docker push rocm/dev-centos-7:$ROCM_VERSION-complete sudo docker push rocm/dev-centos-7:latest + +# rocm terminal base sudo docker push rocm/rocm-terminal:$ROCM_VERSION sudo docker push rocm/rocm-terminal:latest + +# manylinux2014 base +sudo docker push rocm/dev-manylinux2014_x86_64:$ROCM_VERSION +sudo docker push rocm/dev-manylinux2014_x86_64:latest + +# 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