Merge branch 'release-2016'

[alexxy/gromacs.git] / src / gromacs / gmxlib / nonbonded / CMakeLists.txt

diff --git a/src/gromacs/gmxlib/nonbonded/CMakeLists.txt b/src/gromacs/gmxlib/nonbonded/CMakeLists.txt
index 69b077b6ab4e7fc1290126f5a99577bde78321ae..f588792ad56e43c7550ebb64e27518d1ec8c17ba 100644 (file)
--- a/src/gromacs/gmxlib/nonbonded/CMakeLists.txt
+++ b/src/gromacs/gmxlib/nonbonded/CMakeLists.txt
@@ -47,7 +47,11 @@ if("${GMX_SIMD_ACTIVE}" STREQUAL "AVX_128_FMA" AND NOT GMX_DOUBLE)
     file(GLOB NONBONDED_AVX_128_FMA_SINGLE_SOURCES nb_kernel_avx_128_fma_single/*.c)
 endif()
 
-if((("${GMX_SIMD_ACTIVE}" STREQUAL "AVX_256") OR ("${GMX_SIMD_ACTIVE}" STREQUAL "AVX2_256")) AND NOT GMX_DOUBLE)
+if((("${GMX_SIMD_ACTIVE}" STREQUAL "AVX_256")
+    OR ("${GMX_SIMD_ACTIVE}" STREQUAL "AVX2_256")
+    OR ("${GMX_SIMD_ACTIVE}" STREQUAL "AVX_512")
+    OR ("${GMX_SIMD_ACTIVE}" STREQUAL "AVX_512_KNL"))
+        AND NOT GMX_DOUBLE)
     file(GLOB NONBONDED_AVX_256_SINGLE_SOURCES nb_kernel_avx_256_single/*.c)
 endif()
 
@@ -63,7 +67,11 @@ if("${GMX_SIMD_ACTIVE}" STREQUAL "AVX_128_FMA" AND GMX_DOUBLE)
     file(GLOB NONBONDED_AVX_128_FMA_DOUBLE_SOURCES nb_kernel_avx_128_fma_double/*.c)
 endif()
 
-if((("${GMX_SIMD_ACTIVE}" STREQUAL "AVX_256") OR ("${GMX_SIMD_ACTIVE}" STREQUAL "AVX2_256")) AND GMX_DOUBLE)
+if((("${GMX_SIMD_ACTIVE}" STREQUAL "AVX_256")
+            OR ("${GMX_SIMD_ACTIVE}" STREQUAL "AVX2_256")
+            OR ("${GMX_SIMD_ACTIVE}" STREQUAL "AVX_512")
+            OR ("${GMX_SIMD_ACTIVE}" STREQUAL "AVX_512_KNL"))
+        AND GMX_DOUBLE)
     file(GLOB NONBONDED_AVX_256_DOUBLE_SOURCES nb_kernel_avx_256_double/*.c)
 endif()