Merge branch release-2019
authorMark Abraham <mark.j.abraham@gmail.com>
Wed, 2 Jan 2019 10:56:32 +0000 (11:56 +0100)
committerPaul Bauer <paul.bauer.q@gmail.com>
Wed, 2 Jan 2019 11:22:29 +0000 (12:22 +0100)
commita2f0c1b2c88ce6d812a622100dc473038d8a3a8e
tree71fb3ebc8332a08a2236b690dc1494ba438c676e
parent1182a5270994c72bfc9535b597ba00d2b2317748
parent178ae3d134c878b0d22c3d836d1ada3b161a9048
Merge branch release-2019

Change-Id: I71d9bc751e14f821392f802ee9222b864f1e69b6
23 files changed:
CMakeLists.txt
admin/builds/gromacs.py
cmake/gmxManageClangCudaConfig.cmake
cmake/gmxManageNvccConfig.cmake
cmake/gmxVersionInfo.cmake
docs/CMakeLists.txt
docs/release-notes/index.rst
src/api/cpp/tests/CMakeLists.txt
src/api/cpp/workflow/tests/CMakeLists.txt
src/config.h.cmakein
src/gromacs/gpu_utils/gpu_utils.cpp
src/gromacs/gpu_utils/gpu_utils.cu
src/gromacs/gpu_utils/gpu_utils.h
src/gromacs/gpu_utils/gpu_utils_ocl.cpp
src/gromacs/gpu_utils/oclraii.h
src/gromacs/mdlib/md_support.cpp
src/gromacs/mdlib/md_support.h
src/gromacs/mdlib/update.cpp
src/gromacs/mdrun/md.cpp
src/gromacs/mdrun/runner.cpp
src/gromacs/taskassignment/decidegpuusage.cpp
src/gromacs/taskassignment/decidegpuusage.h
src/gromacs/timing/cyclecounter.cpp