Merge release-2018 into master

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

diff --git a/src/config.h.cmakein b/src/config.h.cmakein
index 894338768747e0310b9123f5b61f63b860bf0e26..7645af8f27a6f8ddc119e12955c6c3652768ae19 100644 (file)
--- a/src/config.h.cmakein
+++ b/src/config.h.cmakein
@@ -65,9 +65,6 @@
 /* Target platform is x86 or x86_64 */
 #cmakedefine01 GMX_TARGET_X86
 
-/* Target platform is BlueGene/Q */
-#cmakedefine01 GMX_TARGET_BGQ
-
 /** Define if we are building natively on Windows */
 #cmakedefine01 GMX_NATIVE_WINDOWS
 
@@ -107,9 +104,6 @@
 /* ARM (AArch64) NEON Advanced SIMD instruction set level was selected */
 #cmakedefine01 GMX_SIMD_ARM_NEON_ASIMD
 
-/* IBM QPX was selected as SIMD instructions (e.g. BlueGene/Q) */
-#cmakedefine01 GMX_SIMD_IBM_QPX
-
 /* IBM VMX was selected as SIMD instructions (Power 6 and later) */
 #cmakedefine01 GMX_SIMD_IBM_VMX
 
@@ -169,7 +163,7 @@
 #cmakedefine01 GMX_OPENMP
 
 /* Use the Portable Hardware Locality package (hwloc) */
-#cmakedefine01 GMX_HWLOC
+#cmakedefine01 GMX_USE_HWLOC
 
 /* Can and should use nice(3) to set priority */
 #cmakedefine01 GMX_USE_NICE
@@ -247,6 +241,9 @@
 /* Use a single compilation unit when compiling the CUDA (non-bonded) kernels.  */
 #cmakedefine01 GMX_CUDA_NB_SINGLE_COMPILATION_UNIT
 
+/* Cluster size used by nonbonded OpenCL kernel. Should be 8 for NVIDIA/AMD and 4 for Intel */
+#define GMX_OCL_NB_CLUSTER_SIZE @GMX_OCL_NB_CLUSTER_SIZE@
+
 /* Use NVML */
 #cmakedefine01 HAVE_NVML
 
@@ -377,6 +374,12 @@
 /* Define if we have feenableexcept */
 #cmakedefine01 HAVE_FEENABLEEXCEPT
 
+/* Define if we have fedisableexcept */
+#cmakedefine01 HAVE_FEDISABLEEXCEPT
+
+/* Define if we have lmfit support */
+#cmakedefine01 HAVE_LMFIT
+
 /*! \endcond */
 
 #endif