Merge branch release-5-1 into release-2016
authorMark Abraham <mark.j.abraham@gmail.com>
Wed, 29 Jun 2016 13:30:40 +0000 (15:30 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Thu, 30 Jun 2016 20:00:07 +0000 (22:00 +0200)
commited8d537d336d90081b62d78a8ecd63f67cfb7a17
treebca854a6eeafb06aa313cbf29d781fdcd48e3146
parent6deda01904ffbf3306862966c3575737253ff9b1
parentddc42de5c85212648bbdf827688d186cbbf82843
Merge branch release-5-1 into release-2016

The changes to checks in release-5-1 to check_nthreads_hw_avail() are
all incorporated into detectLogicalProcessorCount().

Change-Id: Ifbee24dc40630988a14026b9f45cfaf6e92390ba
src/gromacs/gpu_utils/cudautils.cuh
src/gromacs/gpu_utils/gpu_utils.cu
src/gromacs/hardware/hardwaretopology.cpp