GPU CMake: Another attempt to silence the CMake warnings about architectures

Author: davidrohr

GPU/GPUTracking/Standalone/CMakeLists.txt

@@ -125,10 +125,10 @@ find_package(O2GPU REQUIRED)
 
 if(GPUCA_CONFIG_ONNX)
   find_package(onnxruntime REQUIRED)
-  if(CUDA_ENABLED AND NOT DEFINED ORT_CUDA_BUILD)
-    set(ORT_CUDA_BUILD ON)
-  elseif(HIP_ENABLED AND NOT DEFINED ORT_ROCM_BUILD)
+  if(HIP_ENABLED AND NOT DEFINED ORT_ROCM_BUILD)
     set(ORT_ROCM_BUILD ON)
+  elseif(CUDA_ENABLED AND NOT DEFINED ORT_CUDA_BUILD)
+    set(ORT_CUDA_BUILD ON)
   endif()
 else()
   set(onnxruntime_FOUND OFF)

dependencies/FindO2GPU.cmake

@@ -104,7 +104,9 @@ endif()
 # ---------------------------------- CUDA ----------------------------------
 if(ENABLE_CUDA)
   if(CUDA_COMPUTETARGET)
-    set(CMAKE_CUDA_ARCHITECTURES ${CUDA_COMPUTETARGET} CACHE STRING "" FORCE)
+    set(CMAKE_CUDA_ARCHITECTURES ${CUDA_COMPUTETARGET})
+  else()
+    set(CMAKE_CUDA_ARCHITECTURES 61-virtual)
   endif()
   set(CMAKE_CUDA_STANDARD ${CMAKE_CXX_STANDARD})
   set(CMAKE_CUDA_STANDARD_REQUIRED TRUE)
@@ -121,11 +123,6 @@ if(ENABLE_CUDA)
       message(STATUS "Using as CUDA GCC version: ${GPUCA_CUDA_GCCBIN}")
       set(CMAKE_CUDA_HOST_COMPILER "${GPUCA_CUDA_GCCBIN}")
     endif()
-    if(CUDA_COMPUTETARGET)
-      set(CMAKE_CUDA_ARCHITECTURES ${CUDA_COMPUTETARGET} CACHE STRING "" FORCE)
-    else()
-      set(CMAKE_CUDA_ARCHITECTURES 61-virtual CACHE STRING "" FORCE)
-    endif()
     enable_language(CUDA)
     get_property(LANGUAGES GLOBAL PROPERTY ENABLED_LANGUAGES)
     if (ENABLE_CUDA STREQUAL "AUTO")
@@ -231,19 +228,15 @@ endif()
 # ---------------------------------- HIP ----------------------------------
 if(ENABLE_HIP)
   if(HIP_AMDGPUTARGET)
-    set(CMAKE_HIP_ARCHITECTURES "${HIP_AMDGPUTARGET}" CACHE STRING "" FORCE)
+    set(CMAKE_HIP_ARCHITECTURES "${HIP_AMDGPUTARGET}")
+    set(AMDGPU_TARGETS "${HIP_AMDGPUTARGET}")
   endif()
   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 "${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)