Merge remote-tracking branch 'gerrit/release-4-6'

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

diff --git a/src/config.h.cmakein b/src/config.h.cmakein
index 54e89b34122d3512305312a319702973093687c2..8fb7c625a20b933707daaeeab2cb8ee955a0be44 100644 (file)
--- a/src/config.h.cmakein
+++ b/src/config.h.cmakein
@@ -20,16 +20,34 @@
 #cmakedefine USE_VERSION_H
 
 /* Default location of data files */
-#cmakedefine GMXLIBDIR "@GMXLIBDIR@"
+#define GMXLIBDIR "@GMXLIBDIR@"
 
 /* Hardware and OS version for build host */
-#cmakedefine BUILD_MACHINE "@BUILD_MACHINE@"
+#define BUILD_HOST "@BUILD_HOST@"
+
+/* CPU information for build host */
+#define BUILD_CPU_VENDOR "@BUILD_CPU_VENDOR@"
+
+#define BUILD_CPU_BRAND "@BUILD_CPU_BRAND@"
+
+#define BUILD_CPU_FAMILY @BUILD_CPU_FAMILY@
+
+#define BUILD_CPU_MODEL @BUILD_CPU_MODEL@
+
+#define BUILD_CPU_STEPPING @BUILD_CPU_STEPPING@
+
+#define BUILD_CPU_FEATURES "@BUILD_CPU_FEATURES@"
+
+/* Compiler and CFLAGS from build */
+#define BUILD_COMPILER "@BUILD_COMPILER@"
+
+#define BUILD_CFLAGS   "@BUILD_CFLAGS@"
 
 /* Date and time for build */
-#cmakedefine BUILD_TIME "@BUILD_TIME@"
+#define BUILD_TIME "@BUILD_TIME@"
 
 /* User doing build */
-#cmakedefine BUILD_USER "@BUILD_USER@"
+#define BUILD_USER "@BUILD_USER@"
 
 /* Binary suffix for the created binaries */
 #define GMX_BINARY_SUFFIX "@GMX_BINARY_SUFFIX@"
@@ -40,10 +58,10 @@
 /* Binary directory for the build */
 #cmakedefine CMAKE_BINARY_DIR "@CMAKE_BINARY_DIR@"
 
-/* Turn off water-water neighborlist optimization only */
+/* Turn off water-water neighborlist optimization only - not used right now */
 #cmakedefine DISABLE_WATERWATER_NLIST
 
-/* Turn off all water neighborlist optimization */
+/* Turn off all water neighborlist optimization - not used right now */
 #cmakedefine DISABLE_WATER_NLIST
 
 /* Fortran support */
@@ -88,14 +106,20 @@
 /* Use AMD core math library */
 #cmakedefine GMX_FFT_ACML
 
-/* Single-precision SSE instructions on ia32 */
-#cmakedefine GMX_IA32_SSE
+/* What type of acceleration is used? (string, for dumping to files) */
+#define GMX_ACCELERATION "@GMX_ACCELERATION@"
+
+/* SSE2 acceleration */
+#cmakedefine GMX_X86_SSE2
 
-/* Double-precision SSE2 instructions on ia32 */
-#cmakedefine GMX_IA32_SSE2
+/* SSE4.1 acceleration */
+#cmakedefine GMX_X86_SSE4_1
 
-/* Use ia64 assembly tuned for Itanium2 */
-#cmakedefine GMX_IA64_ASM
+/* AVX 128-bit acceleration with FMA, useful on modern AMD hardware */
+#cmakedefine GMX_X86_AVX_128_FMA
+
+/* AVX 256-bit acceleration, usually for intel hardware */
+#cmakedefine GMX_X86_AVX_256
 
 /* Integer byte order is big endian. */
 #cmakedefine GMX_INTEGER_BIG_ENDIAN 
@@ -125,9 +149,6 @@
 /* Ignore calls to system(3) */
 #cmakedefine GMX_NO_SYSTEM
 
-/* Use PowerPC Altivec inner loops */
-#cmakedefine GMX_PPC_ALTIVEC
-
 /* Use (modified) Gamess-UK for QM-MM calculations */
 #cmakedefine GMX_QMMM_GAMESS
 
@@ -170,26 +191,8 @@
 /* Define for sysconf() */
 #cmakedefine HAVE_SYSCONF
 
-/* Single-precision SSE instructions on X86_64 */
-#cmakedefine GMX_X86_64_SSE
-
-/* Double-precision SSE2 instructions on X86_64 */
-#cmakedefine GMX_X86_64_SSE2
-
-/* Support for SSE intrinsics */
-#cmakedefine GMX_SSE
-
-/* Support for SSE2 intrinsics */
-#cmakedefine GMX_SSE2
-
-/* Support for SSE3 intrinsics */
-#cmakedefine GMX_SSE3
-
-/* Support for SSE4.1 intrinsics */
-#cmakedefine GMX_SSE4_1
-
-/* Define to 1 if you have the <altivec.h> header file. */
-#cmakedefine HAVE_ALTIVEC_H
+/* Enable x86 gcc inline assembly */
+#cmakedefine GMX_X86_GCC_INLINE_ASM
 
 /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
 #cmakedefine HAVE_FSEEKO
@@ -269,6 +272,9 @@
 /* Define to 1 if you have the <sys/time.h> header file. */
 #cmakedefine HAVE_SYS_TIME_H
 
+/* Define to 1 if you have the <x86intrin.h> header file */
+#cmakedefine HAVE_X86INTRIN_H
+
 /* Define for sched.h (this is for thread_mpi)*/
 #define HAVE_SCHED_H