Minor improvements to test configs

No functional changes - this just improves the way we specify and
document intent.

Unless there's interaction effects being tested, only one
configuration should document that it is intended to test e.g. "thread
MPI with CUDA".

Made that specific for one such config, and removed the documentation
from a second config, even though it incidentally tests such code
(because it is currently the default).

Added a config that specifically tests thread-MPI (which it was
coincidentally already doing).

Clarified that the test config that covers the SIMD implementation of
search for pair lists to use on the GPU - which SIMD implementation of
the search is tested is merely coincidental, rather than a specific
choice.

Change-Id: Id1889753623f7808cd1bb2fb060ee2b2852dfd94

diff --git a/admin/builds/post-submit-matrix.txt b/admin/builds/post-submit-matrix.txt
index b6988cd3cd941478e425e04e41f377ea189659ee..fc2f6a19afe03b73a63b8949e3eb80530250dfbc 100644 (file)
--- a/admin/builds/post-submit-matrix.txt
+++ b/admin/builds/post-submit-matrix.txt
@@ -1,13 +1,20 @@
 # Comment line(s) preceding each configuration document the main
 # intent behind that configuration, so that we can correctly judge
 # whether to preserve that during maintenance decisions.
+#
+# Other configurations might coincidentally test such configurations
+# (e.g. because they are the current default), but it is appropriate
+# to intend to teach each feature (or a feature combination) exactly
+# once, and for the intent to be reflected precisely in the
+# configuration syntax, so that the configurations are stable even
+# if the defaults change in future.
 
 # Test the mdrun-only build
 # TODO In combination with gmx from another build, arrange to run regressiontests
 clang-3.7 double mpi no-openmp fftpack mdrun-only
 
 # Test MPMD PME with thread-MPI
-# TODO Add double to this configuration if/when Carsten stablizes essentialdynamics tests
+# TODO Add double to this configuration if/when we stablize the essentialdynamics tests
 gcc-5 npme=1 nranks=2 no-openmp fftpack simd=avx_128_fma release
 
 # Test non-default GMX_PREFER_STATIC_LIBS behavior

diff --git a/admin/builds/pre-submit-matrix.txt b/admin/builds/pre-submit-matrix.txt
index b935c179829cf9cf05321ac94ef4234f7d06d3bd..124f966871d1ca3f004af8fdd0bd29dcf8435ebd 100644 (file)
--- a/admin/builds/pre-submit-matrix.txt
+++ b/admin/builds/pre-submit-matrix.txt
@@ -1,6 +1,13 @@
 # Comment line(s) preceding each configuration document the main
 # intent behind that configuration, so that we can correctly judge
 # whether to preserve that during maintenance decisions.
+#
+# Other configurations might coincidentally test such configurations
+# (e.g. because they are the current default), but it is appropriate
+# to intend to teach each feature (or a feature combination) exactly
+# once, and for the intent to be reflected precisely in the
+# configuration syntax, so that the configurations are stable even
+# if the defaults change in future.
 
 # Test older gcc
 # Test oldest supported CUDA
@@ -12,13 +19,12 @@
 gcc-4.6 gpu cuda-5.0 mpi npme=1 nranks=2 openmp x11 cmake-2.8.8
 
 # Test newest gcc supported by newest CUDA shortly after the release
-# Test thread-MPI with CUDA
-# Test SIMD (AVX2_256) GPU code-path
+# Test SIMD implementation of pair search for GPU code-path
 gcc-5 gpu cuda-8.0 openmp simd=avx2_256
 
 # Test newest gcc supported by newest CUDA at time of release
 # Test thread-MPI with CUDA
-gcc-4.8 gpu cuda-7.5 openmp release
+gcc-4.8 gpu thread-mpi cuda-7.5 openmp release
 
 # Test with ThreadSanitizer
 # Test AVX2_256 SIMD
@@ -26,14 +32,15 @@ gcc-4.8 gpu cuda-7.5 openmp release
 gcc-4.9 tsan fftpack simd=avx2_256
 
 # Test newest gcc at time of release
-# Test on MacOS
+# Test on MacOS (because gcc-6.1 is only available there)
 gcc-6.1 double
 
 # Test older clang
 # Test double precision
 # Test with AddressSanitizer
 # Test without OpenMP
-clang-3.4 double no-openmp fftpack asan
+# Test thread-MPI
+clang-3.4 double thread-mpi no-openmp fftpack asan
 
 # Test oldest supported MSVC on Windows
 # Test newest supported MSVC on Windows
@@ -46,7 +53,7 @@ icc-16.0 msvc-2015 fftpack
 # Test newest cmake at time of release
 # Test MKL
 # Test without any MPI
-# Test on CentOS
+# Test on CentOS (because icc-16.0 is only available there)
 icc-16.0 no-thread-mpi openmp mkl cmake-3.3.2 simd=avx_256
 
 # Test AVX_128_FMA SIMD