Merge branch release-2016 into release-2018

Resolved conflicts in commit matrices by implementing the same logical
change as in release-2016 (move msvc+icc config to post-submit matrix)
in release-2018.

Change-Id: Id5d731e37e54b8c3896763d0a4ca496f99612f0f

diff --cc admin/builds/post-submit-matrix.txt
index 624eeec5800cab872fcd991dca8ba3230d7c42fd,756077de0f5c4438585aa6336d49284dca56adc3..476fd05cabad03596d4549cdc64156fbc619f5a6
--- 1/admin/builds/post-submit-matrix.txt
--- 2/admin/builds/post-submit-matrix.txt
+++ b/admin/builds/post-submit-matrix.txt
@@@ -50,16 -35,17 +50,21 @@@ clang-5 openmp simd=avx_128_fma npme=1 
  
  # Test non-default use of mdrun -gpu_id
  # Test SSE2 SIMD
 +# Test CMAKE_BUILD_TYPE=Release
  gcc-4.8 gpu npme=1 nranks=2 gpu_id=2 cuda-7.5 simd=sse2 release
  
 -# Test oldest supported icc on Windows
 -# Test newest supported icc on Windows
 -# TODO When merging to release-2018, reconsider which build
 -# options might best remain in pre-submit on the msvc config,
 -# and which are OK in post-submit
 -icc-16.0 msvc-2015 fftpack
 +# Test GPU-sharing among 4 PP ranks
 +gcc-5 gpu nranks=4 gpu_id=1 cuda-8.0 release-with-assert
 +
++# Test oldest supported icc
++# Test icc on Windows
++# Test icc with SIMD in mixed precision in release mode
++icc-16 msvc-2015 fftpack simd=avx2_256 release
+ 
  # TODO
 -# Re-enable Phi build
 +# Add SIMD + OpenMP + CUDA asan build
 +# Add OpenMP + CUDA + device sharing TSAN build
 +# Re-enable Phi build (FIXME: do we still care?)
  # Test without TNG support
  # Test without hwloc support
  # Test with NVML support

diff --cc admin/builds/pre-submit-matrix.txt
index d05f1e7030ce05119c3945b93863b7f0baa4d2a2,f773307e779a9debf3f23c6becf4efe82d87f880..3a4707b837468c868a49ae0a30365943484f572e
--- 1/admin/builds/pre-submit-matrix.txt
--- 2/admin/builds/pre-submit-matrix.txt
+++ b/admin/builds/pre-submit-matrix.txt
@@@ -60,19 -44,16 +60,14 @@@ clang-5 no-openmp asa
  
  # Test oldest supported MSVC on Windows
  # Test newest supported MSVC on Windows
 -msvc-2015 openmp release
 +msvc-2015 openmp release-with-assert
  
- # Test oldest supported icc
- # Test icc on Windows
- # Test icc with SIMD in mixed precision in release mode
- icc-16 msvc-2015 fftpack simd=avx2_256 release
- 
 -# Test newest cmake at time of release
 +# Test newest icc at the time of release
 +# Test icc without SIMD in double precision in release mode
  # Test MKL
  # Test without any MPI
 -# 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
 -gcc-5 mpi openmp simd=avx_128_fma
 +# Test on CentOS (because cmake-3.9.6 is available there)
 +icc-18 no-thread-mpi double openmp mkl cmake-3.9.6 simd=none release
  
  # Test NVIDIA OpenCL
  # Test MPI + OpenCL