Another batch of added config.h

Include config.h explicitly in most places where it is used instead of
relying on getting the definitions from "somewhere".

Change-Id: I3c6702cea59fca10226a13714c8ffddc482c224a

diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/kernelutil_x86_avx_128_fma_double.h b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/kernelutil_x86_avx_128_fma_double.h
index f2b4a4e0fdb988b415ebe7416885ebc5008dfdf5..5b931327a505e7512d887c64bded64a7cb31415c 100644 (file)
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/kernelutil_x86_avx_128_fma_double.h
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/kernelutil_x86_avx_128_fma_double.h
@@ -43,6 +43,8 @@
 #    include <x86intrin.h>
 #endif
 
+#include "config.h"
+
 #define gmx_mm_castsi128_pd   _mm_castsi128_pd
 #define gmx_mm_extract_epi32  _mm_extract_epi32
 

diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/kernelutil_x86_avx_256_double.h b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/kernelutil_x86_avx_256_double.h
index e77e39c1d3528350630ab1573ba84f6e95e77f9e..6e37231046ffec138f2b1b4f3870e35867a3785a 100644 (file)
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/kernelutil_x86_avx_256_double.h
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/kernelutil_x86_avx_256_double.h
@@ -35,6 +35,8 @@
 #ifndef _kernelutil_x86_avx_256_double_h_
 #define _kernelutil_x86_avx_256_double_h_
 
+#include "config.h"
+
 #define gmx_mm_castsi128_ps(a) _mm_castsi128_ps(a)
 
 #define _GMX_MM_BLEND256D(b3, b2, b1, b0) (((b3) << 3) | ((b2) << 2) | ((b1) << 1) | ((b0)))

diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/kernelutil_x86_sse2_double.h b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/kernelutil_x86_sse2_double.h
index 35c2f1e9a915b196af25f720d40c74589e3982a9..415fee6de3c09e1f20590e87b03839c8b158fbf6 100644 (file)
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/kernelutil_x86_sse2_double.h
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/kernelutil_x86_sse2_double.h
@@ -36,10 +36,10 @@
 #define _kernelutil_x86_sse2_double_h_
 
 #include <math.h>
-
-
 #include <stdio.h>
 
+#include "config.h"
+
 
 /* Normal sum of four ymm registers */
 #define gmx_mm_sum4_pd(t0, t1, t2, t3)  _mm_add_pd(_mm_add_pd(t0, t1), _mm_add_pd(t2, t3))

diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/kernelutil_x86_sse2_single.h b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/kernelutil_x86_sse2_single.h
index 820a37031a09824f89de94e2517f10227b1bce03..31f1230c80a04647a279e03b270a013736953977 100644 (file)
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/kernelutil_x86_sse2_single.h
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/kernelutil_x86_sse2_single.h
@@ -39,6 +39,8 @@
 
 #include <math.h>
 
+#include "config.h"
+
 #define gmx_mm_castsi128_ps   _mm_castsi128_ps
 
 #define gmx_mm_extract_epi32(x, imm) _mm_cvtsi128_si32(_mm_srli_si128((x), 4 * (imm)))

diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/kernelutil_x86_sse4_1_double.h b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/kernelutil_x86_sse4_1_double.h
index ccbb62750fad77879f722578b729f75610ec8935..a235cd48bcf6c7f461837affa80c04a9bcea951d 100644 (file)
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/kernelutil_x86_sse4_1_double.h
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/kernelutil_x86_sse4_1_double.h
@@ -36,9 +36,10 @@
 #define _kernelutil_x86_sse4_1_double_h_
 
 #include <math.h>
-
 #include <stdio.h>
 
+#include "config.h"
+
 #define gmx_mm_extract_epi32(x, imm) _mm_extract_epi32((x), (imm))
 #define gmx_mm_castsi128_pd(a) _mm_castsi128_pd(a)
 

diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/kernelutil_x86_sse4_1_single.h b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/kernelutil_x86_sse4_1_single.h
index 45f2a7b5f250852048835f8d278d10d1326ecf0a..2d83de317af084c63f9903ecb3e89793209b01cd 100644 (file)
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/kernelutil_x86_sse4_1_single.h
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/kernelutil_x86_sse4_1_single.h
@@ -37,6 +37,8 @@
 
 #include <math.h>
 
