Allow OFFLOAD_ARCH not being set for NVHPC.

PDoakORNL · Oct 1, 2021 · fe7fba7 · fe7fba7
1 parent a9e69a1
commit fe7fba7
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/CMake/NVHPCCompilers.cmake b/CMake/NVHPCCompilers.cmake
@@ -7,22 +7,24 @@ if(QMC_OMP)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mp=allcores")
   if(ENABLE_OFFLOAD AND NOT CMAKE_SYSTEM_NAME STREQUAL "CrayLinuxEnvironment")
     message(WARNING "QMCPACK OpenMP offload is not ready for NVIDIA HPC compiler.")
-    if(NOT DEFINED OFFLOAD_ARCH)
-      if(DEFINED 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()
+    if(NOT DEFINED OFFLOAD_ARCH AND DEFINED 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()
+    endif()
+
+    if(DEFINED OFFLOAD_ARCH)
+      if(NOT OFFLOAD_ARCH MATCHES "cc")
         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.")
       endif()
+      set(OPENMP_OFFLOAD_COMPILE_OPTIONS "-gpu=${OFFLOAD_ARCH}")
     endif()
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mp=gpu")
-    set(OPENMP_OFFLOAD_COMPILE_OPTIONS "-gpu=${OFFLOAD_ARCH}")
   else()
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mp=allcores")
   endif()