Skip to content

merge aomp-dev into amd-staging #2439

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

Closed
z1-cciauto wants to merge 2 commits into from
Closed

merge aomp-dev into amd-staging #2439

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd12725
[aomp] QE: update defaults to use srock/llvm (#2438)
dpalermo Aug 18, 2026
a3e98a9
merge aomp-dev into amd-staging
z1-cciauto Aug 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
13 changes: 7 additions & 6 deletions bin/run_qe.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export AOMP_USE_CCACHE=0
export LIBOMPTARGET_KERNEL_TRACE=${LIBOMPTARGET_KERNEL_TRACE:-0}

# Setup AOMP variables
AOMP=${AOMP:-/usr/lib/aomp}
AOMP=${AOMP:-$HOME/rocm/srock/llvm}

# Use function to set and test AOMP_GPU
setaompgpu
Expand All @@ -43,9 +43,9 @@ setaompgpu
AOMP_QE_REPO_NAME=${AOMP_QE_REPO_NAME:-q-e-omp}
QE_REPO=${QE_REPO:-$AOMP_REPOS_TEST/$AOMP_QE_REPO_NAME}

# ROCm root passed to QE configure (--with-rocm). ROCM_DIR is set by
# aomp_common_vars; fall back to /opt/rocm for a standard ROCm install.
ROCM_PATH=${ROCM_PATH:-${ROCM_DIR:-/opt/rocm}}
# ROCm root passed to QE configure (--with-rocm). ROCM_PATH can be set
# explicitly; or computed relative to the given $AOMP llvm directory.
ROCM_PATH=${ROCM_PATH:-"$(realpath -m "$(realpath -m "$AOMP")/../..")"}

# GPU arch passed to QE configure (--with-gpu-arch). Defaults to detected AOMP_GPU.
GPU_ARCH=${GPU_ARCH:-$AOMP_GPU}
Expand Down Expand Up @@ -75,6 +75,7 @@ export OMPI_FC=${OMPI_FC:-amdflang}
export OMPI_CC=${OMPI_CC:-amdclang}
export OMPI_CXX=${OMPI_CXX:-amdclang++}

echo "ROCM_PATH= $ROCM_PATH"
# --- Runtime environment ---------------------------------------------------
export OMP_NUM_THREADS=1

Expand Down Expand Up @@ -154,11 +155,11 @@ get_openmpi_node_binding()
fi

local task_place=numa
if [ ${ntasks_per_socket} -eq 0 ]; then
if [ "${ntasks_per_socket}" -eq 0 ]; then
ntasks_per_numa=${ntasks_per_node}
nnuma_node_avail=${nsocket_node_avail}
task_place=node
elif [ ${ntasks_per_numa} -eq 0 ]; then
elif [ "${ntasks_per_numa}" -eq 0 ]; then
ntasks_per_numa=${ntasks_per_socket}
nnuma_node_avail=${nsocket_node_avail}
task_place=socket
Expand Down