From 88c29b7f429369635c0222b4352b7248ad975294 Mon Sep 17 00:00:00 2001
From: Ye Luo <yeluo@anl.gov>
Date: Thu, 2 Jan 2025 14:35:12 -0600
Subject: [PATCH] Remove "none" option in ENABLE_SANITIZER. Just leave it
 unset.

---
 CMake/DetermineDeviceArchitectures.cmake |  4 ++++
 CMakeLists.txt                           | 21 ++++++++++-----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/CMake/DetermineDeviceArchitectures.cmake b/CMake/DetermineDeviceArchitectures.cmake
index 1b95d8604c..59a59e975f 100644
--- a/CMake/DetermineDeviceArchitectures.cmake
+++ b/CMake/DetermineDeviceArchitectures.cmake
@@ -95,6 +95,10 @@ set(QMC_GPU_ARCHS
     ${QMC_GPU_ARCHS}
     CACHE STRING "Accelerator device architectures" FORCE)
 
+if(QMC_GPU_ARCHS)
+  message(STATUS "GPU device architectures: ${QMC_GPU_ARCHS}")
+endif()
+
 # QMC_GPU_ARCHS is the single source of truth and thus overwrite CMAKE_CUDA/HIP_ARCHITECTURES
 if(ENABLE_CUDA)
   if(QMC_CUDA2HIP)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3557fc041a..542e70b6af 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,7 +105,6 @@ if(ENABLE_CUDA AND NOT QMC_CUDA2HIP)
 endif()
 
 include(DetermineDeviceArchitectures)
-message(STATUS "GPU device architectures: ${QMC_GPU_ARCHS}")
 
 #--------------------------------------------------------------------
 # Set compiler-time parameters
@@ -195,17 +194,17 @@ mark_as_advanced(QMC_EXP_THREADING)
 #--------------------------------------------------------------------
 
 # Add optional sanitizers ASAN, UBSAN, MSAN
-set(VALID_SANITIZERS "none" "asan" "ubsan" "tsan" "msan")
-set(ENABLE_SANITIZER
-    "none"
-    CACHE STRING "none,asan,ubsan,tsan,msan")
+set(VALID_SANITIZERS "asan" "ubsan" "tsan" "msan")
+set(ENABLE_SANITIZER "" CACHE STRING "asan,ubsan,tsan,msan")
 set_property(CACHE ENABLE_SANITIZER PROPERTY STRINGS ${VALID_SANITIZERS})
 
-# Perform sanitizer option check, only works in debug mode
-if(NOT ENABLE_SANITIZER IN_LIST VALID_SANITIZERS)
-  message(FATAL_ERROR "Invalid -DENABLE_SANITIZER=${ENABLE_SANITIZER}, value must be one of ${VALID_SANITIZERS}")
-else()
-  message(STATUS "Enable sanitizer ENABLE_SANITIZER=${ENABLE_SANITIZER}")
+if(ENABLE_SANITIZER)
+  # Perform sanitizer option check, only works in debug mode
+  if(NOT ENABLE_SANITIZER IN_LIST VALID_SANITIZERS)
+    message(FATAL_ERROR "Invalid -DENABLE_SANITIZER=${ENABLE_SANITIZER}, value must be one of ${VALID_SANITIZERS}")
+  else()
+    message(STATUS "Enable sanitizer ENABLE_SANITIZER=${ENABLE_SANITIZER}")
+  endif()
 endif()
 
 #--------------------------------------------------------------------
@@ -318,7 +317,7 @@ include(TestCxx17Library)
 #-----------------------------------------------------------------------
 # SETUP SANITIZERS FLAGS
 #-----------------------------------------------------------------------
-if(NOT "${ENABLE_SANITIZER}" STREQUAL "none")
+if(ENABLE_SANITIZER)
   if(NOT ${COMPILER} MATCHES "GNU" AND NOT ${COMPILER} MATCHES "Clang")
     message(FATAL_ERROR "-DENABLE_SANITIZER=${ENABLE_SANITIZER} only works with GNU or Clang compilers")
   endif()