Merge release-4-6 into master

[alexxy/gromacs.git] / src / gromacs / mdlib / nbnxn_kernels / nbnxn_kernel_simd_4xn.c

diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_4xn.c
index bb90a9361ab5d85ccd3419a042dcdef3d58a33d7..848fefa0da20c25c49deeb1d9d1dfb96db30c330 100644 (file)
--- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_4xn.c
+++ b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_4xn.c
@@ -55,15 +55,9 @@
 
 /* Include all flavors of the SSE or AVX 4xN kernel loops */
 
-#if GMX_NBNXN_SIMD_BITWIDTH == 128
-#define GMX_MM128_HERE
-#else
-#if GMX_NBNXN_SIMD_BITWIDTH == 256
-#define GMX_MM256_HERE
-#else
+#if !(GMX_NBNXN_SIMD_BITWIDTH == 128 || GMX_NBNXN_SIMD_BITWIDTH == 256)
 #error "unsupported GMX_NBNXN_SIMD_BITWIDTH"
 #endif
-#endif
 
 /* Analytical reaction-field kernels */
 #define CALC_COUL_RF