Define KOKKOS_ARCH_NVIDIA_GPU macro when targeting an NVIDIA GPU arch…

…itecture
sandialabs · Mar 2, 2023 · 5d3bcb1 · 5d3bcb1
1 parent fc4a9ce
commit 5d3bcb1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/Makefile.kokkos b/Makefile.kokkos
@@ -1055,6 +1055,8 @@ ifeq ($(KOKKOS_INTERNAL_USE_CUDA_ARCH), 1)
   endif
 
   ifneq ($(KOKKOS_INTERNAL_USE_ARCH_NVIDIA), 0)
+    tmp := $(call kokkos_append_header,"$H""define KOKKOS_ARCH_NVIDIA_GPU")
+
     KOKKOS_CXXFLAGS += $(KOKKOS_INTERNAL_CUDA_ARCH_FLAG)
 
     ifeq ($(KOKKOS_INTERNAL_COMPILER_NVCC), 1)

diff --git a/cmake/KokkosCore_config.h.in b/cmake/KokkosCore_config.h.in
@@ -108,6 +108,7 @@
 #cmakedefine KOKKOS_ARCH_AMPERE86
 #cmakedefine KOKKOS_ARCH_HOPPER
 #cmakedefine KOKKOS_ARCH_HOPPER90
+#cmakedefine KOKKOS_ARCH_NVIDIA_GPU
 #cmakedefine KOKKOS_ARCH_AMD_ZEN
 #cmakedefine KOKKOS_ARCH_AMD_ZEN2
 #cmakedefine KOKKOS_ARCH_AMD_ZEN3

diff --git a/cmake/kokkos_arch.cmake b/cmake/kokkos_arch.cmake
@@ -566,6 +566,7 @@ FUNCTION(CHECK_CUDA_ARCH ARCH FLAG)
     IF(CUDA_ARCH_ALREADY_SPECIFIED)
       MESSAGE(FATAL_ERROR "Multiple GPU architectures given! Already have ${CUDA_ARCH_ALREADY_SPECIFIED}, but trying to add ${ARCH}. If you are re-running CMake, try clearing the cache and running again.")
     ENDIF()
+    SET(KOKKOS_ARCH_NVIDIA_GPU ON PARENT_SCOPE)
     SET(CUDA_ARCH_ALREADY_SPECIFIED ${ARCH} PARENT_SCOPE)
     IF (NOT KOKKOS_ENABLE_CUDA AND NOT KOKKOS_ENABLE_OPENMPTARGET AND NOT KOKKOS_ENABLE_SYCL AND NOT KOKKOS_ENABLE_OPENACC)
       MESSAGE(WARNING "Given CUDA arch ${ARCH}, but Kokkos_ENABLE_CUDA, Kokkos_ENABLE_OPENACC, and Kokkos_ENABLE_OPENMPTARGET are OFF. Option will be ignored.")