By default GMX_ACCELERATION is now "auto".

On x86 systems the SSE support is detected and tunred on automatically,
on other platforms the flag should be set explicitly.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3fd20689de6824ee3ce0ce018b808eee9bc4dfec..7132beab355fc7624cd110a9f1998bea8d373f50 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,12 +48,12 @@ gmx_c_flags()
 ########################################################################
 option(GMX_DOUBLE "Use double precision" OFF)
 option(GMX_MPI    "Build a parallel (message-passing) version of GROMACS" OFF)
-option(GMX_THREADS    "Build a parallel (threaded-based) version of GROMACS: (doesn't work yet!)" ON)
+option(GMX_THREADS    "Build a parallel (threaded-based) version of GROMACS)" ON)
 option(GMX_SOFTWARE_INVSQRT "Use GROMACS software 1/sqrt" ON)
 option(GMX_FAHCORE "Build a library with mdrun functionality" OFF)
 option(GMX_OPENMM "Accelerated execution on GPUs through the OpenMM library" OFF)
-set(GMX_ACCELERATION "none" 
-    CACHE STRING "Accelerated kernels. Pick one of: SSE, BlueGene, Power6, ia64, altivec")
+set(GMX_ACCELERATION "auto" 
+    CACHE STRING "Accelerated kernels. Pick one of: none, SSE, BlueGene, Power6, ia64, altivec")
 
 set(GMX_FFT_LIBRARY "fftw3" 
     CACHE STRING "FFT library choices: fftw3,fftw2,mkl,fftpack[built-in]")
@@ -128,7 +128,7 @@ if(GMX_OPENMM)
     if(GMX_SOFTWARE_INVSQRT)
         set(GMX_SOFTWARE_INVSQRT OFF)
     endif(GMX_SOFTWARE_INVSQRT)
-    if(NOT GMX_ACCELERATION MATCHES "none|None|NONE" OR NOT ${GMX_ACCELERATION} STREQUAL "")
+    if(NOT GMX_ACCELERATION MATCHES "auto|none|None|NONE" OR NOT ${GMX_ACCELERATION} STREQUAL "")
         message(WARNING "The OpenMM build does not support other acceleration modes!")
         set(GMX_ACCELERATION "none")
     endif()
@@ -342,8 +342,8 @@ include(gmxTestInlineASM)
 gmx_test_inline_asm_gcc_x86(GMX_X86_GCC_INLINE_ASM)
 gmx_test_inline_asm_msvc_x86(GMX_X86_MSVC_INLINE_ASM)
 
-# reasonable defaults for fast binaries.
-if (NOT DEFINED GMX_SSE_SET)
+# turn on SSE if supported with reasonable defaults.
+if (${GMX_ACCELERATION} STREQUAL "auto")
     if (GMX_X86_GCC_INLINE_ASM)
         set(GMX_ACCELERATION "SSE" CACHE STRING "Accelerated kernels. Pick one of: SSE, BlueGene, Power6, ia64, altivec" FORCE)
         if (GMX_64_BIT)
@@ -354,8 +354,7 @@ if (NOT DEFINED GMX_SSE_SET)
                 "Add SSE assembly files for IA32" FORCE)
         endif (GMX_64_BIT)
     endif (GMX_X86_GCC_INLINE_ASM)
-    set (GMX_SSE_SET true CACHE INTERNAL "SSE is set" FORCE)
-endif (NOT DEFINED GMX_SSE_SET)
+endif (${GMX_ACCELERATION} STREQUAL "auto")