+#include "config.h"
+
 #undef gmx_restrict
 #define gmx_restrict
 

diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils_x86_128s.h b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils_x86_128s.h
index c90e4bb8030211fbdc8ca45a4cd15787029c0158..17d1186c48b118393e13fa11a559faefc7c8542f 100644 (file)
--- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils_x86_128s.h
+++ b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils_x86_128s.h
@@ -37,6 +37,8 @@
 
 #include "gromacs/legacyheaders/types/simple.h"
 
+#include "config.h"
+
 /* This files contains all functions/macros for the SIMD kernels
  * which have explicit dependencies on the j-cluster size and/or SIMD-width.
  * The functionality which depends on the j-cluster size is:

diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils_x86_256s.h b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils_x86_256s.h
index 51dd883ed2c10a46fb5f7dce8c5c9d91060959fb..5caee76a48dfb1acbb151edbbb66ea58fd0471ee 100644 (file)
--- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils_x86_256s.h
+++ b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils_x86_256s.h
@@ -35,6 +35,8 @@
 #ifndef _nbnxn_kernel_simd_utils_x86_256s_h_
 #define _nbnxn_kernel_simd_utils_x86_256s_h_
 
+#include "config.h"
+
 /* This files contains all functions/macros for the SIMD kernels
  * which have explicit dependencies on the j-cluster size and/or SIMD-width.
  * The functionality which depends on the j-cluster size is:

diff --git a/src/gromacs/simd/impl_ibm_qpx/impl_ibm_qpx.h b/src/gromacs/simd/impl_ibm_qpx/impl_ibm_qpx.h
index 63bce3c895f676d31b270d7ff96d2de699911ee7..ebbf77aec775e79d548a95f2313bd88c1351da83 100644 (file)
--- a/src/gromacs/simd/impl_ibm_qpx/impl_ibm_qpx.h
+++ b/src/gromacs/simd/impl_ibm_qpx/impl_ibm_qpx.h
@@ -41,6 +41,8 @@
 #include <qpxmath.h>
 #endif
 
+#include "config.h"
+
 /* IBM QPX SIMD instruction wrappers
  *
  * Please see documentation in gromacs/simd/simd.h for the available

diff --git a/src/gromacs/simd/impl_intel_mic/impl_intel_mic.h b/src/gromacs/simd/impl_intel_mic/impl_intel_mic.h
index e3d49126f0ebf5132ad8744c2e2caa198f591f18..49a0df77e0027beb11d9cd9491826f9e90892322 100644 (file)
--- a/src/gromacs/simd/impl_intel_mic/impl_intel_mic.h
+++ b/src/gromacs/simd/impl_intel_mic/impl_intel_mic.h
@@ -39,6 +39,8 @@
 #include <math.h>
 #include <immintrin.h>
 
+#include "config.h"
+
 /* Intel Xeon Phi, or
  * the-artist-formerly-known-as-Knight's-corner, or
  * the-artist-formerly-formerly-known-as-MIC, or

diff --git a/src/gromacs/simd/impl_x86_avx2_256/impl_x86_avx2_256.h b/src/gromacs/simd/impl_x86_avx2_256/impl_x86_avx2_256.h
index a05e12ebbb1b26a3c4ad0782f7b07a3ba5f7a569..195fdbc2953715e4ff60e28373f6c1663a749d15 100644 (file)
--- a/src/gromacs/simd/impl_x86_avx2_256/impl_x86_avx2_256.h
+++ b/src/gromacs/simd/impl_x86_avx2_256/impl_x86_avx2_256.h
@@ -39,6 +39,8 @@
 #include <math.h>
 #include <immintrin.h>
 
+#include "config.h"
+
 /* x86 256-bit AVX2 SIMD instruction wrappers
  *
  * Please see documentation in gromacs/simd/simd.h for details

diff --git a/src/gromacs/simd/impl_x86_avx_128_fma/impl_x86_avx_128_fma.h b/src/gromacs/simd/impl_x86_avx_128_fma/impl_x86_avx_128_fma.h
index 5b3096bee322f5fe367c39da2165a030ea6b1db7..7c946d10d257af1a549ebe4238dfd36e725168a0 100644 (file)
--- a/src/gromacs/simd/impl_x86_avx_128_fma/impl_x86_avx_128_fma.h
+++ b/src/gromacs/simd/impl_x86_avx_128_fma/impl_x86_avx_128_fma.h
@@ -40,6 +40,8 @@
 #include <immintrin.h>
 #include <x86intrin.h>
 
+#include "config.h"
+
 /* x86 128-bit AVX with FMA SIMD instruction wrappers
  *
  * Please see documentation in gromacs/simd/simd.h for details

diff --git a/src/gromacs/simd/impl_x86_avx_256/impl_x86_avx_256.h b/src/gromacs/simd/impl_x86_avx_256/impl_x86_avx_256.h
index cff1a7e2cbd00bb782aadfba2b862214706a98d1..f6d5402aaaf26a282fc6aac5e588689ab9423ae1 100644 (file)
--- a/src/gromacs/simd/impl_x86_avx_256/impl_x86_avx_256.h
+++ b/src/gromacs/simd/impl_x86_avx_256/impl_x86_avx_256.h
@@ -39,6 +39,8 @@
 #include <math.h>
 #include <immintrin.h>
 
+#include "config.h"
+
 /* It is cleaner to start the AVX implementation from scratch rather than
  * first inheriting from SSE4.1, which in turn inherits from SSE2. However,
  * the capabilities still form a superset.

diff --git a/src/gromacs/simd/impl_x86_sse2/impl_x86_sse2.h b/src/gromacs/simd/impl_x86_sse2/impl_x86_sse2.h
index 7aab27ae21c5faad2de33dde08b39594b00498e8..c16d3d4d576793cf9f01115e4657026d210b18b0 100644 (file)
--- a/src/gromacs/simd/impl_x86_sse2/impl_x86_sse2.h
+++ b/src/gromacs/simd/impl_x86_sse2/impl_x86_sse2.h
@@ -39,6 +39,8 @@
 #include <math.h>
 #include <emmintrin.h>
 
+#include "config.h"
+
 /* Set capabilities that can be inherited */
 #define GMX_SIMD_X86_SSE2_OR_HIGHER
 

