[CP 216] Update ROCm tarball URL and ROCm version to 7.14.0rc0 - #33
Merged
Conversation
Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> (cherry picked from commit 85a0ee214949a9933568f59624851961cdbe55b2)
Contributor
Author
AI-Assisted Cherry-PickSource PR: #216 The cherry-pick operation encountered merge conflicts which were resolved automatically using AI assistance. Files with conflicts (resolved by AI):
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.envFile 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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
cp of pensando/device-config-manager#216