Skip to content

merge aomp-dev into amd-staging #2172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ronlieb merged 2 commits into from
Apr 18, 2026
+32 −6
Merged

merge aomp-dev into amd-staging #2172

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa40a6b
[build_supp] Fixes to derive_rocm_path for ucc build (#2169)
dpalermo Apr 17, 2026
8d3fdbc
merge aomp-dev into amd-staging
z1-cciauto Apr 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 32 additions & 6 deletions bin/build_supp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,19 +142,23 @@ function derive_rocm_path(){
# Check if AOMP has ROCm headers (include/hip, include/rocm-core, etc.)
if [ -d "$AOMP/include/hip" ] || [ -d "$AOMP/include/rocm-core" ] ; then
ROCM_PATH=$AOMP
elif [ -d "$AOMPHIP/include/hip" ] || [ -d "$AOMPHIP/include/rocm-core" ] ; then
ROCM_PATH=$AOMPHIP
elif [ -n "$LLVM_INSTALL_LOC" ] && [ -d "$LLVM_INSTALL_LOC/../../../include/hip" ] ; then
# For standard ROCm installations: LLVM at $ROCM/lib/llvm
ROCM_PATH=$(realpath "$LLVM_INSTALL_LOC/../../..")
elif [ -d "$AOMP/../include/hip" ] ; then
elif [ -d "$(realpath -m "$AOMP")/../../include/hip" ] ; then
# Fallback: check parent of AOMP
ROCM_PATH=$(realpath "$AOMP/..")
ROCM_PATH=$(realpath -m "$(realpath -m "$AOMP")"/../..)
else
echo "Error: Cannot determine ROCM_PATH."
echo " Expected ROCm headers at \$AOMP/include/hip or similar."
echo " AOMP=$AOMP"
exit 1
return 1
fi
ROCM_PATH=$(realpath "$ROCM_PATH")
export HIPCC="$ROCM_PATH/bin/amdclang"
return 0
}

################################################################################
Expand Down Expand Up @@ -205,7 +209,13 @@ function builducx(){
_linkfrom=$AOMP_SUPP/$_cname
_builddir=$AOMP_SUPP_BUILD/$_cname

derive_rocm_path
SKIPBUILD="FALSE"
checkversion
if [ "$SKIPBUILD" == "TRUE" ] ; then
return
fi

derive_rocm_path || return

# Check if XPMEM is available
if [ ! -d "$AOMP_SUPP/xpmem" ] ; then
Expand Down Expand Up @@ -267,7 +277,13 @@ function builducc(){
_linkfrom=$AOMP_SUPP/$_cname
_builddir=$AOMP_SUPP_BUILD/$_cname

derive_rocm_path
SKIPBUILD="FALSE"
checkversion
if [ "$SKIPBUILD" == "TRUE" ] ; then
return
fi

derive_rocm_path || return

# Check if UCX is available
if [ ! -d "$AOMP_SUPP/ucx" ] ; then
Expand Down Expand Up @@ -403,7 +419,17 @@ function buildopenmpi(){
function buildrocmopenmpi(){
_cname="rocmopenmpi"
_version=5.0.9
derive_rocm_path
_installdir=$AOMP_SUPP_INSTALL/$_cname-$_version
_linkfrom=$AOMP_SUPP/$_cname
_builddir=$AOMP_SUPP_BUILD/$_cname

SKIPBUILD="FALSE"
checkversion
if [ "$SKIPBUILD" == "TRUE" ] ; then
return
fi

derive_rocm_path || return
echo "Info: Using ROCM_PATH=$ROCM_PATH"

# Check and build dependencies if needed
Expand Down