Merge branch release-2018

[alexxy/gromacs.git] / admin / builds / pre-submit-matrix.txt

diff --git a/admin/builds/pre-submit-matrix.txt b/admin/builds/pre-submit-matrix.txt
index c0485c0f2606b6b569aae3d2f002be92d7f7bf82..a2a63544dec1d26cae45c25ce015e22af3d92d1f 100644 (file)
--- a/admin/builds/pre-submit-matrix.txt
+++ b/admin/builds/pre-submit-matrix.txt
@@ -21,13 +21,15 @@
 # Test MPI with CUDA
 # Test cmake version from before new FindCUDA support (in 3.8)
 # Test MPMD PME with library MPI
-gcc-4.8 gpu cuda-6.5 cmake-3.6.1 mpi npme=1 nranks=2 openmp
+# Test recent cmake (3.7+), to cover minor FindCUDA changes from 3.7.0
+gcc-4.8 gpu cuda-7.0 cmake-3.8.1 mpi npme=1 nranks=2 openmp
 
+# Test non-default use of mdrun -gpu_id
 # Test newest gcc supported by newest CUDA at time of release
 # Test thread-MPI with CUDA
-# Test cmake FindCUDA functionality introduced in 3.8
+# Test older cmake version (< 3.7)
 # Test SIMD implementation of pair search for GPU code-path
-gcc-6 gpu cuda-9.0 thread-mpi openmp cmake-3.8.1 release-with-assert simd=avx2_256
+gcc-7 gpu gpu_id=1 cuda-9.2 thread-mpi openmp cmake-3.6.1 release-with-assert simd=avx2_256
 
 # Test newest cmake at time of release
 # Test with ThreadSanitizer (compiled without OpenMP, even though
@@ -42,7 +44,7 @@ gcc-7 tsan no-openmp fftpack cmake-3.10.0
 # Test 128-bit SIMD in double precision (to cover SimdInt32 support better)
 gcc-7 double mpi simd=avx_128_fma
 
-# Test on MacOS (because gcc-6 is only available there)
+# Test on MacOS (the gcc-6 and/or x11 flags implicitly steer jobs to the OSX slave)
 # Test X11 build
 gcc-6 x11
 
@@ -56,11 +58,12 @@ clang-3.4 double simd=avx_128_fma thread-mpi no-openmp fftpack cmake-3.4.3
 
 # Test newest clang at time of release
 # Test with AddressSanitizer (without OpenMP, see below)
-clang-5 no-openmp asan
+# Test with clang-tidy (without OpenMP, cmake>=3.6)
+clang-6 no-openmp asan cmake-3.11.4 tidy
 
 # Test oldest supported MSVC on Windows
 # Test newest supported MSVC on Windows
-msvc-2015 openmp release-with-assert
+msvc-2017 openmp release-with-assert
 
 # Test newest icc at the time of release
 # Test icc without SIMD in double precision in release mode
@@ -70,14 +73,16 @@ msvc-2015 openmp release-with-assert
 icc-18 no-thread-mpi double openmp mkl cmake-3.9.6 simd=none release
 
 # Test NVIDIA OpenCL
+# Test external clFFT (for build speed)
 # Test MPI + OpenCL
 # Test AVX2_256 SIMD
 # Test icc with SIMD in mixed precision in release mode
-icc-18 openmp opencl cuda-7.5 mpi release simd=avx2_256
+icc-18 openmp opencl clFFT-2.14 cuda-7.5 mpi release simd=avx2_256
 
 # Test AMD OpenCL
+# Test external clFFT (for build speed)
 # Test AVX_128_FMA SIMD
-gcc-5 openmp simd=avx_128_fma opencl amdappsdk-3.0
+gcc-5 openmp simd=avx_128_fma opencl clFFT-2.14 amdappsdk-3.0
 
 # TODO
 # Add OpenMP support to ASAN build (but libomp.so in clang-4 reports leaks, so might need a suitable build or suppression)