diff --git a/src/gromacs/simd/impl_x86_sse4_1/impl_x86_sse4_1.h b/src/gromacs/simd/impl_x86_sse4_1/impl_x86_sse4_1.h
index 946ae1e866a88d35c421166d6823da576360a5cb..91bef05ac67b02b077287895fd12a5590fa83df3 100644 (file)
--- a/src/gromacs/simd/impl_x86_sse4_1/impl_x86_sse4_1.h
+++ b/src/gromacs/simd/impl_x86_sse4_1/impl_x86_sse4_1.h
@@ -39,6 +39,7 @@
 #include <math.h>
 #include <smmintrin.h>
 
+#include "config.h"
 
 /* x86 SSE4.1 SIMD instruction wrappers
  *

diff --git a/src/gromacs/simd/simd_math.h b/src/gromacs/simd/simd_math.h
index 68ab6774ef0031b3f4b71ca5cceb21663245c59f..7601aba820079d4fe0474890e02a3f1199d14c55 100644 (file)
--- a/src/gromacs/simd/simd_math.h
+++ b/src/gromacs/simd/simd_math.h
@@ -60,6 +60,8 @@
 #include "gromacs/math/utilities.h"
 #include "gromacs/simd/simd.h"
 
+#include "config.h"
+
 /*! \cond libapi */
 /*! \addtogroup module_simd */
 /*! \{ */

diff --git a/src/gromacs/simd/vector_operations.h b/src/gromacs/simd/vector_operations.h
index d2ccfde0e2a7ac3f29c9d3d748629dd04e17364e..d24c25f4db80a4695609baf2b102a9dc891bac6d 100644 (file)
--- a/src/gromacs/simd/vector_operations.h
+++ b/src/gromacs/simd/vector_operations.h
@@ -48,6 +48,8 @@
 
 #include "gromacs/simd/simd.h"
 
+#include "config.h"
+
 /*! \cond libapi */
 /*! \addtogroup module_simd */
 /*! \{ */