Make NVHPC support CMAKE_CUDA_ARCHITECTURES as a list.

PDoakORNL · Sep 30, 2021 · a9e69a1 · a9e69a1
1 parent be7893e
commit a9e69a1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/CMake/ClangCompilers.cmake b/CMake/ClangCompilers.cmake
@@ -21,10 +21,13 @@ if(QMC_OMP)
 
     if(NOT DEFINED OFFLOAD_ARCH AND OFFLOAD_TARGET MATCHES "nvptx64" AND DEFINED CMAKE_CUDA_ARCHITECTURES)
       list(LENGTH CMAKE_CUDA_ARCHITECTURES NUMBER_CUDA_ARCHITECTURES)
-      if(NOT NUMBER_CUDA_ARCHITECTURES EQUAL "1")
-        message(FATAL_ERROR "LLVM does not support offload to multiple architectures!")
+      if(NUMBER_CUDA_ARCHITECTURES EQUAL "1")
+        set(OFFLOAD_ARCH sm_${CMAKE_CUDA_ARCHITECTURES})
+      else()
+        message(FATAL_ERROR "LLVM does not yet support offload to multiple architectures! "
+                            "Deriving OFFLOAD_ARCH from CMAKE_CUDA_ARCHITECTURES failed. "
+                            "Please keep only one entry in CMAKE_CUDA_ARCHITECTURES or set OFFLOAD_ARCH")
       endif()
-      set(OFFLOAD_ARCH sm_${CMAKE_CUDA_ARCHITECTURES})
     endif()
 
     if(DEFINED OFFLOAD_ARCH)

diff --git a/CMake/NVHPCCompilers.cmake b/CMake/NVHPCCompilers.cmake
@@ -9,7 +9,13 @@ if(QMC_OMP)
     message(WARNING "QMCPACK OpenMP offload is not ready for NVIDIA HPC compiler.")
     if(NOT DEFINED OFFLOAD_ARCH)
       if(DEFINED CMAKE_CUDA_ARCHITECTURES)
-        set(OFFLOAD_ARCH cc${CMAKE_CUDA_ARCHITECTURES})
+        list(LENGTH CMAKE_CUDA_ARCHITECTURES NUMBER_CUDA_ARCHITECTURES)
+        if(NUMBER_CUDA_ARCHITECTURES EQUAL "1")
+          set(OFFLOAD_ARCH cc${CMAKE_CUDA_ARCHITECTURES})
+        else()
+          string(REPLACE ";" ",cc" OFFLOAD_ARCH "${CMAKE_CUDA_ARCHITECTURES}")
+          set(OFFLOAD_ARCH "cc${OFFLOAD_ARCH}")
+        endif()
       else()
         message(FATAL_ERROR "NVIDIA HPC compiler requires -gpu=ccXX option set based on the target GPU architecture! "
                             "Please add -DOFFLOAD_ARCH=ccXX to cmake. For example, cc70 is for Volta.")