Skip to content

Commit 4204d44

Browse files
committed
GPU CMake: Set GPU architecture before checking the language, to suppress warnings about architecture detection failure
1 parent 37d0ba1 commit 4204d44

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

dependencies/FindO2GPU.cmake

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,9 @@ endif()
103103

104104
# ---------------------------------- CUDA ----------------------------------
105105
if(ENABLE_CUDA)
106+
if(CUDA_COMPUTETARGET)
107+
set(CMAKE_CUDA_ARCHITECTURES ${CUDA_COMPUTETARGET} CACHE STRING "" FORCE)
108+
endif()
106109
set(CMAKE_CUDA_STANDARD ${CMAKE_CXX_STANDARD})
107110
set(CMAKE_CUDA_STANDARD_REQUIRED TRUE)
108111
include(CheckLanguage)
@@ -227,6 +230,9 @@ endif()
227230

228231
# ---------------------------------- HIP ----------------------------------
229232
if(ENABLE_HIP)
233+
if(HIP_AMDGPUTARGET)
234+
set(CMAKE_HIP_ARCHITECTURES "${HIP_AMDGPUTARGET}" CACHE STRING "" FORCE)
235+
endif()
230236
if(NOT "$ENV{CMAKE_PREFIX_PATH}" MATCHES "rocm" AND NOT CMAKE_PREFIX_PATH MATCHES "rocm" AND EXISTS "/opt/rocm/lib/cmake/")
231237
list(APPEND CMAKE_PREFIX_PATH "/opt/rocm/lib/cmake")
232238
endif()
@@ -300,7 +306,7 @@ if(ENABLE_HIP)
300306
endif()
301307
string(REGEX REPLACE "(gfx1[0-9]+;?)" "" CMAKE_HIP_ARCHITECTURES "${CMAKE_HIP_ARCHITECTURES}") # ROCm currently doesn’t support integrated graphics
302308
if(HIP_AMDGPUTARGET)
303-
set(CMAKE_HIP_ARCHITECTURES "${HIP_AMDGPUTARGET}") # If GPU build is enforced we override autodetection
309+
set(CMAKE_HIP_ARCHITECTURES "${HIP_AMDGPUTARGET}")
304310
endif()
305311
else()
306312
set(HIP_ENABLED OFF)

0 commit comments

Comments
 (0)