Merge branch release-2016
authorRoland Schulz <roland.schulz@intel.com>
Tue, 27 Jun 2017 22:46:13 +0000 (15:46 -0700)
committerRoland Schulz <roland.schulz@intel.com>
Tue, 27 Jun 2017 22:46:26 +0000 (15:46 -0700)
commit0e6a23f78af3bb890109c0c7784d64434ad49c37
tree715c3f0d15f8fdbf06ff931bc991ba7ce17fe407
parent850477e82eeef6ab4874357cab425db9b491ee07
parent8d2584c324239c8f4d88024051ae0e53eebda21d
Merge branch release-2016

Conflicts:
admin/builds/pre-submit-matrix.txt

Checked that intent of test configs is implemented appropriately in
new context. The cuda-8 config newly introduced in release-2016
is already covered in this branch, so we don't need to have that
new configuration here.

src/gromacs/gpu_utils/gpu_utils.cu
src/gromacs/simd/impl_ibm_qpx/impl_ibm_qpx_simd4_double.h
src/gromacs/domdec/domdec.cpp

Trivial

Change-Id: I9b06bb476f5b62c9652c0e5186340ed11b0c31cc
13 files changed:
admin/builds/pre-submit-matrix.txt
cmake/gmxManageNvccConfig.cmake
docs/CMakeLists.txt
docs/dev-manual/build-system.rst
docs/dev-manual/language-features.rst
docs/install-guide/index.rst
src/gromacs/domdec/domdec.cpp
src/gromacs/gmxana/gmx_make_edi.cpp
src/gromacs/gmxpreprocess/readir.cpp
src/gromacs/gpu_utils/gpu_utils.cu
src/gromacs/pulling/pull.cpp
src/gromacs/simd/impl_ibm_qpx/impl_ibm_qpx_simd4_double.h
src/programs/mdrun/md.cpp