From e95de835c05cf3d43d78677b57b8e759f0e6d8a4 Mon Sep 17 00:00:00 2001 From: Stan Moore Date: Mon, 23 Sep 2024 15:38:29 -0600 Subject: [PATCH] Tweak build defaults --- cmake/Modules/Packages/KOKKOS.cmake | 21 +++++++++++---------- lib/kokkos/Makefile.kokkos | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/cmake/Modules/Packages/KOKKOS.cmake b/cmake/Modules/Packages/KOKKOS.cmake index 691be4cd67..adb3abab6b 100644 --- a/cmake/Modules/Packages/KOKKOS.cmake +++ b/cmake/Modules/Packages/KOKKOS.cmake @@ -8,8 +8,6 @@ endif() ######################################################################## # consistency checks and Kokkos options/settings required by LAMMPS if(Kokkos_ENABLE_CUDA) - message(STATUS "KOKKOS: Enabling CUDA LAMBDA function support") - set(Kokkos_ENABLE_CUDA_LAMBDA ON CACHE BOOL "" FORCE) option(Kokkos_ENABLE_IMPL_CUDA_MALLOC_ASYNC "CUDA asynchronous malloc support" OFF) mark_as_advanced(Kokkos_ENABLE_IMPL_CUDA_MALLOC_ASYNC) if(Kokkos_ENABLE_IMPL_CUDA_MALLOC_ASYNC) @@ -19,12 +17,15 @@ if(Kokkos_ENABLE_CUDA) endif() endif() if(Kokkos_ENABLE_HIP) - option(KOKKOS_ENABLE_IMPL_HIP_UNIFIED_MEMORY "Enable unified memory with HIP" ON) - mark_as_advanced(KOKKOS_ENABLE_IMPL_HIP_UNIFIED_MEMORY) - option(KOKKOS_ENABLE_HIP_MULTIPLE_KERNEL_INSTANTIATIONS "Enable multiple kernel instantiations with HIP" ON) - mark_as_advanced(KOKKOS_ENABLE_HIP_MULTIPLE_KERNEL_INSTANTIATIONS) - option(KOKKOS_ENABLE_ROCTHRUST "Use RoCThrust library" ON) - mark_as_advanced(KOKKOS_ENABLE_ROCTHRUST) + option(Kokkos_ENABLE_HIP_MULTIPLE_KERNEL_INSTANTIATIONS "Enable multiple kernel instantiations with HIP" ON) + mark_as_advanced(Kokkos_ENABLE_HIP_MULTIPLE_KERNEL_INSTANTIATIONS) + option(Kokkos_ENABLE_ROCTHRUST "Use RoCThrust library" ON) + mark_as_advanced(Kokkos_ENABLE_ROCTHRUST) + + if(Kokkos_ARCH_AMD_GFX942 OR Kokkos_ARCH_AMD_GFX940) + option(Kokkos_ENABLE_IMPL_HIP_UNIFIED_MEMORY "Enable unified memory with HIP" ON) + mark_as_advanced(Kokkos_ENABLE_IMPL_HIP_UNIFIED_MEMORY) + endif() endif() # Adding OpenMP compiler flags without the checks done for # BUILD_OMP can result in compile failures. Enforce consistency. @@ -38,8 +39,8 @@ if(Kokkos_ENABLE_SERIAL) if(NOT (Kokkos_ENABLE_OPENMP OR Kokkos_ENABLE_THREADS OR Kokkos_ENABLE_CUDA OR Kokkos_ENABLE_HIP OR Kokkos_ENABLE_SYCL OR Kokkos_ENABLE_OPENMPTARGET)) - message(STATUS "KOKKOS: Disabling atomics for Serial Backend") - set(Kokkos_ENABLE_ATOMICS_BYPASS ON CACHE BOOL "" FORCE) + option(Kokkos_ENABLE_ATOMICS_BYPASS "Disable atomics for Kokkos Serial Backend" ON) + mark_as_advanced(Kokkos_ENABLE_ATOMICS_BYPASS) endif() endif() ######################################################################## diff --git a/lib/kokkos/Makefile.kokkos b/lib/kokkos/Makefile.kokkos index eb059d9b81..eb95c5448d 100644 --- a/lib/kokkos/Makefile.kokkos +++ b/lib/kokkos/Makefile.kokkos @@ -41,7 +41,7 @@ KOKKOS_STANDALONE_CMAKE ?= "no" # Default settings specific options. # Options: force_uvm,use_ldg,rdc,enable_lambda,enable_constexpr,disable_malloc_async -KOKKOS_CUDA_OPTIONS ?= "enable_lambda,disable_malloc_async" +KOKKOS_CUDA_OPTIONS ?= "disable_malloc_async" # Options: rdc KOKKOS_HIP_OPTIONS ?= ""