Skip to content

[CP 216] Update ROCm tarball URL and ROCm version to 7.14.0rc0 - #33

Merged
spraveenio merged 2 commits into
ROCm:mainfrom
ci-penbot-01:CP.O2O.pensando.device-config-manager.216.rocm.device-config-manager.main
Jun 30, 2026
Merged

[CP 216] Update ROCm tarball URL and ROCm version to 7.14.0rc0#33
spraveenio merged 2 commits into
ROCm:mainfrom
ci-penbot-01:CP.O2O.pensando.device-config-manager.216.rocm.device-config-manager.main

Conversation

@ci-penbot-01

Copy link
Copy Markdown
Contributor

cp of pensando/device-config-manager#216

Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
(cherry picked from commit 85a0ee214949a9933568f59624851961cdbe55b2)
@ci-penbot-01

Copy link
Copy Markdown
Contributor Author

AI-Assisted Cherry-Pick

Source PR: #216
Target Branch: main

The cherry-pick operation encountered merge conflicts which were resolved automatically using AI assistance.

Files with conflicts (resolved by AI):

  • Makefile:98-104
  • docker/Dockerfile:13-29
  • dev.env:N/A
Original conflict in Makefile
<<<<<<< HEAD
=======
ROCM_TARBALL_URL ?= https://rocm.prereleases.amd.com/tarball-multi-arch/therock-dist-linux-multiarch-7.14.0rc0.tar.gz
ROCM_VERSION ?= 7.14.0rc0

export AMDSMI_REPO
>>>>>>> 85a0ee2... Update ROCm tarball URL and ROCm version to 7.14.0rc0 (#1) (#216)
Original conflict in docker/Dockerfile
<<<<<<< HEAD
ARG ROCM_VERSION=7.2.1
ARG AMDGPU_VERSION=7.2.1
=======
ARG ROCM_VERSION=7.14.0rc0
ARG AMDGPU_VERSION=7.14.0rc0
# S3 therock nightly tarball (optional). Set ROCM_TARBALL_URL to install ROCm
# from a therock tarball instead of repo.radeon.com.
ARG ROCM_TARBALL_URL=""

ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/home/amd/bin/:/opt/rocm/bin/
# /home/amd/lib holds the LD_PRELOADed libamd_smi (26.5.0) + its rocm_sysdeps netlink
# DT_NEEDEDs (mnl, nl_3, nl_genl_3). /opt/rocm-${ROCM_VERSION}/lib/rocm_sysdeps/lib is
# needed for therock tarball builds (librocm_sysdeps_drm.so.2 etc.); for repo.radeon.com
# builds it is a no-op.
ENV LD_LIBRARY_PATH=/home/amd/lib:/opt/rocm/lib:/opt/rocm-${ROCM_VERSION}/lib/rocm_sysdeps/lib:$LD_LIBRARY_PATH
>>>>>>> 85a0ee2... Update ROCm tarball URL and ROCm version to 7.14.0rc0 (#1) (#216)
Original conflict in dev.env
File was deleted in HEAD but modified in incoming commit. Resolved by keeping the incoming version with ROCM_TARBALL_URL and ROCM_VERSION additions.

Cherry-pick triggered by: ACP-Automation

@spraveenio spraveenio left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@spraveenio
spraveenio merged commit 52c75c8 into ROCm:main Jun 30, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants