Merge release-4-6 into master

[alexxy/gromacs.git] / src / config.h.cmakein

diff --git a/src/config.h.cmakein b/src/config.h.cmakein
index f4dc1148b4bb4c2e0b6d53ad1c30f276879ecb7f..2a5577e8a2d3c60a9fc945af9b33f86577585175 100644 (file)
--- a/src/config.h.cmakein
+++ b/src/config.h.cmakein
@@ -54,9 +54,6 @@
  */
 #cmakedefine GMX_FLOAT_FORMAT_IEEE754
 
-/* Use assembly intrinsics kernels for BlueGene */
-#cmakedefine GMX_BLUEGENE
-
 /* Work around broken calloc() */
 #cmakedefine GMX_BROKEN_CALLOC
 
@@ -93,6 +90,9 @@
 /* AVX 256-bit instructions available */
 #cmakedefine GMX_X86_AVX_256
 
+/* GCC bug in AVX maskload/maskstore arguments - worked around internally */
+#cmakedefine GMX_X86_AVX_GCC_MASKLOAD_BUG
+
 /* SSE2 was selected as CPU acceleration level */
 #cmakedefine GMX_CPU_ACCELERATION_X86_SSE2
 
@@ -105,6 +105,9 @@
 /* AVX 256-bit was selected as CPU acceleration level */
 #cmakedefine GMX_CPU_ACCELERATION_X86_AVX_256
 
+/* IBM QPX was selected as CPU acceleration type (e.g. BlueGene/Q) */
+#cmakedefine GMX_CPU_ACCELERATION_IBM_QPX
+
 /* String for CPU acceleration choice (for writing to log files and stdout) */
 #define GMX_CPU_ACCELERATION_STRING "@GMX_CPU_ACCELERATION@"
 
@@ -148,9 +151,6 @@
 /* Use the GROMACS software 1/sqrt(x) */
 #cmakedefine GMX_SOFTWARE_INVSQRT
 
-/* Use the PowerPC hardware 1/sqrt(x) */
-#cmakedefine GMX_POWERPC_INVSQRT
-
 /* Use sub-counters */
 #cmakedefine GMX_CYCLE_SUBCOUNTERS
 
@@ -349,6 +349,9 @@
 /* Build special-purpose mdrun library */
 #cmakedefine GMX_FAHCORE   
 
+/* Enable gromacs quotes */
+#cmakedefine GMX_COOL_QUOTES
+
 #ifdef GMX_FAHCORE
 #define FULLINDIRECT 1
 #define USE_FAH_XDR  1