Skip to content

GPU CMake: Some build improvements #14060

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
davidrohr merged 2 commits into from
Mar 14, 2025
Merged

GPU CMake: Some build improvements #14060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90f0312
GPU CMake: Auto-detect ROCm even if CMake prefix path not set
davidrohr Mar 13, 2025
ade6902
GPU Standalone: fix prepare script using O2 env modules
davidrohr Mar 13, 2025
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
4 changes: 2 additions & 2 deletions GPU/GPUTracking/Standalone/cmake/prepare.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ else
WORK_DIR="$ALIBUILD_WORK_DIR"
fi
eval "`alienv shell-helper`"
alienv load O2/latest
for i in Vc boost fmt CMake ms_gsl Clang ninja; do
# alienv load O2/latest
for i in Vc boost fmt CMake ms_gsl Clang ninja TBB ROOT; do
source sw/$ALIARCH/$i/latest/etc/profile.d/init.sh
done
7 changes: 5 additions & 2 deletions dependencies/FindO2GPU.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,15 +198,18 @@ endif()

# Detect and enable HIP
if(ENABLE_HIP)
if("$ENV{CMAKE_PREFIX_PATH}" MATCHES "rocm")
if(NOT "$ENV{CMAKE_PREFIX_PATH}" MATCHES "rocm" AND NOT CMAKE_PREFIX_PATH MATCHES "rocm" AND EXISTS "/opt/rocm/lib/cmake/")
list(APPEND CMAKE_PREFIX_PATH "/opt/rocm/lib/cmake")
endif()
if("$ENV{CMAKE_PREFIX_PATH}" MATCHES "rocm" OR CMAKE_PREFIX_PATH MATCHES "rocm")
set(CMAKE_HIP_STANDARD ${CMAKE_CXX_STANDARD})
set(CMAKE_HIP_STANDARD_REQUIRED TRUE)
if(HIP_AMDGPUTARGET)
set(AMDGPU_TARGETS "${HIP_AMDGPUTARGET}" CACHE STRING "AMD GPU targets to compile for" FORCE)
set(GPU_TARGETS "${HIP_AMDGPUTARGET}" CACHE STRING "AMD GPU targets to compile for" FORCE)
set(CMAKE_HIP_ARCHITECTURES "${HIP_AMDGPUTARGET}" CACHE STRING "AMD GPU targets to compile for" FORCE)
endif()
set(TMP_ROCM_DIR_LIST $ENV{CMAKE_PREFIX_PATH})
set(TMP_ROCM_DIR_LIST "${CMAKE_PREFIX_PATH}:$ENV{CMAKE_PREFIX_PATH}")
string(REPLACE ":" ";" TMP_ROCM_DIR_LIST "${TMP_ROCM_DIR_LIST}")
list(FILTER TMP_ROCM_DIR_LIST INCLUDE REGEX rocm)
list(POP_FRONT TMP_ROCM_DIR_LIST TMP_ROCM_DIR)
Expand Down