Update build docker container workflow, opensuse dockerfiles (#1883)
## Motivation <!-- Explain the purpose of this PR and the goals it aims to achieve. --> - __Reduced Code Duplication__: Version parsing logic moved from individual Dockerfiles to the central build script - __Improved Edge Case Handling__: Better handling of ROCm versions with and without patch numbers (e.g., `6.2` vs `6.2.0`) - __Easier Maintenance__: Future version-related changes only need to be made in one place - __Cleaner Dockerfiles__: Simplified Dockerfiles focus on package installation rather than complex shell logic - __Updated Platform Support__: Refreshed container matrix to reflect current platform/ROCm version combinations - __Fix OpenSUSE Docker Generation__: OpenSUSE container generation fails due to a change to the `binutils-gold` package - __Error Handling__: Fix bug where errors in docker image build were being masked, allowing workflow to pass anyway. ## Technical Details <!-- Explain the changes along with any relevant GitHub links. --> - Updated `Dockerfile.opensuse` and `Dockerfile.opensuse.ci` docker files to remove `binutils-gold` - Not needed since we build `binutils` with systems anyways - Updated `rocprofiler-systems-containers.yml` to remove `pushd/popd` commands and just run the shell scripts - There was a silent failure observed here, which I verified in this PR before adding the fix for openSUSE - Refactor ROCm version parsing. Move this logic to the `build-docker.sh` script to reduce duplication. - Fix bug that caused ROCm 7.0 to fail installation. The trailing `.0` was being trimmed. - Fixed inconsistencies in `containers.yml` that lead to invalid ROCm-OS_VERSION combinations. - Formatting fixes - Removed trailing whitespace - Fix docker build warnings. Use an `=` rather than ` ` when assigning an environment variable.
This commit is contained in:
zatwierdzone przez
GitHub
rodzic
0f76bb45c7
commit
463126770a
@@ -16,6 +16,11 @@ SHELL [ "/bin/bash", "-c" ]
|
||||
|
||||
ARG EXTRA_PACKAGES=""
|
||||
ARG ROCM_VERSION="0.0"
|
||||
ARG ROCM_MAJOR=0
|
||||
ARG ROCM_MINOR=0
|
||||
ARG ROCM_PATCH=0
|
||||
ARG ROCM_VERSION_URL=0.0
|
||||
ARG ROCM_VERSN=0
|
||||
ENV PATH=${HOME}/.local/bin:${PATH}
|
||||
|
||||
RUN apt-get update && \
|
||||
@@ -33,19 +38,11 @@ RUN apt-get update && \
|
||||
python3 -m pip install --break-system-packages 'cmake==3.21' perfetto; \
|
||||
fi
|
||||
|
||||
RUN ROCM_MAJOR=$(echo "${ROCM_VERSION}" | sed 's/\./ /g' | awk '{print $1}') && \
|
||||
ROCM_MINOR=$(echo "${ROCM_VERSION}" | sed 's/\./ /g' | awk '{print $2}') && \
|
||||
if [ "${ROCM_MAJOR}" != "0" ] || [ "${ROCM_MINOR}" != "0" ]; then \
|
||||
RUN if [ "${ROCM_MAJOR}" != "0" ] || [ "${ROCM_MINOR}" != "0" ]; then \
|
||||
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_PATCH=$(echo "${ROCM_VERSION}" | sed 's/\./ /g' | awk '{print $3}') && \
|
||||
if [ -z "${ROCM_PATCH}" ] || [ "${ROCM_PATCH}" = "0" ]; then \
|
||||
ROCM_PATCH=0 && \
|
||||
ROCM_VERSION=$(echo "${ROCM_VERSION}" | sed 's/\.0$//') \
|
||||
; fi && \
|
||||
ROCM_VERSN=$(( ("${ROCM_MAJOR}"*10000)+("${ROCM_MINOR}"*100) + ("${ROCM_PATCH}"))) && \
|
||||
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} && \
|
||||
wget https://repo.radeon.com/amdgpu-install/${ROCM_VERSION_URL}/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} && \
|
||||
|
||||
Reference in New Issue
Block a user