AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updating release build dockers (#195)

Browse Source 
- Bringing in recent changes from rocm-6.4 branch (https://github.com/ROCm/rocprofiler-systems/pull/171)
- Add libdrm-devel to rhel and suse files
- Update ROCm installation method in Ubuntu file
- Add additional output to `test-release.sh` to catch failures due to a Python version not included
- Add Python 3.13 to Dockers
This commit is contained in:
David Galiffi
2025-05-02 19:29:15 -04:00
committed by GitHub
parent adc66956b0
commit 83a9eb3d7c
11 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/Dockerfile.opensuse
+3 -2
View File
@@ -24,7 +24,8 @@ RUN zypper --non-interactive update -y && \
zypper --non-interactive dist-upgrade -y && \
zypper --non-interactive install -y -t pattern devel_basis && \
zypper --non-interactive install -y binutils-gold cmake curl dpkg-devel \
gcc-c++ git libnuma-devel openmpi3-devel python3-pip rpm-build wget && \
gcc-c++ git libdrm-devel libnuma-devel openmpi3-devel python3-pip rpm-build \
wget && \
python3 -m pip install 'cmake==3.21'
ARG ROCM_VERSION=0.0
@@ -43,7 +44,7 @@ RUN if [ "${ROCM_VERSION}" != "0.0" ]; then \
zypper --non-interactive clean --all; \
fi
ARG PYTHON_VERSIONS="6 7 8 9 10 11 12"
ARG PYTHON_VERSIONS="6 7 8 9 10 11 12 13"
RUN wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh && \
bash miniconda.sh -b -p /opt/conda && \
docker/Dockerfile.opensuse.ci
+1 -1
View File
@@ -46,7 +46,7 @@ RUN cd /tmp/dyninst && \
shopt -s dotglob extglob && \
rm -rf *
ARG PYTHON_VERSIONS="6 7 8 9 10 11 12"
ARG PYTHON_VERSIONS="6 7 8 9 10 11 12 13"
RUN wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh && \
bash miniconda.sh -b -p /opt/conda && \
docker/Dockerfile.rhel
+3 -3
View File
@@ -15,8 +15,8 @@ ENV LIBRARY_PATH ${LIBRARY_PATH}:/opt/amdgpu/lib64
RUN yum groupinstall -y "Development Tools" && \
yum install -y epel-release && crb enable && \
yum install -y --allowerasing cmake curl dpkg-devel numactl-devel openmpi-devel \
papi-devel python3-pip texinfo wget which zlib-devel && \
yum install -y --allowerasing cmake curl dpkg-devel libdrm-devel numactl-devel \
openmpi-devel papi-devel python3-pip texinfo wget which zlib-devel && \
yum clean all && \
python3 -m pip install 'cmake==3.21' && \
python3 -m pip install 'perfetto'
@@ -37,7 +37,7 @@ RUN if [ "${ROCM_VERSION}" != "0.0" ]; then \
yum clean all; \
fi
ARG PYTHON_VERSIONS="6 7 8 9 10 11 12"
ARG PYTHON_VERSIONS="6 7 8 9 10 11 12 13"
RUN wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh && \
bash miniconda.sh -b -p /opt/conda && \
docker/Dockerfile.rhel.ci
+1 -1
View File
@@ -37,7 +37,7 @@ RUN cd /tmp/dyninst && \
shopt -s dotglob extglob && \
rm -rf *
ARG PYTHON_VERSIONS="6 7 8 9 10 11 12"
ARG PYTHON_VERSIONS="6 7 8 9 10 11 12 13"
RUN wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh && \
bash miniconda.sh -b -p /opt/conda && \
docker/Dockerfile.ubuntu
+9 -5
View File
@@ -15,11 +15,7 @@ WORKDIR /tmp
SHELL [ "/bin/bash", "-c" ]
ARG EXTRA_PACKAGES=""
ARG ROCM_REPO_VERSION="debian"
ARG ROCM_VERSION="0.0"
ARG ROCM_REPO_DIST="ubuntu"
ARG PYTHON_VERSIONS="6 7 8 9 10 11 12"
ARG AMDGPU_DEB=6.0/ubuntu/focal/amdgpu-install_6.0.60000-1_all.deb
ENV PATH ${HOME}/.local/bin:${PATH}
RUN apt-get update && \
@@ -36,13 +32,21 @@ RUN apt-get update && \
fi
RUN if [ "${ROCM_VERSION}" != "0.0" ]; then \
wget https://repo.radeon.com/amdgpu-install/${ROCM_VERSION}/ubuntu/${ROCM_REPO_DIST}/${AMDGPU_DEB} && \
OS_VERSION=$(grep '^VERSION_ID=' /etc/os-release | cut -d'=' -f2 | tr -d '"') && \
OS_CODENAME=$(grep '^VERSION_CODENAME=' /etc/os-release | cut -d'=' -f2) && \
ROCM_MAJOR=$(echo "${ROCM_VERSION}" | sed 's/\./ /g' | awk '{print $1}') && \
ROCM_MINOR=$(echo "${ROCM_VERSION}" | sed 's/\./ /g' | awk '{print $2}') && \
ROCM_VERSN=$(( ("${ROCM_MAJOR}"*10000)+("${ROCM_MINOR}"*100) )) && \
AMDGPU_DEB="amdgpu-install_${ROCM_MAJOR}.${ROCM_MINOR}.${ROCM_VERSN}-1_all.deb" && \
wget https://repo.radeon.com/amdgpu-install/${ROCM_VERSION}/ubuntu/${OS_CODENAME}/${AMDGPU_DEB} && \
apt-get install -y ./${AMDGPU_DEB} && \
apt-get update && \
apt-get install -y rocm-dev rccl-dev libpciaccess0 ${EXTRA_PACKAGES} && \
apt-get autoclean; \
fi
ARG PYTHON_VERSIONS="6 7 8 9 10 11 12 13"
RUN wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh && \
bash miniconda.sh -b -p /opt/conda && \
export PATH="/opt/conda/bin:${PATH}" && \
docker/Dockerfile.ubuntu.ci
+1 -1
View File
@@ -49,7 +49,7 @@ RUN cd /tmp/dyninst && \
shopt -s dotglob extglob && \
rm -rf *
ARG PYTHON_VERSIONS="6 7 8 9 10 11 12"
ARG PYTHON_VERSIONS="6 7 8 9 10 11 12 13"
RUN wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh && \
bash miniconda.sh -b -p /opt/conda && \
docker/build-docker-ci.sh
+1 -1
View File
@@ -8,7 +8,7 @@ set -e
: ${NJOBS=$(nproc)}
: ${ELFUTILS_VERSION:=0.186}
: ${BOOST_VERSION:=1.79.0}
: ${PYTHON_VERSIONS:="6 7 8 9 10 11 12"}
: ${PYTHON_VERSIONS:="6 7 8 9 10 11 12 13"}
: ${PUSH:=0}
: ${PULL:=--pull}
docker/build-docker-release.sh
+1 -1
View File
@@ -101,7 +101,7 @@ reset-last
: ${VERSIONS:=22.04 20.04}
: ${ROCM_VERSIONS:=5.0 4.5 4.3}
: ${MPI:=0}
: ${PYTHON_VERSIONS:="6 7 8 9 10 11 12"}
: ${PYTHON_VERSIONS:="6 7 8 9 10 11 12 13"}
: ${RETRY:=3}
n=0
docker/build-docker.sh
+1 -1
View File
@@ -4,7 +4,7 @@
: ${ROCM_VERSIONS:="6.2"}
: ${DISTRO:=ubuntu}
: ${VERSIONS:=20.04}
: ${PYTHON_VERSIONS:="6 7 8 9 10 11 12"}
: ${PYTHON_VERSIONS:="6 7 8 9 10 11 12 13"}
: ${BUILD_CI:=""}
: ${PUSH:=0}
: ${PULL:=--pull}
scripts/build-release.sh
+1 -1
View File
@@ -37,7 +37,7 @@
: ${MAX_THREADS:=2048}
: ${PERFETTO_TOOLS:="ON"}
: ${HIDDEN_VIZ:="ON"}
: ${PYTHON_VERSIONS:="6 7 8 9 10 11 12"}
: ${PYTHON_VERSIONS:="6 7 8 9 10 11 12 13"}
: ${GENERATORS:="STGZ DEB RPM"}
: ${MPI_IMPL:="openmpi"}
: ${CLEAN:=0}
scripts/test-release.sh
+12 -1
View File
@@ -118,10 +118,21 @@ setup-env()
test-install()
{
ROCPROFSYS_MODULE_PATH="${1}/lib/python/site-packages/rocprofsys"
verbose-run rocprof-sys-instrument --help
verbose-run rocprof-sys-avail --help
verbose-run rocprof-sys-avail --all
if [ -d "${1}/lib/python/site-packages/rocprofsys" ]; then
if [ -d $ROCPROFSYS_MODULE_PATH ]; then
verbose-run which python3
verbose-run python3 --version
PYTHON_VERSION=$(python3 -c "import sys; print(f'python-{sys.version_info.major}{sys.version_info.minor}')")
if [ -z "$(find $ROCPROFSYS_MODULE_PATH -name "*${PYTHON_VERSION}*" -print -quit)" ]; then
echo "Error: No library found for Python version ${PYTHON_VERSION} in $ROCPROFSYS_MODULE_PATH"
exit 1
fi
verbose-run rocprof-sys-python --help
fi
}