Fix: pthread variables were overwritten by gmxManageGPU

ThreadMPI.cmake is now always included (used for setaffinity).
The extra include, with the TEST_TMPI_ATOMICS_ONLY variable
set, overwrote required variables.

Change-Id: I2b00d5139e8c4ed55226ff4613ad252aacabbdac

diff --git a/cmake/gmxManageGPU.cmake b/cmake/gmxManageGPU.cmake
index 382a9698a35776942c2dd8c89de53894f4c30351..168fe2897e2ae31f087b5f57db383dc7cff601d6 100644 (file)
--- a/cmake/gmxManageGPU.cmake
+++ b/cmake/gmxManageGPU.cmake
@@ -108,15 +108,9 @@ macro(gmx_gpu_setup)
     # Version info (semicolon used as line separator) for nvcc.
     get_nvcc_version_info()
 
-    # Check whether we can use atomic operations needed for polling wait for GPU
+    # Atomic operations used for polling wait for GPU
     # (to avoid the cudaStreamSynchronize + ECC bug).
-    # With thread-MPI testing atomics has already been carried out, but without
-    # thread-MPI we need to invoke the atomics test independently.
-    if (NOT GMX_THREAD_MPI)
-        set(TEST_TMPI_ATOMICS_ONLY ON CACHE INTERNAL
-            "Test only the atomic operations of thread-MPI.")
-        include(ThreadMPI)
-    endif()
+    # ThreadMPI is now always included. Thus, we don't check for Atomics anymore here.
 
     # no OpenMP is no good!
     if(NOT GMX_OPENMP)